From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 7 Aug 2014 12:06:18 +0000 (+0100)
Subject: Change form-submit css class to crm-form-submit
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=97e557d7f754f265d1276824f0e0e76ed4d94e2c;p=civicrm-core.git

Change form-submit css class to crm-form-submit
---

diff --git a/CRM/Admin/Form/Setting/UpdateConfigBackend.php b/CRM/Admin/Form/Setting/UpdateConfigBackend.php
index b3d096db63..f543c17962 100644
--- a/CRM/Admin/Form/Setting/UpdateConfigBackend.php
+++ b/CRM/Admin/Form/Setting/UpdateConfigBackend.php
@@ -63,7 +63,7 @@ class CRM_Admin_Form_Setting_UpdateConfigBackend extends CRM_Admin_Form_Setting
 
     $this->addElement(
       'submit', $this->getButtonName('next', 'cleanup'), 'Cleanup Caches',
-      array('class' => 'form-submit', 'id' => 'cleanup-cache')
+      array('class' => 'crm-form-submit', 'id' => 'cleanup-cache')
     );
 
     $this->add('text', 'newBaseURL', ts('New Base URL'), NULL, TRUE);
diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php
index 48eb90b1f0..d1dde65e42 100644
--- a/CRM/Case/Form/CaseView.php
+++ b/CRM/Case/Form/CaseView.php
@@ -321,7 +321,7 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form {
           $this->getButtonName('next', 'merge_case'),
           ts('Merge'),
           array(
-            'class' => 'form-submit-inline hiddenElement',
+            'class' => 'crm-form-submit-inline hiddenElement',
           )
         );
       }
diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php
index 98286ab061..fd57b61242 100644
--- a/CRM/Contact/Form/Search.php
+++ b/CRM/Contact/Form/Search.php
@@ -446,7 +446,7 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search {
       $this->assign_by_ref('group', $groupValues);
       $this->add('submit', $this->_actionButtonName, ts('Add Contacts to %1', array(1 => $this->_group[$this->_amtgID])),
         array(
-          'class' => 'form-submit',
+          'class' => 'crm-form-submit',
         )
       );
       $this->add('hidden', 'task', CRM_Contact_Task::GROUP_CONTACTS);
diff --git a/CRM/Contact/Form/Task/AddToHousehold.php b/CRM/Contact/Form/Task/AddToHousehold.php
index 9f757eaeef..2ec983cf4a 100644
--- a/CRM/Contact/Form/Task/AddToHousehold.php
+++ b/CRM/Contact/Form/Task/AddToHousehold.php
@@ -92,8 +92,8 @@ class CRM_Contact_Form_Task_AddToHousehold extends CRM_Contact_Form_Task {
     $this->assign('searchCount', $searchCount);
     $this->assign('searchDone', $this->get('searchDone'));
     $this->assign('contact_type_display', ts('Household'));
-    $this->addElement('submit', $this->getButtonName('refresh'), ts('Search'), array('class' => 'form-submit'));
-    $this->addElement('submit', $this->getButtonName('cancel'), ts('Cancel'), array('class' => 'form-submit'));
+    $this->addElement('submit', $this->getButtonName('refresh'), ts('Search'), array('class' => 'crm-form-submit'));
+    $this->addElement('submit', $this->getButtonName('cancel'), ts('Cancel'), array('class' => 'crm-form-submit'));
 
     $this->addButtons(array(
         array(
diff --git a/CRM/Contact/Form/Task/AddToOrganization.php b/CRM/Contact/Form/Task/AddToOrganization.php
index d9451591e8..af97991700 100644
--- a/CRM/Contact/Form/Task/AddToOrganization.php
+++ b/CRM/Contact/Form/Task/AddToOrganization.php
@@ -93,8 +93,8 @@ class CRM_Contact_Form_Task_AddToOrganization extends CRM_Contact_Form_Task {
     $this->assign('searchCount', $searchCount);
     $this->assign('searchDone', $this->get('searchDone'));
     $this->assign('contact_type_display', ts('Organization'));
-    $this->addElement('submit', $this->getButtonName('refresh'), ts('Search'), array('class' => 'form-submit'));
-    $this->addElement('submit', $this->getButtonName('cancel'), ts('Cancel'), array('class' => 'form-submit'));
+    $this->addElement('submit', $this->getButtonName('refresh'), ts('Search'), array('class' => 'crm-form-submit'));
+    $this->addElement('submit', $this->getButtonName('cancel'), ts('Cancel'), array('class' => 'crm-form-submit'));
 
 
     $this->addButtons(array(
diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index c8cec31f30..cde7e569fc 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -531,7 +531,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
       $this->add('image',
         $this->_checkoutButtonName,
         $this->_paymentProcessor['url_button'],
-        array('class' => 'form-submit')
+        array('class' => 'crm-form-submit')
       );
 
       $this->addButtons(array(
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index f26ce82e24..562d3fe970 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -471,10 +471,10 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
       $js = CRM_Utils_Array::value('js', $button);
       $isDefault = CRM_Utils_Array::value('isDefault', $button, FALSE);
       if ($isDefault) {
-        $attrs = array('class' => 'form-submit default');
+        $attrs = array('class' => 'crm-form-submit default');
       }
       else {
-        $attrs = array('class' => 'form-submit');
+        $attrs = array('class' => 'crm-form-submit');
       }
 
       if ($js) {
diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php
index 73b4b8b41b..d461af28e4 100644
--- a/CRM/Core/Payment/Form.php
+++ b/CRM/Core/Payment/Form.php
@@ -289,7 +289,7 @@ class CRM_Core_Payment_Form {
       $form->add('image',
         $form->_expressButtonName,
         $form->_paymentProcessor['url_button'],
-        array('class' => 'form-submit')
+        array('class' => 'crm-form-submit')
       );
     }
   }
@@ -352,7 +352,7 @@ class CRM_Core_Payment_Form {
       $form->add('image',
         $form->_expressButtonName,
         $form->_paymentProcessor['url_button'],
-        array('class' => 'form-submit')
+        array('class' => 'crm-form-submit')
       );
     }
   }
diff --git a/CRM/Custom/Form/Option.php b/CRM/Custom/Form/Option.php
index 2e8af3d9f5..f509ff6090 100644
--- a/CRM/Custom/Form/Option.php
+++ b/CRM/Custom/Form/Option.php
@@ -235,7 +235,7 @@ class CRM_Custom_Form_Option extends CRM_Core_Form {
         $this->addElement('button',
           'done',
           ts('Done'),
-          array('onclick' => "location.href='$url'", 'class' => 'form-submit')
+          array('onclick' => "location.href='$url'", 'class' => 'crm-form-submit')
         );
       }
     }
diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php
index 879d851f20..c8678770af 100644
--- a/CRM/Event/Form/ManageEvent/Fee.php
+++ b/CRM/Event/Form/ManageEvent/Fee.php
@@ -386,7 +386,7 @@ class CRM_Event_Form_ManageEvent_Fee extends CRM_Event_Form_ManageEvent {
     }
     $_showHide->addToTemplate();
     $this->addElement('submit', $this->getButtonName('submit'), ts('Add Discount Set to Fee Table'),
-      array('class' => 'form-submit cancel')
+      array('class' => 'crm-form-submit cancel')
     );
 
     $this->buildAmountLabel();
diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php
index 4d6ca14f2e..4106dee295 100644
--- a/CRM/Event/Form/Registration/Confirm.php
+++ b/CRM/Event/Form/Registration/Confirm.php
@@ -303,7 +303,7 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration {
       $this->add('image',
         $this->_checkoutButtonName,
         $this->_paymentProcessor['url_button'],
-        array('class' => 'form-submit')
+        array('class' => 'crm-form-submit')
       );
 
       $this->addButtons(array(
diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php
index 907f4b3498..acebc2ae35 100644
--- a/CRM/Financial/Form/BatchTransaction.php
+++ b/CRM/Financial/Form/BatchTransaction.php
@@ -126,7 +126,7 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form {
 
     $this->add('submit','rSubmit', ts('Go'),
       array(
-        'class' => 'form-submit',
+        'class' => 'crm-form-submit',
         'id' => 'GoRemove',
       ));
 
@@ -149,7 +149,7 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form {
 
     $this->add('submit','submit', ts('Go'),
       array(
-        'class' => 'form-submit',
+        'class' => 'crm-form-submit',
         'id' => 'Go',
       ));
     $this->applyFilter('__ALL__', 'trim');
diff --git a/CRM/Financial/Form/Search.php b/CRM/Financial/Form/Search.php
index 2cdbcb08f2..557713df2e 100644
--- a/CRM/Financial/Form/Search.php
+++ b/CRM/Financial/Form/Search.php
@@ -103,7 +103,7 @@ class CRM_Financial_Form_Search extends CRM_Core_Form {
 
     $this->add('submit','submit', ts('Go'),
       array(
-        'class' => 'form-submit',
+        'class' => 'crm-form-submit',
         'id' => 'Go',
       ));
 
diff --git a/css/bluemarine.css b/css/bluemarine.css
index 4f6e637d6c..95b9cde6ca 100644
--- a/css/bluemarine.css
+++ b/css/bluemarine.css
@@ -112,7 +112,7 @@ table {
   font-weight: bold;
   color: #9cf;
 }
-#search .form-text, #search .form-submit {
+#search .form-text, #search .crm-form-submit {
   border: 1px solid #369;
   font-size: 1.1em;
 }
@@ -122,7 +122,7 @@ table {
   padding: 0 0.5em 0 0.5em;
   margin: 0 0 0.5em 0;
 }
-#search .form-submit {
+#search .crm-form-submit {
   height: 1.5em;
 }
 #mission {
diff --git a/css/civicrm.css b/css/civicrm.css
index dd4e1cf328..6fc41a78a9 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -346,11 +346,11 @@ input.crm-form-entityref {
   background-image: linear-gradient(top, #eee 1%, #fff 15%);
 }
 
-.crm-container .form-submit {
+.crm-container .crm-form-submit {
   margin: .25em 0.5em 0.25em 0;
 }
 
-.crm-container .form-submit-inline {
+.crm-container .crm-form-submit-inline {
   margin: 0em 0.5em 0.25em 0em;
 }
 
@@ -2376,10 +2376,10 @@ div.grippie {
 .crm-container a.button,
 .crm-container a.button:link,
 .crm-container a.button:visited,
-.crm-container input.form-submit,
+.crm-container input.crm-form-submit,
 .crm-container .crm-button,
 #crm-container input[type=button],
-#crm-container input.form-submit-inline,
+#crm-container input.crm-form-submit-inline,
 #crm-container .crm-button {
   text-shadow: 0 1px 0 black;
   background: #70716B url(../i/crm-button-bg.gif) repeat-x top left;
@@ -2393,10 +2393,10 @@ div.grippie {
   border: 1px solid #3e3e3e;
 }
 
-.crm-container input.form-submit[disabled],
+.crm-container input.crm-form-submit[disabled],
 .crm-container .crm-button[disabled],
 #crm-container input[type=button][disabled],
-#crm-container input.form-submit-inline[disabled],
+#crm-container input.crm-form-submit-inline[disabled],
 #crm-container .crm-button[disabled] {
     color: #999;
 }
@@ -2406,18 +2406,18 @@ div.grippie {
   padding: 1px;
 }
 
-.crm-container input.form-submit,
+.crm-container input.crm-form-submit,
 #crm-container input[type=button],
-#crm-container input.form-submit-inline {
+#crm-container input.crm-form-submit-inline {
   padding: 2px 6px;
 }
 
 .crm-container .crm-button input[type=button],
-.crm-container .crm-button input.form-submit,
-.crm-container .crm-button input.form-submit-inline,
+.crm-container .crm-button input.crm-form-submit,
+.crm-container .crm-button input.crm-form-submit-inline,
 #crm-container .crm-button input[type=button],
-#crm-container .crm-button input.form-submit,
-#crm-container .crm-button input.form-submit-inline {
+#crm-container .crm-button input.crm-form-submit,
+#crm-container .crm-button input.crm-form-submit-inline {
   padding: 2px 4px;
   margin: 0px;
   background: none;
@@ -3644,9 +3644,9 @@ tbody.scrollContent tr.alternateRow {
 .crm-container .crm-button,
 .crm-container a.button,
 .crm-container a.button:link,
-.crm-container input.form-submit,
+.crm-container input.crm-form-submit,
 .crm-container input[type=button],
-.crm-container input.form-submit-inline {
+.crm-container input.crm-form-submit-inline {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   -khtml-border-radius: 3px;
@@ -3866,7 +3866,7 @@ div.m ul#civicrm-menu,
 }
 
 /* Match font size on 'Continue' button on event participant form (no specific class) */
-#crm-container .crm-event-additionalparticipant-form-block span.crm-button input.form-submit.default {
+#crm-container .crm-event-additionalparticipant-form-block span.crm-button input.crm-form-submit.default {
   font-size: 1.2em;
 }
 
diff --git a/css/drupal.css b/css/drupal.css
index 30ff7289cf..dd91ccc3b7 100644
--- a/css/drupal.css
+++ b/css/drupal.css
@@ -98,7 +98,7 @@ br.clear {
 .container-inline div {
   display: inline;
 }
-.container-inline .form-submit {
+.container-inline .crm-form-submit {
   margin: 0;
 }
 .error {
@@ -151,7 +151,7 @@ tr.light .form-item, tr.dark .form-item {
 .form-item label.option {
   font-weight: normal;
 }
-.form-submit {
+.crm-form-submit {
   margin: 0.5em 0;
 }
 .marker, .form-required {
diff --git a/css/joomla.css b/css/joomla.css
index 1fcd1d201c..f899db0b7b 100644
--- a/css/joomla.css
+++ b/css/joomla.css
@@ -166,7 +166,7 @@ br.clear {
 .container-inline div {
   display: inline;
 }
-.container-inline .form-submit {
+.container-inline .crm-form-submit {
   margin: 0;
 }
 .item-list .icon {
@@ -221,7 +221,7 @@ tr.light .form-item, tr.dark .form-item {
 .form-item label.option {
   font-weight: normal;
 }
-.form-submit {
+.crm-form-submit {
   margin: 0.5em 0;
 }
 .marker, .form-required {
@@ -289,7 +289,7 @@ tr.light .form-item, tr.dark .form-item {
   font-weight: bold;
   color: #9cf;
 }
-#search .form-text, #search .form-submit {
+#search .form-text, #search .crm-form-submit {
   border: 1px solid #369;
   font-size: 1.1em;
 }
@@ -299,7 +299,7 @@ tr.light .form-item, tr.dark .form-item {
   padding: 0 0.5em 0 0.5em;
   margin: 0 0 0.5em 0;
 }
-#search .form-submit {
+#search .crm-form-submit {
   height: 1.5em;
 }
 #main {
diff --git a/css/print.css b/css/print.css
index eeb01a4f34..8a8b2d3248 100644
--- a/css/print.css
+++ b/css/print.css
@@ -1,7 +1,7 @@
 /* CiviCRM Print Media Stylesheet */
 
 /* Hide any buttons or other form items when printing*/
-#crm-container .buttons, #crm-container .crm-submit-buttons, #crm-container .crm-actions-ribbon, #crm-container .form-submit {
+#crm-container .buttons, #crm-container .crm-submit-buttons, #crm-container .crm-actions-ribbon, #crm-container .crm-form-submit {
      display: none;
 }
 
diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl
index 5b387b0d96..6331f5e2ee 100644
--- a/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -130,7 +130,7 @@
       <tr><td>Javascript</td><td><pre class="prettyprint linenums" id="api-json" title='javascript syntax'></pre></td></tr>
     </table>
   </div>
-  <input type="submit" value="{ts}Execute{/ts}" class="form-submit"/>
+  <input type="submit" value="{ts}Execute{/ts}" class="crm-form-submit"/>
 <pre id="api-result" class="linenums">
 {ts}The result of api calls are displayed in this area.{/ts}
 </pre>
diff --git a/templates/CRM/Block/Add.tpl b/templates/CRM/Block/Add.tpl
index 46c2f59403..1584f89773 100644
--- a/templates/CRM/Block/Add.tpl
+++ b/templates/CRM/Block/Add.tpl
@@ -61,7 +61,7 @@
     <input type="hidden" name="qfKey" value="{crmKey name='CRM_Contact_Form_Contact' addSequence=1}" />
 </div>
 
-<div class="form-item"><input type="submit" name="_qf_Contact_next" value="{ts}Save{/ts}" class="form-submit" /></div>
+<div class="form-item"><input type="submit" name="_qf_Contact_next" value="{ts}Save{/ts}" class="crm-form-submit" /></div>
 
 </form>
 </div>
diff --git a/templates/CRM/Block/FullTextSearch.tpl b/templates/CRM/Block/FullTextSearch.tpl
index 8f8009e046..6f0a135766 100644
--- a/templates/CRM/Block/FullTextSearch.tpl
+++ b/templates/CRM/Block/FullTextSearch.tpl
@@ -40,7 +40,7 @@
 <div class="block-crm crm-container">
     <form method="post" id="id_fulltext_search">
     <div style="margin-bottom: 8px;">
-    <input type="text" name="text" id='text' value="" style="width: 10em;" />&nbsp;<input type="submit" name="submit" id="fulltext_submit" value="{ts}Go{/ts}" class="form-submit"/ onclick='submitForm();'>
+    <input type="text" name="text" id='text' value="" style="width: 10em;" />&nbsp;<input type="submit" name="submit" id="fulltext_submit" value="{ts}Go{/ts}" class="crm-form-submit"/ onclick='submitForm();'>
     <input type="hidden" name="qfKey" value="{crmKey name='CRM_Contact_Controller_Search' addSequence=1}" />
   </div>
   <select class="form-select" id="fulltext_table" name="fulltext_table">
diff --git a/templates/CRM/Case/Form/ActivityTab.tpl b/templates/CRM/Case/Form/ActivityTab.tpl
index 5b175ae3a3..8429111cb9 100644
--- a/templates/CRM/Case/Form/ActivityTab.tpl
+++ b/templates/CRM/Case/Form/ActivityTab.tpl
@@ -44,7 +44,7 @@
             </td>
             <td style="vertical-align: bottom;">
               {assign var=caseid value=$caseID}
-              <span class="crm-button"><input class="form-submit default" name="_qf_Basic_refresh" value="Search" type="button" onclick="buildCaseActivities( true,{$caseid} )"; /></span>
+              <span class="crm-button"><input class="crm-form-submit default" name="_qf_Basic_refresh" value="Search" type="button" onclick="buildCaseActivities( true,{$caseid} )"; /></span>
             </td>
           </tr>
           <tr>
diff --git a/templates/CRM/Contact/Form/Edit/Lock.tpl b/templates/CRM/Contact/Form/Edit/Lock.tpl
index 0c4c43af10..371887edfc 100644
--- a/templates/CRM/Contact/Form/Edit/Lock.tpl
+++ b/templates/CRM/Contact/Form/Edit/Lock.tpl
@@ -12,7 +12,7 @@ CRM.$(function($) {
       cj('input[name="modified_date"]').val(
               cj('#update_modified_date').attr('data:latest_modified_date')
       );
-      cj('.crm-form-block .form-submit.default').first().click();
+      cj('.crm-form-block .crm-form-submit.default').first().click();
       return false;
     })
     .appendTo(cj('#update_modified_date'))
diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.js b/templates/CRM/Contact/Form/Task/EmailCommon.js
index 3f6a1b35d6..0005f3cc8e 100644
--- a/templates/CRM/Contact/Form/Task/EmailCommon.js
+++ b/templates/CRM/Contact/Form/Task/EmailCommon.js
@@ -2,13 +2,13 @@ CRM.$(function($) {
   //do not copy & paste this - find a way to generalise it
   'use strict';
   // NOTE: Might be safer to say $('[name=_qf_Email_upload]')
-   $('.form-submit').not('.cancel').on("click", function() {
-     $('.form-submit').not('.cancel').attr({value: ts('Processing')});
+   $('.crm-form-submit').not('.cancel').on("click", function() {
+     $('.crm-form-submit').not('.cancel').attr({value: ts('Processing')});
      // CRM-13449 : setting a 0 ms timeout is needed 
      // for some browsers like chrome. Used for purpose of
      // submit the form and stop accidental multiple clicks
      setTimeout(function(){
-       $('.form-submit').not('.cancel').prop({disabled: true});
+       $('.crm-form-submit').not('.cancel').prop({disabled: true});
      }, 0);
    });
 });
diff --git a/templates/CRM/Contact/Page/View/Email.tpl b/templates/CRM/Contact/Page/View/Email.tpl
index 96d8c70240..7a0913ca2d 100644
--- a/templates/CRM/Contact/Page/View/Email.tpl
+++ b/templates/CRM/Contact/Page/View/Email.tpl
@@ -32,7 +32,7 @@
 <dt>{ts}To{/ts}</dt><dd>{$toName|escape}</dd>
 <dt>{ts}Subject{/ts}</dt><dd>{$subject}</dd>
 <dt>{ts}Message{/ts}</dt><dd>{$message}</dd>
-<dt>&nbsp;</dt><dd><a class="button cancel form-submit" href="{crmURL p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}">{ts}Done{/ts}</a></dd>
+<dt>&nbsp;</dt><dd><a class="button cancel crm-form-submit" href="{crmURL p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}">{ts}Done{/ts}</a></dd>
 </dl>
 </fieldset>
 </div>
diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl
index 29cace82c8..76f2df760b 100644
--- a/templates/CRM/Contact/Page/View/Note.tpl
+++ b/templates/CRM/Contact/Page/View/Note.tpl
@@ -38,7 +38,7 @@
                {include file="CRM/Form/attachment.tpl"}
             {/if}
           </table>
-          <div class="crm-submit-buttons"><input type="submit" class='cancel form-submit' value="{ts}Done{/ts}"/></div>
+          <div class="crm-submit-buttons"><input type="submit" class='cancel crm-form-submit' value="{ts}Done{/ts}"/></div>
 
         {if $comments}
         <fieldset>
diff --git a/templates/CRM/Contact/Page/View/Print.tpl b/templates/CRM/Contact/Page/View/Print.tpl
index 2748e89fe8..3c51488f82 100644
--- a/templates/CRM/Contact/Page/View/Print.tpl
+++ b/templates/CRM/Contact/Page/View/Print.tpl
@@ -35,7 +35,7 @@
 {/literal}
 <form action="{crmURL p='civicrm/contact/view' q="&cid=`$contactId`&reset=1"}" method="post" id="Print1" >
   <div class="form-item">
-       <span class="element-right"><input onclick="window.print(); return false" class="form-submit default" name="_qf_Print_next" value="{ts}Print{/ts}" type="submit" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input class="form-submit" name="_qf_Print_back" value="{ts}Done{/ts}" type="submit" /></span>
+       <span class="element-right"><input onclick="window.print(); return false" class="crm-form-submit default" name="_qf_Print_next" value="{ts}Print{/ts}" type="submit" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input class="crm-form-submit" name="_qf_Print_back" value="{ts}Done{/ts}" type="submit" /></span>
   </div>
 </form>
 <br />
@@ -43,7 +43,7 @@
     {include file="CRM/Contact/Page/View/Summary.tpl"}
     <form action="{crmURL p='civicrm/contact/view' q="&cid=`$contactId`&reset=1"}" method="post" id="Print2" >
       <div class="form-item">
-           <span class="element-right"><input onclick="window.print(); return false" class="form-submit default" name="_qf_Print_next" value="{ts}Print{/ts}" type="submit" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input class="form-submit" name="_qf_Print_back" value="{ts}Done{/ts}" type="submit" /></span>
+           <span class="element-right"><input onclick="window.print(); return false" class="crm-form-submit default" name="_qf_Print_next" value="{ts}Print{/ts}" type="submit" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input class="crm-form-submit" name="_qf_Print_back" value="{ts}Done{/ts}" type="submit" /></span>
       </div>
     </form>
 </div>
diff --git a/templates/CRM/Contact/Page/View/Summary.js b/templates/CRM/Contact/Page/View/Summary.js
index c814aec7bf..8845fdf334 100644
--- a/templates/CRM/Contact/Page/View/Summary.js
+++ b/templates/CRM/Contact/Page/View/Summary.js
@@ -135,7 +135,7 @@
           .click(function() {
             $(form).find('input[name=oplock_ts]').val(errorTag.attr('data:update_oplock_ts'));
             errorTag.parent().hide();
-            $(this).closest('form').find('.form-submit.default').first().click();
+            $(this).closest('form').find('.crm-form-submit.default').first().click();
             return false;
           })
           .appendTo(buttonContainer)
diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl
index b30efb3c9d..fd5be220e0 100644
--- a/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -51,7 +51,7 @@
             <tr><td class="label">{ts}Auto Renew?{/ts}</td><td>{if $recur.auto_renew}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}</td></tr>
             {if $recur.payment_processor}<tr><td class="label">{ts}Payment Processor{/ts}</td><td>{$recur.payment_processor}</td></tr>{/if}
           </table>
-          <div class="crm-submit-buttons"><a class="button cancel form-submit" href="{crmURL p='civicrm/contact/view' q='action=browse&selectedChild=contribute'}">{ts}Done{/ts}</a></div>
+          <div class="crm-submit-buttons"><a class="button cancel crm-form-submit" href="{crmURL p='civicrm/contact/view' q='action=browse&selectedChild=contribute'}">{ts}Done{/ts}</a></div>
         </div>
     {/if}
 {/if}
diff --git a/templates/CRM/Mailing/Page/Event.tpl b/templates/CRM/Mailing/Page/Event.tpl
index d22463560d..e2cb09113d 100644
--- a/templates/CRM/Mailing/Page/Event.tpl
+++ b/templates/CRM/Mailing/Page/Event.tpl
@@ -72,7 +72,7 @@
   <script type="text/javascript">
     var totalPages = {/literal}{$pager->_totalPages}{literal};
     CRM.$(function($) {
-      cj("#crm-container .crm-pager input.form-submit").click(function () {
+      cj("#crm-container .crm-pager input.crm-form-submit").click(function () {
         submitPagerData(this);
       });
     });
diff --git a/templates/CRM/Mailing/Page/Resubscribe.tpl b/templates/CRM/Mailing/Page/Resubscribe.tpl
index 2212cd8863..dd841d340a 100644
--- a/templates/CRM/Mailing/Page/Resubscribe.tpl
+++ b/templates/CRM/Mailing/Page/Resubscribe.tpl
@@ -34,9 +34,9 @@
 {ts 1=$display_name 2=$email}Are you sure you want to resubscribe: %1 (%2){/ts}
 <br/>
 <center>
-<input type="submit" name="_qf_resubscribe_next" value="{ts}Resubscribe{/ts}" class="form-submit" />
+<input type="submit" name="_qf_resubscribe_next" value="{ts}Resubscribe{/ts}" class="crm-form-submit" />
 &nbsp;&nbsp;&nbsp;
-<input type="submit" name="_qf_resubscribe_cancel" value="{ts}Cancel{/ts}" class="form-submit" />
+<input type="submit" name="_qf_resubscribe_cancel" value="{ts}Cancel{/ts}" class="crm-form-submit" />
 </center>
 </form>
 </div>
diff --git a/templates/CRM/common/TabHeader.js b/templates/CRM/common/TabHeader.js
index 82c19815e0..f6aa5f398a 100644
--- a/templates/CRM/common/TabHeader.js
+++ b/templates/CRM/common/TabHeader.js
@@ -23,7 +23,7 @@ CRM.$(function($) {
           params.autoClose = params.openInline = params.cancelButton = params.refreshAction = false;
           ui.panel.on('crmFormLoad', function() {
             // Hack: "Save and done" and "Cancel" buttons submit without ajax
-            $('.cancel.form-submit, input[name$=upload_done]', this).on('click', function(e) {
+            $('.cancel.crm-form-submit, input[name$=upload_done]', this).on('click', function(e) {
               $(this).closest('form').ajaxFormUnbind();
             })
           });
diff --git a/templates/CRM/common/navigation.js.tpl b/templates/CRM/common/navigation.js.tpl
index d5c0a31ced..05c8c53d0c 100644
--- a/templates/CRM/common/navigation.js.tpl
+++ b/templates/CRM/common/navigation.js.tpl
@@ -33,7 +33,7 @@
             <input type="text" id="sort_contact_id" style="display: none" />
             <input type="hidden" name="hidden_location" value="1" />
             <input type="hidden" name="qfKey" value="{crmKey name='CRM_Contact_Controller_Search' addSequence=1}" />
-            <div style="height:1px; overflow:hidden;"><input type="submit" value="{ts}Go{/ts}" name="_qf_Advanced_refresh" class="form-submit default" /></div>
+            <div style="height:1px; overflow:hidden;"><input type="submit" value="{ts}Go{/ts}" name="_qf_Advanced_refresh" class="crm-form-submit default" /></div>
           </div>
         </form>
         <ul>
diff --git a/templates/CRM/common/success.tpl b/templates/CRM/common/success.tpl
index 77abce1d26..c0bf8d97b8 100644
--- a/templates/CRM/common/success.tpl
+++ b/templates/CRM/common/success.tpl
@@ -43,7 +43,7 @@
         <p>{ts}Click 'Upgrade Now' if you are ready to proceed. Otherwise click 'Cancel' to return to the CiviCRM home page.{/ts}</p>
         <input type="hidden" name="action" value="begin" />
         <input type="submit" value="{ts}Upgrade Now{/ts}" name="upgrade" onclick="return confirm('{ts escape="js"}Are you sure you are ready to upgrade now?{/ts}');" /> &nbsp;&nbsp;
-        <a class="button cancel form-submit" value="{ts}Cancel{/ts}" href="{$cancelURL}">{ts}Cancel{/ts}</a>
+        <a class="button cancel crm-form-submit" value="{ts}Cancel{/ts}" href="{$cancelURL}">{ts}Cancel{/ts}</a>
     </form>
   </div>
 
diff --git a/tests/phpunit/WebTest/Case/CaseDashboardTest.php b/tests/phpunit/WebTest/Case/CaseDashboardTest.php
index 7db9fcc93c..8442d855df 100644
--- a/tests/phpunit/WebTest/Case/CaseDashboardTest.php
+++ b/tests/phpunit/WebTest/Case/CaseDashboardTest.php
@@ -65,14 +65,14 @@ class WebTest_Case_CaseDashboardTest extends CiviSeleniumTestCase {
     $this->openCiviPage('case', 'reset=1', 'css=a.button');
 
     // Click on find my cases and check if right radio is checked
-    $this->clickLink("name=find_my_cases", "css=input.form-submit");
+    $this->clickLink("name=find_my_cases", "css=input.crm-form-submit");
     $this->assertTrue($this->isChecked("name=case_owner value=2"), 'Find my cases button not properly setting search form value to my cases.');
 
     // Go back to dashboard
     $this->openCivipage('case', 'reset=1', 'css=a.button');
 
     // Click on a drilldown cell and check if right radio is checked
-    $this->clickLink("css=a.crm-case-summary-drilldown", "css=input.form-submit");
+    $this->clickLink("css=a.crm-case-summary-drilldown", "css=input.crm-form-submit");
     $this->assertTrue($this->isChecked("name=case_owner value=1"), 'Drilldown on dashboard summary cells not properly setting search form value to all cases.');
 
     // Go back to dashboard and reset to my cases
@@ -80,7 +80,7 @@ class WebTest_Case_CaseDashboardTest extends CiviSeleniumTestCase {
     $this->clickLink("name=allupcoming value=0", "css=a.button");
 
     // Click on a drilldown cell and check if right radio is checked
-    $this->clickLink("css=a.crm-case-summary-drilldown", "css=input.form-submit");
+    $this->clickLink("css=a.crm-case-summary-drilldown", "css=input.crm-form-submit");
     $this->assertTrue($this->isChecked("name=case_owner value=2"), 'Drilldown on dashboard summary cells not properly setting search form value to my cases.');
   }
 }
diff --git a/tests/phpunit/WebTest/Contact/InlineFieldsEditTest.php b/tests/phpunit/WebTest/Contact/InlineFieldsEditTest.php
index 7db1986a4a..1a8200ea0e 100644
--- a/tests/phpunit/WebTest/Contact/InlineFieldsEditTest.php
+++ b/tests/phpunit/WebTest/Contact/InlineFieldsEditTest.php
@@ -270,7 +270,7 @@ class WebTest_Contact_InlineFieldsEditTest extends CiviSeleniumTestCase {
           break;
       }
     }
-    $this->click("css=#$block input.form-submit");
+    $this->click("css=#$block input.crm-form-submit");
     if ($valid !== 'error') {
       // Verify the form saved
       $this->waitForElementPresent("css=#$block > .crm-inline-block-content");
diff --git a/tests/phpunit/WebTest/Profile/MultiRecordProfileAddTest.php b/tests/phpunit/WebTest/Profile/MultiRecordProfileAddTest.php
index acb7557160..1d38f8875c 100644
--- a/tests/phpunit/WebTest/Profile/MultiRecordProfileAddTest.php
+++ b/tests/phpunit/WebTest/Profile/MultiRecordProfileAddTest.php
@@ -247,10 +247,10 @@ class WebTest_Profile_MultiRecordProfileAddTest extends CiviSeleniumTestCase {
     // Justification for this instance: FIXME
     sleep(3);
     $this->click("//div[@id='custom--table-wrapper']/div/div/table/tbody/tr/td[3]/span/a[text()='Edit']");
-    $this->waitForElementPresent("xpath=//div[@class='ui-dialog-content ui-widget-content modal-dialog crm-ajax-container']/form/div[2]//div[@id='crm-profile-block']//div[@class='crm-submit-buttons']/span/input[@class='validate form-submit default crm-form-submit']");
+    $this->waitForElementPresent("xpath=//div[@class='ui-dialog-content ui-widget-content modal-dialog crm-ajax-container']/form/div[2]//div[@id='crm-profile-block']//div[@class='crm-submit-buttons']/span/input[@class='validate crm-form-submit default crm-form-submit']");
     $this->verifyText("//div[@id='custom--table-wrapper']/div/div/table/thead/tr/th[1]", preg_quote($params['textFieldLabel']));
     $this->type("//div[@id='crm-profile-block']/div/div[2]/input[@class='crm-form-text required']", $recordNew['text'].'edit');
-    $this->click("xpath=//div[@class='ui-dialog-content ui-widget-content modal-dialog crm-ajax-container']/form/div[2]//div[@id='crm-profile-block']//div[@class='crm-submit-buttons']/span/input[@class='validate form-submit default crm-form-submit']");
+    $this->click("xpath=//div[@class='ui-dialog-content ui-widget-content modal-dialog crm-ajax-container']/form/div[2]//div[@id='crm-profile-block']//div[@class='crm-submit-buttons']/span/input[@class='validate crm-form-submit default crm-form-submit']");
     $this->waitForText("//div[@id='custom--table-wrapper']/div/div/table/tbody/tr[1]/td[1]", $recordNew['text'].'edit');
     $editalertText = $this->getAlert();
     $this->assertEquals("Thank you. Your information has been saved.", $editalertText);
@@ -399,12 +399,12 @@ class WebTest_Profile_MultiRecordProfileAddTest extends CiviSeleniumTestCase {
       $this->type('email-Primary', $params['email']);
       $this->waitForElementPresent("//div[@id='crm-profile-block']//div/div[2]/select");
       $this->select("//div[@id='crm-profile-block']//div/div[2]/select",'value=1');
-      $this->click("xpath=//div[@id='crm-profile-block']//div[@class='crm-submit-buttons']/span/input[@class='validate form-submit default crm-form-submit']");
+      $this->click("xpath=//div[@id='crm-profile-block']//div[@class='crm-submit-buttons']/span/input[@class='validate crm-form-submit default crm-form-submit']");
     }
     else {
       $this->waitForElementPresent("//div[@id='crm-profile-block']//div/div[2]/select");
       $this->select("//div[@id='crm-profile-block']//div/div[2]/select",'value=1');
-      $this->click("xpath=//div[@class='ui-dialog-content ui-widget-content modal-dialog crm-ajax-container']/form/div[2]//div[@id='crm-profile-block']//div[@class='crm-submit-buttons']/span/input[@class='validate form-submit default crm-form-submit']");
+      $this->click("xpath=//div[@class='ui-dialog-content ui-widget-content modal-dialog crm-ajax-container']/form/div[2]//div[@id='crm-profile-block']//div[@class='crm-submit-buttons']/span/input[@class='validate crm-form-submit default crm-form-submit']");
     }
     return $params;
   }