Added primary and secondary form actions. Fixed markup for

form_notice_delete

4 files changed, 28 insertions, 12 deletions

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index d4b8e50e5..16e2df889 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -103,17 +103,18 @@ class DeletenoticeAction extends DeleteAction
 
     function showContent()
     {
-        $this->elementStart('form', array('id' => 'notice_delete_form',
+        $this->elementStart('form', array('id' => 'form_notice_delete',
+                                          'class' => 'form_settings',
                                           'method' => 'post',
                                           'action' => common_local_url('deletenotice')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Delete notice'));
         $this->hidden('token', common_session_token());
         $this->hidden('notice', $this->trimmed('notice'));
-        $this->elementStart('p');
-        $this->element('span', array('id' => 'confirmation_text'),
-                       _('Are you sure you want to delete this notice?'));
-        $this->submit('yes', _('Yes'));
-        $this->submit('no', _('No'));
-        $this->elementEnd('p');
+        $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->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 60eaa8f22..f6e3c0fc7 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -152,7 +152,8 @@ font-weight:bold;
 #form_remote_subscribe legend,
 #form_openid_login legend,
 #form_search legend,
-#form_invite legend {
+#form_invite legend,
+#form_notice_delete legend {
 display:none;
 }
 
@@ -179,6 +180,7 @@ float:left;
 width:90%;
 }
 
+
 #form_login p.form_guide,
 #form_register #settings_rememberme p.form_guide,
 #form_openid_login #settings_rememberme p.form_guide,
@@ -194,12 +196,16 @@ border-radius:4px;
 padding:0 7px;
 }
 
+
+.form_settings input.form_action-secondary {
+margin-left:29px;
+padding:0;
+}
+
 #form_search .submit {
 margin-left:11px;
 }
 
-
-
 address {
 float:left;
 margin-bottom:18px;
@@ -1169,3 +1175,4 @@ clear:both;
 margin-bottom:0;
 }
 
+
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index da1ba6717..854202956 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -34,6 +34,9 @@ border-color:#aaa;
 border-color:#97BFD1;
 }
 
+.form_settings input.form_action-secondary {
+background:none;
+}
 
 input.submit,
 #form_notice.warning #notice_text-count,
@@ -59,7 +62,8 @@ div.notice-options input,
 .form_user_unblock input.submit,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_settings input.form_action-secondary {
 color:#002E6E;
 }
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 6fcd730a9..9f6499013 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -34,6 +34,9 @@ border-color:#aaa;
 border-color:#ddd;
 }
 
+.form_settings input.form_action-secondary {
+background:none;
+}
 
 input.submit,
 #form_notice.warning #notice_text-count,
@@ -59,7 +62,8 @@ div.notice-options input,
 .form_user_unblock input.submit,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
-.entity_nudge p {
+.entity_nudge p,
+.form_settings input.form_action-secondary {
 color:#002E6E;
 }