From 4a1ffb13864d19f256409d12024e405471ac8e2c Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Mon, 31 Mar 2014 16:36:30 +0200 Subject: webui: remove unused collapsible feature from section --- install/ui/doc/categories.json | 1 + install/ui/images/Makefile.am | 2 -- install/ui/images/arrow-collapsed.png | Bin 1044 -> 0 bytes install/ui/images/arrow-expanded.png | Bin 1047 -> 0 bytes install/ui/ipa.css | 17 ----------------- install/ui/src/freeipa/automember.js | 4 ++-- install/ui/src/freeipa/details.js | 12 ------------ install/ui/src/freeipa/hbac.js | 6 +++--- install/ui/src/freeipa/netgroup.js | 4 ++-- install/ui/src/freeipa/selinux.js | 4 ++-- install/ui/src/freeipa/sudo.js | 10 +++++----- install/ui/src/freeipa/widget.js | 34 +++++----------------------------- 12 files changed, 20 insertions(+), 74 deletions(-) delete mode 100644 install/ui/images/arrow-collapsed.png delete mode 100644 install/ui/images/arrow-expanded.png diff --git a/install/ui/doc/categories.json b/install/ui/doc/categories.json index 17f7967be..c0c0d83e8 100644 --- a/install/ui/doc/categories.json +++ b/install/ui/doc/categories.json @@ -169,6 +169,7 @@ "name": "Sections and layout widgets", "classes": [ "IPA.layout", + "IPA.section", "*_section", "*_layout", "IPA.details_table_section_nc" diff --git a/install/ui/images/Makefile.am b/install/ui/images/Makefile.am index cd9e6a85c..f06e9caa6 100644 --- a/install/ui/images/Makefile.am +++ b/install/ui/images/Makefile.am @@ -2,8 +2,6 @@ NULL = appdir = $(IPA_DATA_DIR)/ui/images app_DATA = \ - arrow-collapsed.png \ - arrow-expanded.png \ centered-background.png \ facet-tab-off.png \ facet-tab-on.png \ diff --git a/install/ui/images/arrow-collapsed.png b/install/ui/images/arrow-collapsed.png deleted file mode 100644 index 61c2dafc4..000000000 Binary files a/install/ui/images/arrow-collapsed.png and /dev/null differ diff --git a/install/ui/images/arrow-expanded.png b/install/ui/images/arrow-expanded.png deleted file mode 100644 index 4f2a9d6d6..000000000 Binary files a/install/ui/images/arrow-expanded.png and /dev/null differ diff --git a/install/ui/ipa.css b/install/ui/ipa.css index 9816433bf..e8921fb60 100644 --- a/install/ui/ipa.css +++ b/install/ui/ipa.css @@ -51,23 +51,6 @@ textarea[readonly] { margin: 0 auto 0; } -/** Icons **/ - -.icon { - display: inline-block; - height: 16px; - width: 16px; - vertical-align: middle; -} - -.expanded-icon { - background: url(images/arrow-expanded.png); -} - -.collapsed-icon { - background: url(images/arrow-collapsed.png); -} - /* ---- Password expiration */ .header-passwordexpires { diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js index ae7304d95..9182e1352 100644 --- a/install/ui/src/freeipa/automember.js +++ b/install/ui/src/freeipa/automember.js @@ -268,7 +268,7 @@ IPA.automember.rule_details_facet = function(spec) { ] }, { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'inclusive', label: '@i18n:objects.automember.inclusive', widgets: [ @@ -298,7 +298,7 @@ IPA.automember.rule_details_facet = function(spec) { ] }, { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'exclusive', label: '@i18n:objects.automember.exclusive', widgets: [ diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js index 279b76a1a..b2f07e463 100644 --- a/install/ui/src/freeipa/details.js +++ b/install/ui/src/freeipa/details.js @@ -43,18 +43,6 @@ define([ */ var exp = {}; -/** - * Name of expanded icon - * @member details - */ -exp.expanded_icon = IPA.expanded_icon = 'expanded-icon'; - -/** - * Name of collapsed icon - * @member details - */ -exp.collapsed_icon = IPA.collapsed_icon = 'collapsed-icon'; - /** * Details builder * diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js index 2e9b96a8e..e8809f037 100644 --- a/install/ui/src/freeipa/hbac.js +++ b/install/ui/src/freeipa/hbac.js @@ -290,7 +290,7 @@ var add_hbacrule_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'user', label: '@i18n:objects.hbacrule.user', widgets: [ @@ -359,7 +359,7 @@ var add_hbacrule_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'host', label: '@i18n:objects.hbacrule.host', widgets: [ @@ -432,7 +432,7 @@ var add_hbacrule_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'service', label: '@i18n:objects.hbacrule.service', widgets: [ diff --git a/install/ui/src/freeipa/netgroup.js b/install/ui/src/freeipa/netgroup.js index 0dd29f1db..d84aca29d 100644 --- a/install/ui/src/freeipa/netgroup.js +++ b/install/ui/src/freeipa/netgroup.js @@ -149,7 +149,7 @@ var add_netgroup_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'user', label: '@i18n:objects.netgroup.user', widgets: [ @@ -233,7 +233,7 @@ var add_netgroup_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'host', label: '@i18n:objects.netgroup.host', widgets: [ diff --git a/install/ui/src/freeipa/selinux.js b/install/ui/src/freeipa/selinux.js index af21356f5..62b081fad 100644 --- a/install/ui/src/freeipa/selinux.js +++ b/install/ui/src/freeipa/selinux.js @@ -192,7 +192,7 @@ var add_selinux_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'user', label: '@i18n:objects.selinuxusermap.user', widgets: [ @@ -261,7 +261,7 @@ var add_selinux_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'host', label: '@i18n:objects.selinuxusermap.host', widgets: [ diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js index d0b0539ef..d1ab20a93 100644 --- a/install/ui/src/freeipa/sudo.js +++ b/install/ui/src/freeipa/sudo.js @@ -312,7 +312,7 @@ var add_sudorule_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'user', label: '@i18n:objects.sudorule.user', widgets: [ @@ -387,7 +387,7 @@ var add_sudorule_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'host', label: '@i18n:objects.sudorule.host', widgets: [ @@ -473,7 +473,7 @@ var add_sudorule_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'command', label: '@i18n:objects.sudorule.command', widgets: [ @@ -589,7 +589,7 @@ var add_sudorule_details_facet_widgets = function (spec) { spec.widgets.push( { - $factory: IPA.collapsible_section, + $factory: IPA.section, name: 'runas', label: '@i18n:objects.sudorule.runas', widgets: [ @@ -682,7 +682,7 @@ IPA.sudo.options_section = function(spec) { spec = spec || {}; - var that = IPA.collapsible_section(spec); + var that = IPA.section(spec); function setup_table(){ that.table = IPA.table_widget({ diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js index bb668c371..34a9660c1 100644 --- a/install/ui/src/freeipa/widget.js +++ b/install/ui/src/freeipa/widget.js @@ -4104,13 +4104,12 @@ IPA.composite_widget = function(spec) { * @class * @extends IPA.composite_widget */ -IPA.collapsible_section = function(spec) { +IPA.section = function(spec) { spec = spec || {}; var that = IPA.composite_widget(spec); - that.collabsible = !!spec.collabsible; that.show_header = spec.show_header === undefined ? true : spec.show_header; that.create = function(container) { @@ -4135,18 +4134,6 @@ IPA.collapsible_section = function(spec) { name: that.name }).appendTo(container); - if (that.collabsible) { - that.icon = $('', { - name: 'icon', - 'class': 'icon section-expand '+IPA.expanded_icon - }).appendTo(that.header); - - that.header.click(function() { - var visible = that.content_container.is(":visible"); - that.toggle(!visible); - }); - } - that.header.append(' '); that.header.append(that.label); @@ -4156,16 +4143,6 @@ IPA.collapsible_section = function(spec) { that.composite_widget_create(that.content_container); }; - that.toggle = function(visible) { - - that.icon.toggleClass(IPA.expanded_icon, visible); - that.icon.toggleClass(IPA.collapsed_icon, !visible); - - if (visible != that.content_container.is(":visible")) { - that.content_container.slideToggle('slow'); - } - }; - return that; }; @@ -4416,15 +4393,15 @@ exp.fluid_layout = IPA.fluid_layout = function(spec) { }; /** - * Collapsible section with table layout + * Section with fluid form layout * @class - * @extends IPA.collapsible_section + * @extends IPA.section */ IPA.details_section = function(spec) { spec = spec || {}; - var that = IPA.collapsible_section(spec); + var that = IPA.section(spec); that.layout = IPA.build(spec.layout || IPA.fluid_layout); that.action_panel = that.build_child(spec.action_panel, {}, { $factory: IPA.action_panel }); @@ -4460,13 +4437,12 @@ IPA.details_section = function(spec) { }; /** - * Collapsible section with table layout + * Section with table layout * @class * @extends IPA.details_section */ IPA.details_table_section = function(spec) { - spec.collabsible = spec.collabsible === undefined ? true : spec.collabsible; spec.layout = spec.layout || IPA.table_layout; var that = IPA.details_section(spec); -- cgit