From c8eb76766afc8755e709cdba62586a8ab1ad65c9 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 21 Jun 2011 15:05:44 -0500 Subject: Converted entity header into facet header. The content and the size of entity header changes depending on the facet being displayed, so the entity header has been converted into a facet header to allow better control via CSS. The DNS record facet has been updated to use the same styling and support scrolling. To help styling and testing, all buttons have been assigned a name. --- install/ui/dns.js | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'install/ui/dns.js') diff --git a/install/ui/dns.js b/install/ui/dns.js index 1d6b81813..6ec807a09 100644 --- a/install/ui/dns.js +++ b/install/ui/dns.js @@ -55,7 +55,7 @@ IPA.entity_factories.dnszone = function() { 'idnsupdatepolicy']}] }). facet({ - factory: IPA.records_facet, + factory: IPA.dnsrecord_facet, name: 'records', facet_group: 'member', label: IPA.metadata.objects.dnsrecord.label, @@ -95,10 +95,13 @@ IPA.force_dnszone_add_checkbox_widget = function(spec) { return IPA.checkbox_widget(spec); }; -IPA.records_facet = function(spec) { +IPA.dnsrecord_facet = function(spec) { spec = spec || {}; + spec.disable_back_link = false; + spec.disable_facet_tabs = false; + var that = IPA.search_facet(spec); var record_types = [ @@ -113,9 +116,11 @@ IPA.records_facet = function(spec) { that.facet_init(); that.table = IPA.table_widget({ + 'class': 'content-table', name: 'search', label: IPA.metadata.objects[that.entity_name].label, - entity_name: that.entity_name + entity_name: that.entity_name, + scrollable: true }); var columns = that.columns.values; @@ -334,10 +339,15 @@ IPA.records_facet = function(spec) { that.facet_create_header(container); + var span = $('', { + 'class': 'right-aligned-facet-controls' + }).appendTo(that.controls); + that.filter = $('', { type: 'text', + 'class': 'search-filter', name: 'filter' - }).appendTo(that.controls); + }).appendTo(span); that.filter.keypress(function(e) { /* if the key pressed is the enter key */ @@ -357,20 +367,21 @@ IPA.records_facet = function(spec) { appendTo(that.controls); */ - that.find_button = IPA.button({ - label: IPA.messages.buttons.find, - icon: 'ui-icon-search', + that.find_button = IPA.action_button({ + name: 'find', + icon: 'search-icon', click: function(){ that.find(); return false; } - }).appendTo(that.controls); + }).appendTo(span); that.controls.append(IPA.create_network_spinner()); that.remove_button = IPA.action_button({ + name: 'remove', label: IPA.messages.buttons.remove, - icon: 'ui-icon-trash', + icon: 'remove-icon', click: function() { if (that.remove_button.hasClass('input_link_disabled')) return false; that.remove(); @@ -379,8 +390,9 @@ IPA.records_facet = function(spec) { }).appendTo(that.controls); that.add_button = IPA.action_button({ + name: 'add', label: IPA.messages.buttons.add, - icon: 'ui-icon-plus', + icon: 'add-icon', click: function() { that.add(); return false; @@ -412,13 +424,7 @@ IPA.records_facet = function(spec) { that.record = $.bbq.getState(that.entity_name+'-record'); that.pkey = $.bbq.getState(that.entity_name+'-pkey'); - that.entity.header.set_pkey(that.pkey); - - that.entity.header.back_link.css('visibility', 'visible'); - that.entity.header.facet_tabs.css('visibility', 'visible'); - - var title = IPA.messages.objects.dnsrecord.title+': '+that.pkey; - that.set_title(this.container, title); + that.header.set_pkey(that.pkey); }; -- cgit