merge branch feat106-external-logo into internal

README.md

@@ -126,3 +126,4 @@ The following options are available for the `ui-for-docker` binary:
 * `--tlscert`: Path to the TLS certificate file (default `/certs/cert.pem`)
 * `--tlskey`: Path to the TLS key (default `/certs/key.pem`)
 * `--hide-label`, `-l`: Hide containers with a specific label in the UI
+* `--logo`: URL to a picture to be displayed as a logo in the UI

api/main.go

@@ -19,6 +19,7 @@ func main() {
 		swarm      = kingpin.Flag("swarm", "Swarm cluster support").Default("false").Short('s').Bool()
 		labels     = pairs(kingpin.Flag("hide-label", "Hide containers with a specific label in the UI").Short('l'))
 		registries = pairs(kingpin.Flag("registries", "Supported Docker registries").Short('r'))
+		logo      = kingpin.Flag("logo", "URL for the logo displayed in the UI").String()
 	)
 	kingpin.Parse()
 
@@ -38,6 +39,7 @@ func main() {
 		Swarm:        *swarm,
 		HiddenLabels: *labels,
 		Registries:   *registries,
+		Logo:         *logo,
 	}
 
 	api := newAPI(apiConfig)

api/settings.go

@@ -10,6 +10,7 @@ type Settings struct {
 	Swarm        bool     `json:"swarm"`
 	HiddenLabels pairList `json:"hiddenLabels"`
 	Registries   pairList `json:"registries"`
+	Logo         string   `json:"logo"`
 }
 
 // configurationHandler defines a handler function used to encode the configuration in JSON

index.html

@@ -32,7 +32,8 @@
       <ul class="sidebar">
         <li class="sidebar-main">
           <a ng-click="toggleSidebar()">
-            <img src="images/logo.png" class="img-responsive logo" alt="logo">
+            <img ng-if="config.logo" ng-src="{{ config.logo }}" class="img-responsive logo" alt="CloudInovasi UI">
+            <img ng-if="!config.logo" src="images/logo.png" class="img-responsive logo" alt="CloudInovasi UI">
             <span class="menu-icon glyphicon glyphicon-transfer"></span>
           </a>
         </li>