summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsarven <csarven@plantard.controlezvous.ca>2009-01-17 00:46:33 +0000
committersarven <csarven@plantard.controlezvous.ca>2009-01-17 00:46:33 +0000
commitb9fb70ee70ecd465f5843241b308f2b8680120f6 (patch)
tree090e777bd9dc27426e5d267658df89169a8cd33e
parent2561199e59ce6c4f4390443bda6d17d709ce1e36 (diff)
Markup clean up and styles
-rw-r--r--actions/emailsettings.php7
-rw-r--r--actions/openidsettings.php15
-rw-r--r--lib/action.php3
-rw-r--r--theme/base/css/display.css4
4 files changed, 16 insertions, 13 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 090df30dd..355470815 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -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');
}
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index f24c81795..6f17f154c 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -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++;
}
diff --git a/lib/action.php b/lib/action.php
index 1622047c0..35f6f2e3e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -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;
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 294119c55..3aee52088 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -99,6 +99,10 @@ form input.submit {
/* FORM SETTINGS */
+.form_settings {
+margin-bottom:29px;
+}
+
.form_settings fieldset {
padding:0;
border:0;