On 11/15/2010 01:44 PM, Adam Young wrote:
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
Rebased on top of 0877-2
From 16cc1e8a9558a9070e40277a08ad6de3cb1e6569 Mon Sep 17 00:00:00 2001
From: Adam Young
Date: Mon, 15 Nov 2010 15:15:47 -0500
Subject: [PATCH] HBAC css cleanup
The additions to the search widget have to go one level deeper, as
'container' has both the action panel and the client area
Conflicts:
install/static/hbac.js
install/static/hbacsvc.js
install/static/hbacsvcgroup.js
---
install/static/hbac.js | 10 --
install/static/hbacsvc.js | 12 +---
install/static/hbacsvcgroup.js |7 +--
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/install/static/hbac.js b/install/static/hbac.js
index eb02bf7..6b209dd 100755
--- a/install/static/hbac.js
+++ b/install/static/hbac.js
@@ -111,10 +111,9 @@ function ipa_hbac_search_facet(spec) {
var that = this;
-// TODO: replace with IPA.metadata[that.entity_name].label
-$('', { 'html': 'HBAC Rules' }).appendTo(container);
/*
+
// Not yet implemented
var left_buttons = $('', {
@@ -128,6 +127,7 @@ function ipa_hbac_search_facet(spec) {
left_buttons.append(ipa_button({
'label': 'Cull Disabled Rules'
}));
+
*/
var ul = $('.action-panel ul');
@@ -154,6 +154,12 @@ function ipa_hbac_search_facet(spec) {
}).appendTo(ul);
that.superior_create(container);
+
+// TODO: replace with IPA.metadata[that.entity_name].label
+container.children().last().prepend(
+$('', { 'html': 'HBAC Rules' }));
+container.children().last().prepend('');
+
};
return that;
diff --git a/install/static/hbacsvc.js b/install/static/hbacsvc.js
index a37c5dd..8f75add 100755
--- a/install/static/hbacsvc.js
+++ b/install/static/hbacsvc.js
@@ -98,9 +98,6 @@ function ipa_hbacsvc_search_facet(spec) {
var that = this;
-// TODO: replace with IPA.metadata[that.entity_name].label
-$('', { 'html': 'HBAC Services' }).appendTo(container);
-
var ul = $('.action-panel ul');
$('', {
@@ -126,6 +123,15 @@ function ipa_hbacsvc_search_facet(spec) {
}).appendTo(ul);
that.superior_create(container);
+
+// TODO: replace with IPA.metadata[that.entity_name].label
+container.children().last().prepend(
+$('', { 'html': 'HBAC Services' }));
+container.children().last().prepend('');
+
+
+
+
};
return that;
diff --git a/install/static/hbacsvcgroup.js b/install/static/hbacsvcgroup.js
index 3a33655..e6845b9 100755
--- a/install/static/hbacsvcgroup.js
+++ b/install/static/hbacsvcgroup.js
@@ -109,8 +109,6 @@ function ipa_hbacsvcgroup_search_facet(spec) {
var that = this;
-// TODO: replace with IPA.metadata[that.entity_name].label
-$('', { 'html': 'HBAC Service Groups' }).appendTo(container);
var ul = $('.action-panel ul');
@@ -137,6 +135,11 @@ function ipa_hbacsvcgroup_search_facet(spec) {
}).appendTo(ul);
that.superior_create(container);
+// TODO: replace with IPA.metadata[that.entity_name].label
+container.children().last().prepend(
+$('', { 'html': 'HBAC Service Groups' }));
+container.children().last().prepend('');
+
};
return that;
--
1.7.1
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
