Fix #497

hawtio · Sep 9, 2013 · 0d193cf · 0d193cf
1 parent c5067b6
commit 0d193cf
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/hawtio-web/src/main/webapp/app/branding/js/brandingPlugin.ts b/hawtio-web/src/main/webapp/app/branding/js/brandingPlugin.ts
@@ -44,7 +44,7 @@ module Branding {
     Branding.enabled = Core.parseBooleanValue(response.enable);
 
     // Branding.enabled = false;
-    // Branding.enabled = true;
+    Branding.enabled = true;
 
     if (Branding.enabled) {
       Branding.profile = response.profile;

diff --git a/hawtio-web/src/main/webapp/app/source/js/helpers.ts b/hawtio-web/src/main/webapp/app/source/js/helpers.ts
@@ -9,16 +9,18 @@ module Source {
 
   export function createBreadcrumbLinks(mavenCoords: string, pathName: string) {
     var linkPrefix = "#/source/index/" + mavenCoords;
-    var answer = [{href: linkPrefix, name: "/"}];
+    var answer = [{href: linkPrefix, name: "root"}];
     if (pathName) {
       var pathNames = pathName.split("/");
       var fullPath = "";
       angular.forEach(pathNames, (path) => {
         fullPath += "/" + path;
         var href = linkPrefix + fullPath;
-        answer.push({href: href, name: path || "/", fileName: "/" + fullPath});
+        if (!path.isBlank()) {
+          answer.push({href: href, name: path || "/", fileName: "/" + fullPath});
+        }
       });
     }
     return answer;
   }
-}
+}
diff --git a/hawtio-web/src/main/webapp/app/source/js/index.ts b/hawtio-web/src/main/webapp/app/source/js/index.ts
@@ -97,4 +97,4 @@ module Source {
     }
 
   }
-}
+}
diff --git a/hawtio-web/src/main/webapp/css/site-branding.css b/hawtio-web/src/main/webapp/css/site-branding.css
@@ -405,11 +405,13 @@ div[ng-controller='Core.LoginController']:after {
 .logbar {
   width: 100%;
   left: 0;
+  background: inherit !important;
+  border-bottom: none !important;
+  box-shadow: none;
   border-left: none;
   border-right: none;
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
-  background: none repeat scroll 0 0 #F6F6F6;
   padding-left: 0;
   padding-right: 0;
 }
@@ -436,6 +438,16 @@ div[ng-controller='Core.LoginController']:after {
   margin-bottom: 0;
 }
 
+.wiki.logbar-container .nav.nav-tabs {
+  background-color: #F6F6F6 !important;
+  border-bottom: 1px solid #CECDCD !important;
+  border-radius: 0 !important;
+  border-top: 0 !important;
+  border-left: 0 !important;
+  border-right: 0 !important;
+  margin-top: 0 !important;
+}
+
 div#main div ul.nav li a.nav-primary:hover, div#main div ul.nav li a.nav-primary:active, div#main div ul.nav li a.nav-primary.active, div#main div ul.nav li a.nav-primary.disabled, div#main div ul.nav li a.nav-primary[disabled] {
   background-color: inherit;
   color: #0044CC;