summaryrefslogtreecommitdiff
path: root/actions/emailsettings.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-19 12:28:45 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-01-19 12:28:45 +0000
commit264ab53953d529680cea4df31ed125710bb26988 (patch)
treef31c6addf124ff4b1fdfab587d9ddc05b5f19477 /actions/emailsettings.php
parentf2b06b8bbd56ce94d7b46ffcec36e2be3f260fe9 (diff)
parent838502dfd9894e409714c512f83179bab68446d7 (diff)
Merge branch 'uiredesign' of /var/www/trunk into uiredesign
Diffstat (limited to 'actions/emailsettings.php')
-rw-r--r--actions/emailsettings.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 8b8a5351e..b84acb214 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -95,14 +95,14 @@ class EmailsettingsAction extends AccountSettingsAction
$this->hidden('token', common_session_token());
if ($user->email) {
- $this->element('p', array('id' => 'email_confirmed'), $user->email);
+ $this->element('p', array('id' => 'form_confirmed'), $user->email);
$this->element('p', array('class' => 'form_note'), _('Current confirmed email address.'));
$this->hidden('email', $user->email);
$this->submit('remove', _('Remove'));
} else {
$confirm = $this->getConfirmation();
if ($confirm) {
- $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address);
+ $this->element('p', array('id' => 'form_unconfirmed'), $confirm->address);
$this->element('p', array('class' => 'form_note'),
_('Awaiting confirmation on this address. '.
'Check your inbox (and spam box!) for a message '.
@@ -110,7 +110,7 @@ class EmailsettingsAction extends AccountSettingsAction
$this->hidden('email', $confirm->address);
$this->submit('cancel', _('Cancel'));
} else {
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->input('email', _('Email Address'),
($this->arg('email')) ? $this->arg('email') : null,
@@ -146,7 +146,7 @@ class EmailsettingsAction extends AccountSettingsAction
$this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
$this->element('legend', null, _('Preferences'));
- $this->elementStart('ul', 'form_datas');
+ $this->elementStart('ul', 'form_data');
$this->elementStart('li');
$this->checkbox('emailnotifysub',
_('Send me notices of new subscriptions through email.'),