summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-05-04 14:20:38 -0500
committerEndi S. Dewata <edewata@redhat.com>2011-05-04 14:26:17 -0500
commit0eb96f87f6ab3018ac15580480ef50f53e525d28 (patch)
tree5271f6442d883140f4749db5d1c68fc514141cc6
parentdf09ba120405edfaebcf4cb96cee7a643ad9cb2f (diff)
downloadfreeipa-navigation.zip
freeipa-navigation.tar.gz
freeipa-navigation.tar.xz
Moved back link next to facet tabs.navigation
The back link has been moved from the far right of the page, which is not very intuitive, into a location next to the facet tabs.
-rw-r--r--install/ui/associate.js1
-rw-r--r--install/ui/details.js2
-rw-r--r--install/ui/dns.js1
-rw-r--r--install/ui/entitle.js1
-rw-r--r--install/ui/entity.js30
-rw-r--r--install/ui/ipa.css2
-rw-r--r--install/ui/search.js1
7 files changed, 15 insertions, 23 deletions
diff --git a/install/ui/associate.js b/install/ui/associate.js
index 15fdfbd..3bbf9a4 100644
--- a/install/ui/associate.js
+++ b/install/ui/associate.js
@@ -869,7 +869,6 @@ IPA.association_facet = function (spec) {
that.pkey = $.bbq.getState(that.entity_name+'-pkey', true) || '';
that.entity.header.set_pkey(that.pkey);
- that.entity.header.back_link.css('visibility', 'visible');
that.entity.header.facet_tabs.css('visibility', 'visible');
};
diff --git a/install/ui/details.js b/install/ui/details.js
index a4b36db..bcc96e6 100644
--- a/install/ui/details.js
+++ b/install/ui/details.js
@@ -450,10 +450,8 @@ IPA.details_facet = function(spec) {
that.entity.header.set_pkey(that.pkey);
if (that.entity.facets.length == 1) {
- that.entity.header.back_link.css('visibility', 'hidden');
that.entity.header.facet_tabs.css('visibility', 'hidden');
} else {
- that.entity.header.back_link.css('visibility', 'visible');
that.entity.header.facet_tabs.css('visibility', 'visible');
}
};
diff --git a/install/ui/dns.js b/install/ui/dns.js
index bd8d6e1..bcba709 100644
--- a/install/ui/dns.js
+++ b/install/ui/dns.js
@@ -412,7 +412,6 @@ IPA.records_facet = function (spec){
that.pkey = $.bbq.getState(that.entity_name+'-pkey', true) || '';
that.entity.header.set_pkey(that.pkey);
- that.entity.header.back_link.css('visibility', 'visible');
that.entity.header.facet_tabs.css('visibility', 'visible');
};
diff --git a/install/ui/entitle.js b/install/ui/entitle.js
index 513cb6b..379e7e3 100644
--- a/install/ui/entitle.js
+++ b/install/ui/entitle.js
@@ -315,7 +315,6 @@ IPA.entitle.search_facet = function(spec) {
that.facet_show();
that.entity.header.set_pkey(null);
- that.entity.header.back_link.css('visibility', 'hidden');
that.entity.header.facet_tabs.css('visibility', 'hidden');
};
diff --git a/install/ui/entity.js b/install/ui/entity.js
index f649833..b0f6f3f 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -596,10 +596,20 @@ IPA.entity_header = function(spec) {
'class': 'entity-pkey'
}));
- var search_bar = $('<span/>', {
- 'class': 'entity-search'
+ that.facet_tabs = $('<div/>', {
+ 'class': 'entity-tabs'
}).appendTo(container);
+ that.facet_group(that.facet_tabs, "Member");
+
+ if (that.entity.facets_by_name.details) {
+ that.facet_tabs.append(
+ that.tab_section(that.facet_tabs, 'Settings', [that.entity.facets_by_name.details]));
+ }
+
+ that.facet_group(that.facet_tabs, "Member Of");
+ that.facet_group(that.facet_tabs, "Managed By");
+
that.back_link = $('<span/>', {
'class': 'back-link',
click: function() {
@@ -611,25 +621,11 @@ IPA.entity_header = function(spec) {
$('a', that.facet_tabs).removeClass('selected');
return false;
}
- }).appendTo(search_bar);
+ }).appendTo(that.facet_tabs);
that.back_link.append(IPA.back_icon);
that.back_link.append(' ');
that.back_link.append(IPA.messages.buttons.back_to_list);
-
- that.facet_tabs = $('<div/>', {
- 'class': 'entity-tabs'
- }).appendTo(container);
-
- that.facet_group(that.facet_tabs, "Member");
-
- if (that.entity.facets_by_name.details) {
- that.facet_tabs.append(
- that.tab_section(that.facet_tabs, 'Settings', [that.entity.facets_by_name.details]));
- }
-
- that.facet_group(that.facet_tabs, "Member Of");
- that.facet_group(that.facet_tabs, "Managed By");
};
return that;
diff --git a/install/ui/ipa.css b/install/ui/ipa.css
index 002988b..79e876b 100644
--- a/install/ui/ipa.css
+++ b/install/ui/ipa.css
@@ -837,6 +837,8 @@ table.scrollable tbody {
}
.back-link {
+ float: left;
+ margin: 25px 0 0 0;
cursor: pointer;
}
diff --git a/install/ui/search.js b/install/ui/search.js
index c63bf3c..ae50868 100644
--- a/install/ui/search.js
+++ b/install/ui/search.js
@@ -159,7 +159,6 @@ IPA.search_facet = function(spec) {
that.facet_show();
that.entity.header.set_pkey(null);
- that.entity.header.back_link.css('visibility', 'hidden');
that.entity.header.facet_tabs.css('visibility', 'hidden');
if (that.filter) {