GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Updates to form styling

Browse Source
This commit is contained in:
sarven 2009-01-17 00:01:53 +00:00
parent f46fd284e4
commit 0a5125675b
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
actions/emailsettings.php
View File

@ -89,12 +89,10 @@ class EmailsettingsAction extends SettingsAction
'class' => 'form_settings', 'class' => 'form_settings',
'action' => 'action' =>
common_local_url('emailsettings'))); 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->elementStart('fieldset',array('id' => 'settings_email_address'));
$this->element('h2', null, _('Address')); $this->element('legend', null, _('Address'));
$this->hidden('token', common_session_token());
if ($user->email) { if ($user->email) {
$this->element('p', array('id' => 'email_confirmed', $user->email)); $this->element('p', array('id' => 'email_confirmed', $user->email));
@ -122,12 +120,11 @@ class EmailsettingsAction extends SettingsAction
$this->submit('add', _('Add')); $this->submit('add', _('Add'));
} }
} }
$this->elementEnd('div'); $this->elementEnd('fieldset');
$this->elementStart('div', array('id' => 'settings_email_incoming'));
if ($user->email) { if ($user->email) {
$this->element('h2', null, _('Incoming email')); $this->elementStart('fieldset',array('id' => 'settings_email_incoming'));
$this->element('legend',_('Incoming email'));
if ($user->incomingemail) { if ($user->incomingemail) {
$this->elementStart('p'); $this->elementStart('p');
$this->element('span', 'address', $user->incomingemail); $this->element('span', 'address', $user->incomingemail);
@ -143,11 +140,12 @@ class EmailsettingsAction extends SettingsAction
'cancels the old one.')); 'cancels the old one.'));
$this->elementEnd('p'); $this->elementEnd('p');
$this->submit('newincoming', _('New')); $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('ul', 'form_datas');
$this->elementStart('li'); $this->elementStart('li');
@ -182,11 +180,9 @@ class EmailsettingsAction extends SettingsAction
$user->emailmicroid); $user->emailmicroid);
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->elementEnd('div'); $this->elementEnd('fieldset');
$this->submit('save', _('Save')); $this->submit('save', _('Save'));
$this->elementEnd('fieldset');
$this->elementEnd('form'); $this->elementEnd('form');
} }

2
lib/htmloutputter.php
View File

@ -204,7 +204,7 @@ class HTMLOutputter extends XMLOutputter
} }
$this->element('input', $attrs); $this->element('input', $attrs);
$this->text(' '); $this->text(' ');
$this->element('label', array('class' => 'checkbox_label', $this->element('label', array('class' => 'checkbox',
'for' => $id), 'for' => $id),
$label); $label);
$this->text(' '); $this->text(' ');

13
theme/base/css/display.css
View File

@ -64,6 +64,13 @@ font-weight:bold;
} }
form ul li input { form ul li input {
} }
form input.checkbox {
position:relative;
top:2px;
left:0;
}
form .error { form .error {
margin-right:11px; margin-right:11px;
} }
@ -97,7 +104,8 @@ padding:0;
border:0; border:0;
} }
.form_settings legend { .form_settings legend {
display:none; font-size:1.6em;
text-transform:uppercase;
} }
.form_settings .form_datas label { .form_settings .form_datas label {
@ -124,6 +132,9 @@ margin-bottom:18px;
margin-bottom:29px; margin-bottom:29px;
} }
#settings_email_preferences label {
font-weight:normal;
}
/* FORM SETTINGS */ /* FORM SETTINGS */