From 12025f43252d5b689a8429c8e892fda4b67f0d8d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 09:06:46 +0000 Subject: Relaxed the CSS selector for design settings so it can be used in different forms. --- theme/base/css/display.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 96e169d6d..08f20ed95 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1325,16 +1325,16 @@ clear:both; margin-bottom:0; } -#form_settings_design #settings_design_background-image img { +#settings_design_background-image img { max-width:480px; max-height:480px; } -#form_settings_design #settings_design_color .form_data, -#form_settings_design #color-picker { +#settings_design_color .form_data, +#color-picker { float:left; } -#form_settings_design #settings_design_color .form_data { +#settings_design_color .form_data { width:400px; margin-right:28px; } -- cgit v1.2.3-54-g00ecf From bbead9d71b75cfd1c7e7521c6649d38c9b92f3ab Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 09:21:52 +0000 Subject: Relaxed the width for form select --- theme/base/css/display.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 08f20ed95..bfd9b0b27 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -127,6 +127,9 @@ width:39%; .form_settings .form_data textarea { width:63%; } +.form_settings .form_data select { +width:auto; +} .form_settings .form_data input.submit { margin-left:0; -- cgit v1.2.3-54-g00ecf From c988161c3dcc1bf33c868a12f030e909604abdd1 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 09:23:06 +0000 Subject: Separated width selectors for form_data form controls --- theme/base/css/display.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index bfd9b0b27..1057572da 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -122,14 +122,13 @@ float:left; .form_settings .form_data input { margin-left:1.795%; float:left; +} +.form_settings .form_data input { width:39%; } .form_settings .form_data textarea { width:63%; } -.form_settings .form_data select { -width:auto; -} .form_settings .form_data input.submit { margin-left:0; -- cgit v1.2.3-54-g00ecf From 4fc99f8246e166da537b9a025e629677c3ae2ef3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 09:47:04 +0000 Subject: Updated admin design form markup --- actions/designadminpanel.php | 11 +++++++++++ theme/base/css/display.css | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'theme/base') diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index 6b40ae021..d1aadc8c2 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -401,6 +401,9 @@ class DesignAdminPanelForm extends Form $themes = array_combine($themes, $themes); + $this->out->elementStart('fieldset', array('id' => + 'settings_design_theme')); + $this->out->element('legend', null, _('Change theme')); $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li'); @@ -408,7 +411,14 @@ class DesignAdminPanelForm extends Form $themes, _('Theme for the site.'), false, $this->value('theme')); $this->out->elementEnd('li'); + $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); + + $this->out->elementStart('fieldset', array('id' => + 'settings_design_background-image')); + $this->out->element('legend', null, _('Change background image')); + $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li'); $this->out->element('label', array('for' => 'design_background-image_file'), _('Background')); @@ -474,6 +484,7 @@ class DesignAdminPanelForm extends Form } $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); $this->out->elementStart('fieldset', array('id' => 'settings_design_color')); $this->out->element('legend', null, _('Change colours')); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 1057572da..2df322f13 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -167,7 +167,8 @@ font-weight:bold; #form_password_recover legend, #form_password_change legend, .form_entity_block legend, -#form_filter_bytag legend { +#form_filter_bytag legend, +#settings_design_theme legend { display:none; } -- cgit v1.2.3-54-g00ecf From b5ed698bd24fa6587f9b841b49c09698504477ea Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 10:35:27 +0000 Subject: Setting the width to particular form_settings inputs to auto --- theme/base/css/display.css | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 2df322f13..ccac7af2c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -126,6 +126,11 @@ float:left; .form_settings .form_data input { width:39%; } +.form_settings .form_data input.submit, +.form_settings .form_data input.checkbox, +.form_settings .form_data input.radio { +width:auto; +} .form_settings .form_data textarea { width:63%; } @@ -561,7 +566,7 @@ font-weight:bold; /* entity_profile */ .entity_profile { position:relative; -width:74.702%; +width:73%; min-height:123px; float:left; margin-bottom:18px; @@ -632,9 +637,9 @@ font-style:italic; /*entity_actions*/ .entity_actions { float:right; -margin-left:2.35%; +margin-left:2%; margin-bottom:18px; -width:21%; +max-width:25%; } .entity_actions h2 { display:none; -- cgit v1.2.3-54-g00ecf From 1c1c9ccc2a553587115969b460e0e444ef33fe1e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 12:16:11 +0000 Subject: Settling on min-width for entity_actions because 1. better i18n 2. doesn't alter the width when the action is processed. --- theme/base/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme/base') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ccac7af2c..e5f5df68c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -639,7 +639,7 @@ font-style:italic; float:right; margin-left:2%; margin-bottom:18px; -max-width:25%; +min-width:21%; } .entity_actions h2 { display:none; -- cgit v1.2.3-54-g00ecf