From 97e557d7f754f265d1276824f0e0e76ed4d94e2c Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 7 Aug 2014 13:06:18 +0100 Subject: [PATCH] Change form-submit css class to crm-form-submit --- .../Form/Setting/UpdateConfigBackend.php | 2 +- CRM/Case/Form/CaseView.php | 2 +- CRM/Contact/Form/Search.php | 2 +- CRM/Contact/Form/Task/AddToHousehold.php | 4 +-- CRM/Contact/Form/Task/AddToOrganization.php | 4 +-- CRM/Contribute/Form/Contribution/Confirm.php | 2 +- CRM/Core/Form.php | 4 +-- CRM/Core/Payment/Form.php | 4 +-- CRM/Custom/Form/Option.php | 2 +- CRM/Event/Form/ManageEvent/Fee.php | 2 +- CRM/Event/Form/Registration/Confirm.php | 2 +- CRM/Financial/Form/BatchTransaction.php | 4 +-- CRM/Financial/Form/Search.php | 2 +- css/bluemarine.css | 4 +-- css/civicrm.css | 30 +++++++++---------- css/drupal.css | 4 +-- css/joomla.css | 8 ++--- css/print.css | 2 +- templates/CRM/Admin/Page/APIExplorer.tpl | 2 +- templates/CRM/Block/Add.tpl | 2 +- templates/CRM/Block/FullTextSearch.tpl | 2 +- templates/CRM/Case/Form/ActivityTab.tpl | 2 +- templates/CRM/Contact/Form/Edit/Lock.tpl | 2 +- .../CRM/Contact/Form/Task/EmailCommon.js | 6 ++-- templates/CRM/Contact/Page/View/Email.tpl | 2 +- templates/CRM/Contact/Page/View/Note.tpl | 2 +- templates/CRM/Contact/Page/View/Print.tpl | 4 +-- templates/CRM/Contact/Page/View/Summary.js | 2 +- .../CRM/Contribute/Page/ContributionRecur.tpl | 2 +- templates/CRM/Mailing/Page/Event.tpl | 2 +- templates/CRM/Mailing/Page/Resubscribe.tpl | 4 +-- templates/CRM/common/TabHeader.js | 2 +- templates/CRM/common/navigation.js.tpl | 2 +- templates/CRM/common/success.tpl | 2 +- .../WebTest/Case/CaseDashboardTest.php | 6 ++-- .../WebTest/Contact/InlineFieldsEditTest.php | 2 +- .../Profile/MultiRecordProfileAddTest.php | 8 ++--- 37 files changed, 70 insertions(+), 70 deletions(-) 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 @@ Javascript

     
   
-  
+  
 
 {ts}The result of api calls are displayed in this area.{/ts}
 

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 @@
     
 
 
-

+

 
 
 
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 @@
 

     

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}
           
-          

+          

 
         {if $comments}
         

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}
 
   

-            
+            
   

 
 

@@ -43,7 +43,7 @@
     {include file="CRM/Contact/Page/View/Summary.tpl"}
     

       

-                
+                
       

     

 
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 @@
             {ts}Auto Renew?{/ts}{if $recur.auto_renew}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}
             {if $recur.payment_processor}{ts}Payment Processor{/ts}{$recur.payment_processor}{/if}
           
-          
{ts}Done{/ts}

+          
{ts}Done{/ts}

         
     {/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 @@