We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit b9fb70ee authored by sarven's avatar sarven

Markup clean up and styles

parent 2561199e
......@@ -90,7 +90,7 @@ class EmailsettingsAction extends SettingsAction
'action' =>
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->hidden('token', common_session_token());
......@@ -123,7 +123,7 @@ class EmailsettingsAction extends SettingsAction
$this->elementEnd('fieldset');
if ($user->email) {
$this->elementStart('fieldset',array('id' => 'settings_email_incoming'));
$this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
$this->element('legend',_('Incoming email'));
if ($user->incomingemail) {
$this->elementStart('p');
......@@ -180,9 +180,8 @@ class EmailsettingsAction extends SettingsAction
$user->emailmicroid);
$this->elementEnd('li');
$this->elementEnd('ul');
$this->elementEnd('fieldset');
$this->submit('save', _('Save'));
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
......
......@@ -85,11 +85,11 @@ class OpenidsettingsAction extends SettingsAction
$user = common_current_user();
$this->elementStart('form', array('method' => 'post',
'id' => 'form_openid_add',
'id' => 'form_settings_openid_add',
'class' => 'form_settings',
'action' =>
common_local_url('openidsettings')));
$this->elementStart('fieldset');
$this->elementStart('fieldset', array('id' => 'settings_openid_add'));
$this->element('legend', null, _('Add OpenID'));
$this->hidden('token', common_session_token());
$this->element('p', 'form_guide',
......@@ -105,7 +105,7 @@ class OpenidsettingsAction extends SettingsAction
$this->elementEnd('li');
$this->elementEnd('ul');
$this->element('input', array('type' => 'submit',
'id' => 'add',
'id' => 'settings_openid_add_action-submit',
'name' => 'add',
'class' => 'submit',
'value' => _('Add')));
......@@ -139,7 +139,7 @@ class OpenidsettingsAction extends SettingsAction
} else {
$this->element('p', null,
$this->element('p', 'form_guide',
_('You can remove an OpenID from your account '.
'by clicking the button marked "Remove".'));
$idx = 0;
......@@ -147,10 +147,11 @@ class OpenidsettingsAction extends SettingsAction
while ($oid->fetch()) {
$this->elementStart('form',
array('method' => 'POST',
'id' => 'openiddelete' . $idx,
'id' => 'form_settings_openid_delete' . $idx,
'class' => 'form_settings',
'action' =>
common_local_url('openidsettings')));
$this->elementStart('p');
$this->elementStart('fieldset');
$this->hidden('token', common_session_token());
$this->element('a', array('href' => $oid->canonical),
$oid->display);
......@@ -163,7 +164,7 @@ class OpenidsettingsAction extends SettingsAction
'name' => 'remove',
'class' => 'submit',
'value' => _('Remove')));
$this->elementEnd('p');
$this->elementEnd('fieldset');
$this->elementEnd('form');
$idx++;
}
......
......@@ -565,8 +565,7 @@ class Action extends HTMLOutputter // lawsuit
if ($is_selected) {
$lattrs['class'] = 'current';
}
(is_null($id)) ? $lattrs : $lattrs['id'] = $id;
$this->elementStart('li', $lattrs);
$this->elementStart('li', (is_null($id)) ? $lattrs : $lattr['id'] = $id);
$attrs['href'] = $url;
if ($title) {
$attrs['title'] = $title;
......
......@@ -99,6 +99,10 @@ form input.submit {
/* FORM SETTINGS */
.form_settings {
margin-bottom:29px;
}
.form_settings fieldset {
padding:0;
border:0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment