added branch switching to the breadcrumbs which is much cleaner, for #…

…532. thanks @gashcrumb for the idea! :)
hawtio · Sep 10, 2013 · 9d843cf · 9d843cf
1 parent 041925b
commit 9d843cf
Showing 1 changed file with 16 additions and 21 deletions.
diff --git a/hawtio-web/src/main/webapp/app/wiki/html/viewPage.html b/hawtio-web/src/main/webapp/app/wiki/html/viewPage.html
@@ -2,6 +2,22 @@
   <div class="logbar" ng-controller="Wiki.NavBarController">
     <div class="wiki logbar-container">
       <ul class="nav nav-tabs">
+        <li ng-show="branches.length" class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"
+                  title="The branch to view">
+            {{branch || 'branch'}}
+            <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu">
+            <li ng-repeat="otherBranch in branches">
+              <a ng-href="{{branchLink(otherBranch)}}{{hash}}"
+                 ng-hide="otherBranch === branch"
+                 title="Switch to the {{otherBranch}} branch"
+                 data-placement="bottom">
+                {{otherBranch}}</a>
+            </li>
+          </ul>
+        </li>
         <li ng-repeat="link in breadcrumbs" ng-class='{active : isActive(link.href)}'>
           <a ng-href="{{link.href}}{{hash}}">{{link.name}}</a>
         </li>
@@ -43,27 +59,6 @@
                  data-placement="bottom">
                 <i class="icon-remove"></i> Delete</a>
             </li>
-            <li class="divider">
-            </li>
-            <li ng-show="branches.length" class="dropdown">
-              <a href="#" class="dropdown-toggle" data-toggle="dropdown"
-                      title="The branch to view">
-                Branch: {{currentBranch}}
-                <i class="icon-arrow-right"></i>
-<!--
-                <span class="caret"></span>
--->
-              </a>
-              <ul class="dropdown-submenu">
-                <li ng-repeat="branch in branches">
-                  <a ng-href="{{branchLink(branch)}}"
-                     ng-hide="currentBranch === branch"
-                     title="Switch to the {{branch}} branch"
-                     data-placement="bottom">
-                    {{branch}}</a>
-                </li>
-              </ul>
-            </li>
           </ul>
         </li>
         <li class="pull-right">