summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/deletenotice.php4
-rw-r--r--actions/designsettings.php5
-rw-r--r--theme/base/css/display.css4
-rw-r--r--theme/default/css/display.css4
-rw-r--r--theme/identica/css/display.css4
5 files changed, 12 insertions, 9 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 8a7c26104..315e5a199 100644
--- a/actions/designsettings.php
+++ b/actions/designsettings.php
@@ -140,11 +140,12 @@ class DesignsettingsAction extends AccountSettingsAction
$this->elementEnd('ul');
$this->elementEnd('fieldset');
- $this->submit('save', _('Save'));
$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)
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8bd0ae1c4..edec14163 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -198,9 +198,11 @@ padding:0 7px;
}
+.form_settings input.form_action-primary {
+padding:0;
+}
.form_settings input.form_action-secondary {
margin-left:29px;
-padding:0;
}
#form_search .submit {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index e4b57ef49..fce2e7e29 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -33,7 +33,7 @@ border-color:#aaa;
border-color:#C3D6DF;
}
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
background:none;
}
@@ -60,7 +60,7 @@ div.notice-options input,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
color:#002E6E;
}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9d625848f..df114417e 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -33,7 +33,7 @@ border-color:#aaa;
border-color:#ddd;
}
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
background:none;
}
@@ -60,7 +60,7 @@ div.notice-options input,
.entity_send-a-message a,
.form_user_nudge input.submit,
.entity_nudge p,
-.form_settings input.form_action-secondary {
+.form_settings input.form_action-primary {
color:#002E6E;
}