tidied the nav bars a little

hawtio · Oct 5, 2013 · b490bb4 · b490bb4
1 parent 7cdc20f
commit b490bb4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/html/activeProfileList.html b/hawtio-web/src/main/webapp/app/fabric/html/activeProfileList.html
@@ -1,6 +1,5 @@
 <div>
   <div class="active-profile-titles section-header">
-    <div class="active-profile-name">Name</div>
     <div class="active-profile-filter">
       <div class="section-filter">
         <input type="text" class="search-query" placeholder="Filter..." ng-model="searchFilter">
@@ -10,7 +9,7 @@
 
     <div class="section-controls">
       <a href="" title="Create a new container" ng-click="createContainer()">
-        <i class="icon-plus"></i> Create
+        <i class="icon-plus"></i> Container
       </a>
       <a href="" ng-click="editRequirements.dialogOpen(null)"
          title="Configure the minimum number of required instances for each profile. If you are on OpenShift or using an Auto Scaler they are then created automatically; otherwise click on the count button to manually provision required containers">

diff --git a/hawtio-web/src/main/webapp/app/fabric/html/brokers.html b/hawtio-web/src/main/webapp/app/fabric/html/brokers.html
@@ -110,13 +110,16 @@
       </div>
 
       <div class="section-controls">
+        <a href="" title="Create a new broker configuration" ng-click="createBroker(null)">
+          <i class="icon-plus"></i> Broker
+        </a>
         <a href="" title="Create a new container" ng-click="createContainer()">
-          <i class="icon-plus"></i> Create Container
+          <i class="icon-plus"></i> Container
         </a>
         <a href="" ng-click="editRequirements.dialogOpen(null)"
            title="Configure the minimum number of required instances for each profile. If you are on OpenShift or using an Auto Scaler they are then created automatically; otherwise click on the count button to manually provision required containers">
           <i class="icon-resize-vertical"></i>
-          Scale
+          Targets
         </a>
       </div>
     </div>

diff --git a/hawtio-web/src/main/webapp/css/site-base.css b/hawtio-web/src/main/webapp/css/site-base.css
@@ -1919,7 +1919,7 @@ dd.file-list {
 
 .active-profile-filter {
   position: absolute;
-  left: 80px;
+  left: 0px;
   top: -10px;
 }
 
@@ -1929,6 +1929,28 @@ dd.file-list {
 
 
 /** fabric brokers page */
+.mq-titles {
+  position: relative;
+  display: inline-block;
+  width: 100%;
+  height: 40px;
+}
+
+.mq-titles.section-header {
+  padding: 0;
+}
+
+.mq-titles .section-controls {
+  position: absolute;
+  top: 9px !important;
+  right: 40px;
+}
+
+.mq-titles .section-controls a {
+  font-weight: normal;
+}
+
+
 .mq-profile-icon {
   color: green !important;
 }