diff options
| -rw-r--r-- | actions/emailsettings.php | 28 | ||||
| -rw-r--r-- | lib/htmloutputter.php | 2 | ||||
| -rw-r--r-- | theme/base/css/display.css | 13 |
3 files changed, 25 insertions, 18 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php index d03d5ff84..090df30dd 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -89,12 +89,10 @@ class EmailsettingsAction extends SettingsAction 'class' => 'form_settings', 'action' => common_local_url('emailsettings'))); - $this->elementStart('fieldset'); - $this->element('legend', null, _('Email settings')); - $this->hidden('token', common_session_token()); - $this->elementStart('div', array('id' => 'settings_email_address')); - $this->element('h2', null, _('Address')); + $this->elementStart('fieldset',array('id' => 'settings_email_address')); + $this->element('legend', null, _('Address')); + $this->hidden('token', common_session_token()); if ($user->email) { $this->element('p', array('id' => 'email_confirmed', $user->email)); @@ -122,12 +120,11 @@ class EmailsettingsAction extends SettingsAction $this->submit('add', _('Add')); } } - $this->elementEnd('div'); - - $this->elementStart('div', array('id' => 'settings_email_incoming')); - if ($user->email) { - $this->element('h2', null, _('Incoming email')); + $this->elementEnd('fieldset'); + if ($user->email) { + $this->elementStart('fieldset',array('id' => 'settings_email_incoming')); + $this->element('legend',_('Incoming email')); if ($user->incomingemail) { $this->elementStart('p'); $this->element('span', 'address', $user->incomingemail); @@ -143,11 +140,12 @@ class EmailsettingsAction extends SettingsAction 'cancels the old one.')); $this->elementEnd('p'); $this->submit('newincoming', _('New')); + $this->elementEnd('fieldset'); } - $this->elementEnd('div'); - $this->elementStart('div', array('id' => 'settings_email_preferences')); - $this->element('h2', null, _('Preferences')); + + $this->elementStart('fieldset', array('id' => 'settings_email_preferences')); + $this->element('legend', null, _('Preferences')); $this->elementStart('ul', 'form_datas'); $this->elementStart('li'); @@ -182,11 +180,9 @@ class EmailsettingsAction extends SettingsAction $user->emailmicroid); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->elementEnd('div'); + $this->elementEnd('fieldset'); $this->submit('save', _('Save')); - - $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 37853f345..71f17604b 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -204,7 +204,7 @@ class HTMLOutputter extends XMLOutputter } $this->element('input', $attrs); $this->text(' '); - $this->element('label', array('class' => 'checkbox_label', + $this->element('label', array('class' => 'checkbox', 'for' => $id), $label); $this->text(' '); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 027cb1666..294119c55 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -64,6 +64,13 @@ font-weight:bold; } form ul li input { } + +form input.checkbox { +position:relative; +top:2px; +left:0; +} + form .error { margin-right:11px; } @@ -97,7 +104,8 @@ padding:0; border:0; } .form_settings legend { -display:none; +font-size:1.6em; +text-transform:uppercase; } .form_settings .form_datas label { @@ -124,6 +132,9 @@ margin-bottom:18px; margin-bottom:29px; } +#settings_email_preferences label { +font-weight:normal; +} /* FORM SETTINGS */ |