diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-21 12:40:52 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-21 12:40:52 -0400 |
| commit | f25990cf8ed8683d53e9460fb63600a7bdfd10a3 (patch) | |
| tree | 2dc6d49669b13b889e36b47bf34780cf19a88ea2 /actions | |
| parent | 966f1c6169a2d1202e1b69860b975792ca6b9149 (diff) | |
| parent | 07de94ca99c5541b26da9292c4eaa3d80bee3dbe (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/deletenotice.php | 4 | ||||
| -rw-r--r-- | actions/designsettings.php | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/actions/deletenotice.php b/actions/deletenotice.php index 6c350b33a..e733f9650 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -112,8 +112,8 @@ class DeletenoticeAction extends DeleteAction $this->hidden('token', common_session_token()); $this->hidden('notice', $this->trimmed('notice')); $this->element('p', null, _('Are you sure you want to delete this notice?')); - $this->submit('form_action-yes', _('Yes'), 'submit form_action-primary', 'yes'); - $this->submit('form_action-no', _('No'), 'submit form_action-secondary', 'no'); + $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not delete this notice")); + $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this notice')); $this->elementEnd('fieldset'); $this->elementEnd('form'); } diff --git a/actions/designsettings.php b/actions/designsettings.php index a85b36a25..315e5a199 100644 --- a/actions/designsettings.php +++ b/actions/designsettings.php @@ -140,10 +140,12 @@ class DesignsettingsAction extends AccountSettingsAction $this->elementEnd('ul'); $this->elementEnd('fieldset'); - $this->submit('save', _('Save')); - $this->element('input', array('type' => 'reset', + $this->element('input', array('id' => 'settings_design_reset', + 'type' => 'reset', 'value' => 'Reset', - 'class' => 'form_action-secondary')); + 'class' => 'submit form_action-primary', + 'title' => _('Reset back to default'))); + $this->submit('save', _('Save'), 'submit form_action-secondary', 'save', _('Save design')); /*TODO: Check submitted form values: json_encode(form values) |