Rework the profile list controls a bit

hawtio · Oct 1, 2013 · 23b53a8 · 23b53a8
1 parent ec66bc7
commit 23b53a8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 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
@@ -8,18 +8,18 @@
       </div>
     </div>
 
-    <div class="active-profile-create" title="Create a new container">
-      <a ng-click="createContainer()">
+    <div class="section-controls">
+      <a href="" title="Create a new container" ng-click="createContainer()">
         <i class="icon-plus"></i> Create
       </a>
-    </div>
-    <div class="active-profile-count" title="The actual number of instances of each profile that are currently running">Count</div>
-    <div class="active-profile-requirements" title="Configure the required number of instances of each profile which are then either created by an auto-scaler or created manually">
-      <a href="" ng-click="editRequirementsDialog.open()">
+      <a href="" ng-click="editRequirementsDialog.open()" title="Configure the required number of instances of each profile which are then either created by an auto-scaler or created manually">
         <i class="icon-resize-vertical"></i>
         Scale
       </a>
     </div>
+
+    <div class="active-profile-count" title="The actual number of instances of each profile that are currently running">Count</div>
+
   </div>
   <div class="active-profile-list" ng-repeat="profile in activeProfiles" ng-show="profileMatchesFilter(profile)">
     <div class="expandable" ng-class="isOpen(profile)">

diff --git a/hawtio-web/src/main/webapp/app/fabric/html/activeProfiles.html b/hawtio-web/src/main/webapp/app/fabric/html/activeProfiles.html
@@ -1,7 +1,7 @@
 <div class="controller-section" ng-controller="Fabric.ActiveProfileController">
   <div class="row-fluid">
     <div class="span12 active-profile-main">
-      <div class="dashboard-link-row" ng-hide="inDashboard">
+      <div class="dashboard-link-row section-controls" ng-hide="inDashboard">
         <a class="dashboard-link" ng-hide="inDashboard" ng-href="{{addToDashboardLink()}}" title="Add this view to a dashboard"><i class="icon-share" title="Add to dashboard"></i></a>
       </div>
       <div fabric-active-profile-list></div>

diff --git a/hawtio-web/src/main/webapp/css/site-base.css b/hawtio-web/src/main/webapp/css/site-base.css
@@ -1876,6 +1876,17 @@ dd.file-list {
   right: 10px;
 }
 
+.active-profile-titles .section-controls {
+  position: absolute;
+  top: 9px !important;
+  right: 62px;
+}
+
+.active-profile-titles .section-controls a {
+  font-weight: normal;
+}
+
+
 .active-profile-name {
   position: absolute;
   left: 15px;
@@ -1909,7 +1920,7 @@ a.dashboard-link:hover {
 .dashboard-link {
   position: absolute;
   top: 14px;
-  right: 80px;
+  right: 225px;
   z-index: 500;
 }