summaryrefslogtreecommitdiff
path: root/actions/smssettings.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-17 20:10:56 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-01-17 20:10:56 +0000
commite019a55a83b70684f629bcd179ec938d735b4a57 (patch)
tree56a44da68df769a965f18caf14e6fadbc2138e2f /actions/smssettings.php
parent400927f757b1e4d13a6703c73125a4a38137eba9 (diff)
parent6cc3f78cf309a80c72156c673dceac21dde63603 (diff)
Merge branch 'uiredesign' of /var/www/trunk into uiredesign
Diffstat (limited to 'actions/smssettings.php')
-rw-r--r--actions/smssettings.php30
1 files changed, 20 insertions, 10 deletions
diff --git a/actions/smssettings.php b/actions/smssettings.php
index f214997ec..6d3c54942 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -83,12 +83,14 @@ class SmssettingsAction extends SettingsAction
$user = common_current_user();
$this->elementStart('form', array('method' => 'post',
- 'id' => 'smssettings',
+ 'id' => 'form_settings_sms',
+ 'class' => 'form_settings',
'action' =>
common_local_url('smssettings')));
+ $this->elementStart('fieldset', array('id' => 'settings_sms_address'));
+ $this->element('legend', null, _('Address'));
$this->hidden('token', common_session_token());
- $this->element('h2', null, _('Address'));
if ($user->sms) {
$this->elementStart('p');
@@ -126,6 +128,7 @@ class SmssettingsAction extends SettingsAction
$this->submit('add', _('Add'));
}
}
+ $this->elementEnd('fieldset');
if ($user->sms) {
$this->element('h2', null, _('Incoming email'));
@@ -139,24 +142,29 @@ class SmssettingsAction extends SettingsAction
$this->submit('removeincoming', _('Remove'));
}
- $this->elementStart('p');
- $this->element('span', 'input_instructions',
+ $this->element('p', 'form_guide',
_('Make a new email address for posting to; '.
'cancels the old one.'));
- $this->elementEnd('p');
$this->submit('newincoming', _('New'));
}
- $this->element('h2', null, _('Preferences'));
+ $this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
+ $this->element('legend', null, _('Preferences'));
+
+ $this->elementStart('ul', 'form_datas');
+ $this->elementStart('li');
$this->checkbox('smsnotify',
_('Send me notices through SMS; '.
'I understand I may incur '.
'exorbitant charges from my carrier.'),
$user->smsnotify);
+ $this->elementEnd('li');
+ $this->elementEnd('ul');
$this->submit('save', _('Save'));
+ $this->elementEnd('fieldset');
$this->elementEnd('form');
}
@@ -436,8 +444,9 @@ class SmssettingsAction extends SettingsAction
$cnt = $carrier->find();
- $this->elementStart('p');
- $this->element('label', array('for' => 'carrier'));
+ $this->elementStart('ul');
+ $this->elementStart('li');
+ $this->element('label', array('for' => 'carrier'), _('Mobile carrier'));
$this->elementStart('select', array('name' => 'carrier',
'id' => 'carrier'));
$this->element('option', array('value' => 0),
@@ -447,13 +456,14 @@ class SmssettingsAction extends SettingsAction
$carrier->name);
}
$this->elementEnd('select');
- $this->elementEnd('p');
- $this->element('span', 'input_instructions',
+ $this->element('p', 'form_guide',
sprintf(_('Mobile carrier for your phone. '.
'If you know a carrier that accepts ' .
'SMS over email but isn\'t listed here, ' .
'send email to let us know at %s.'),
common_config('site', 'email')));
+ $this->elementEnd('li');
+ $this->elementEnd('ul');
}
/**