buttons to action panel

5 files changed, 32 insertions, 26 deletions

diff --git a/install/static/hbac.js b/install/static/hbac.js
index be0e73ad5..7a08db38d 100755
--- a/install/static/hbac.js
+++ b/install/static/hbac.js
@@ -133,9 +133,9 @@ function ipa_hbac_search_facet(spec) {
             'label': 'Cull Disabled Rules'
         }));
 */
-        var right_buttons = $('<span/>', {
+        var right_buttons = $('<li/>', {
             'style': 'float: right;'
-        }).appendTo(container);
+        }).appendTo($('.action-panel ul'));
 
         right_buttons.append(ipa_button({
             'label': 'HBAC Services',
diff --git a/install/static/hbacsvc.js b/install/static/hbacsvc.js
index 1c7952349..1ff5f0a86 100755
--- a/install/static/hbacsvc.js
+++ b/install/static/hbacsvc.js
@@ -107,9 +107,9 @@ function ipa_hbacsvc_search_facet(spec) {
         // TODO: replace with IPA.metadata[that.entity_name].label
         $('<h2/>', { 'html': 'HBAC Services' }).appendTo(container);
 
-        var right_buttons = $('<span/>', {
+        var right_buttons = $('<li/>', {
             'style': 'float: right;'
-        }).appendTo(container);
+        }).appendTo($('.action-panel ul'));
 
         right_buttons.append(ipa_button({
             'label': 'HBAC Rules',
diff --git a/install/static/hbacsvcgroup.js b/install/static/hbacsvcgroup.js
index eef6d6969..979decdb7 100755
--- a/install/static/hbacsvcgroup.js
+++ b/install/static/hbacsvcgroup.js
@@ -118,9 +118,9 @@ function ipa_hbacsvcgroup_search_facet(spec) {
         // TODO: replace with IPA.metadata[that.entity_name].label
         $('<h2/>', { 'html': 'HBAC Service Groups' }).appendTo(container);
 
-        var right_buttons = $('<span/>', {
+        var right_buttons = $('<li/>', {
             'style': 'float: right;'
-        }).appendTo(container);
+        }).appendTo($('.action-panel ul'));
 
         right_buttons.append(ipa_button({
             'label': 'HBAC Rules',
diff --git a/install/static/ipa.css b/install/static/ipa.css
index 6fac7ae73..2edbc7118 100644
--- a/install/static/ipa.css
+++ b/install/static/ipa.css
@@ -63,6 +63,7 @@ div.tabs {
     overflow: auto;
     width: 100%;
     height: 100%;
+    min-height: 400px;
 }
 
 
@@ -185,12 +186,11 @@ span.attrhint {
     position: absolute;
 }
 
-.ui-tabs-nav{
-}
 
 /*Navigation */
 .tabs1 .ui-tabs-nav{
     padding-left: 50px;
+    padding-top: 50px;
     margin: 0;
     background-image: url(Mainnav-background.png);
 }
@@ -230,6 +230,7 @@ span.attrhint {
 
 .tabs2 .ui-tabs-nav {
     background-image: url(Subnav-background.png);
+    padding-top: 0px;
     margin: 0;
 }
 
@@ -278,8 +279,6 @@ span.main-separator{
 .entity-container{
     position: relative;
     width: 80%;
-    height: 100%;
-    min-height: 200 px;
     margin: 10px;
     padding: 10px;
     background: #e8e8e8;
@@ -287,13 +286,14 @@ span.main-separator{
 
 .action-panel {
     position:relative;
-    top:30px;
+
     left: -20px;
     border-width: thin;
     border-style: solid;
     border-color: black;
     float: left;
-    margin: 10px;
+    margin-top:75px;
+    margin-left: 40px;
 }
 
 .action-panel h3{
@@ -305,8 +305,8 @@ span.main-separator{
 }
 
 .action-panel li {
-#    float: left;
-#    list-style-type: none;
+    height: 25px;
+
 }
 
 .client {
@@ -317,7 +317,10 @@ span.main-separator{
 /* Search */
 
 .search-controls {
-     background:#a5a5a5;
+    height: 25px;
+    background:#a5a5a5;
+    position: relative;
+    padding: 10px;
 }
 
 .search-table > a:link,a:visted{
diff --git a/install/static/search.js b/install/static/search.js
index e253f78c4..d187d6027 100644
--- a/install/static/search.js
+++ b/install/static/search.js
@@ -53,17 +53,20 @@ function ipa_search_widget(spec) {
             'click': function() { that.find(container); }
         }).appendTo(search_filter);
 
-        ipa_button({
-            'label': IPA.messages.button.remove,
-            'icon': 'ui-icon-trash',
-            'click': function() { that.remove(container); }
-        }).appendTo(search_filter);
-
-        ipa_button({
-            'label': IPA.messages.button.add,
-            'icon': 'ui-icon-plus',
-            'click': function() { that.add(container); }
-        }).appendTo(search_filter);
+        var li =         $('<li />', {
+            html: ipa_button({
+                'label': IPA.messages.button.remove,
+                'icon': 'ui-icon-trash',
+                'click': function() { that.remove(container); }
+            })});
+        li.append(
+            ipa_button({
+                'label': IPA.messages.button.add,
+                'icon': 'ui-icon-plus',
+                'click': function() { that.add(container); }
+            })
+        );
+        li.appendTo($('.action-panel ul'));
 
         search_controls.append('<span class="search-buttons"></span>');