wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Markup clean up and styles

Browse Source
This commit is contained in:
sarven 2009-01-17 00:46:33 +00:00
parent 2561199e59
commit b9fb70ee70
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/emailsettings.php
View File

@ -90,7 +90,7 @@ class EmailsettingsAction extends SettingsAction
'action' => 'action' =>
common_local_url('emailsettings'))); common_local_url('emailsettings')));
$this->elementStart('fieldset',array('id' => 'settings_email_address')); $this->elementStart('fieldset', array('id' => 'settings_email_address'));
$this->element('legend', null, _('Address')); $this->element('legend', null, _('Address'));
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
@ -123,7 +123,7 @@ class EmailsettingsAction extends SettingsAction
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
if ($user->email) { if ($user->email) {
$this->elementStart('fieldset',array('id' => 'settings_email_incoming')); $this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
$this->element('legend',_('Incoming email')); $this->element('legend',_('Incoming email'));
if ($user->incomingemail) { if ($user->incomingemail) {
$this->elementStart('p'); $this->elementStart('p');
@ -180,9 +180,8 @@ class EmailsettingsAction extends SettingsAction
$user->emailmicroid); $user->emailmicroid);
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->elementEnd('fieldset');
$this->submit('save', _('Save')); $this->submit('save', _('Save'));
$this->elementEnd('fieldset');
$this->elementEnd('form'); $this->elementEnd('form');
} }

15
actions/openidsettings.php
View File

@ -85,11 +85,11 @@ class OpenidsettingsAction extends SettingsAction
$user = common_current_user(); $user = common_current_user();
$this->elementStart('form', array('method' => 'post', $this->elementStart('form', array('method' => 'post',
'id' => 'form_openid_add', 'id' => 'form_settings_openid_add',
'class' => 'form_settings', 'class' => 'form_settings',
'action' => 'action' =>
common_local_url('openidsettings'))); common_local_url('openidsettings')));
$this->elementStart('fieldset'); $this->elementStart('fieldset', array('id' => 'settings_openid_add'));
$this->element('legend', null, _('Add OpenID')); $this->element('legend', null, _('Add OpenID'));
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->element('p', 'form_guide', $this->element('p', 'form_guide',
@ -105,7 +105,7 @@ class OpenidsettingsAction extends SettingsAction
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->element('input', array('type' => 'submit', $this->element('input', array('type' => 'submit',
'id' => 'add', 'id' => 'settings_openid_add_action-submit',
'name' => 'add', 'name' => 'add',
'class' => 'submit', 'class' => 'submit',
'value' => _('Add'))); 'value' => _('Add')));
@ -139,7 +139,7 @@ class OpenidsettingsAction extends SettingsAction
} else { } else {
$this->element('p', null, $this->element('p', 'form_guide',
_('You can remove an OpenID from your account '. _('You can remove an OpenID from your account '.
'by clicking the button marked "Remove".')); 'by clicking the button marked "Remove".'));
$idx = 0; $idx = 0;
@ -147,10 +147,11 @@ class OpenidsettingsAction extends SettingsAction
while ($oid->fetch()) { while ($oid->fetch()) {
$this->elementStart('form', $this->elementStart('form',
array('method' => 'POST', array('method' => 'POST',
'id' => 'openiddelete' . $idx, 'id' => 'form_settings_openid_delete' . $idx,
'class' => 'form_settings',
'action' => 'action' =>
common_local_url('openidsettings'))); common_local_url('openidsettings')));
$this->elementStart('p'); $this->elementStart('fieldset');
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->element('a', array('href' => $oid->canonical), $this->element('a', array('href' => $oid->canonical),
$oid->display); $oid->display);
@ -163,7 +164,7 @@ class OpenidsettingsAction extends SettingsAction
'name' => 'remove', 'name' => 'remove',
'class' => 'submit', 'class' => 'submit',
'value' => _('Remove'))); 'value' => _('Remove')));
$this->elementEnd('p'); $this->elementEnd('fieldset');
$this->elementEnd('form'); $this->elementEnd('form');
$idx++; $idx++;
} }

3
lib/action.php
View File

@ -565,8 +565,7 @@ class Action extends HTMLOutputter // lawsuit
if ($is_selected) { if ($is_selected) {
$lattrs['class'] = 'current'; $lattrs['class'] = 'current';
} }
(is_null($id)) ? $lattrs : $lattrs['id'] = $id; $this->elementStart('li', (is_null($id)) ? $lattrs : $lattr['id'] = $id);
$this->elementStart('li', $lattrs);
$attrs['href'] = $url; $attrs['href'] = $url;
if ($title) { if ($title) {
$attrs['title'] = $title; $attrs['title'] = $title;

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

@ -99,6 +99,10 @@ form input.submit {
/* FORM SETTINGS */ /* FORM SETTINGS */
.form_settings {
margin-bottom:29px;
}
.form_settings fieldset { .form_settings fieldset {
padding:0; padding:0;
border:0; border:0;