From b561962b59e8194e6622f87394e7b8565d78c182 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Wed, 20 May 2009 23:11:35 +0000
Subject: Color picker reset: Resetting form values will also dynamically
 update the page colors back to their original.

---
 actions/designsettings.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actions')

diff --git a/actions/designsettings.php b/actions/designsettings.php
index a85b36a25..8a7c26104 100644
--- a/actions/designsettings.php
+++ b/actions/designsettings.php
@@ -141,7 +141,8 @@ class DesignsettingsAction extends AccountSettingsAction
         $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'));
 
-- 
cgit v1.2.3-54-g00ecf


From 56a8a255fff0037c29db09d4abf6631e9c45c730 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 21 May 2009 00:12:48 +0000
Subject: Changed No/Yes and Reset/Save locations. They are now a little more
 usable by first offering the option to undo and than do.

---
 actions/deletenotice.php       | 4 ++--
 actions/designsettings.php     | 5 +++--
 theme/base/css/display.css     | 4 +++-
 theme/default/css/display.css  | 4 ++--
 theme/identica/css/display.css | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'actions')

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;
 }
 
-- 
cgit v1.2.3-54-g00ecf