CRM-15789 - Remove ascii art from button text

diff --git a/CRM/Activity/Form/Task/FileOnCase.php b/CRM/Activity/Form/Task/FileOnCase.php
index 7d712d593b5606b64424e43682e975d0a2ae22b2..c4a043d1cb1f0c63dc3b27b7b7f4e3d720dd9ca3 100644 (file)
--- a/CRM/Activity/Form/Task/FileOnCase.php
+++ b/CRM/Activity/Form/Task/FileOnCase.php
@@ -78,7 +78,7 @@ class CRM_Activity_Form_Task_FileOnCase extends CRM_Activity_Form_Task {
    */
   public function buildQuickForm() {
     $this->add('text', 'unclosed_case_id', ts('Select Case'), array('class' => 'huge'), TRUE);
-    $this->addDefaultButtons(ts('Continue >>'));
+    $this->addDefaultButtons(ts('Save'));
   }
 
   /**

diff --git a/CRM/Activity/Form/Task/PickOption.php b/CRM/Activity/Form/Task/PickOption.php
index f85f7af8205b14b31ec32a7d85474d8c9170ccb3..e9ef39a4685089875128e593de577769415a0b20 100644 (file)
--- a/CRM/Activity/Form/Task/PickOption.php
+++ b/CRM/Activity/Form/Task/PickOption.php
@@ -102,7 +102,7 @@ class CRM_Activity_Form_Task_PickOption extends CRM_Activity_Form_Task {
     $this->addElement('checkbox', 'assigned_to', ts('Assigned to Contact'));
     $this->addElement('checkbox', 'created_by', ts('Created by'));
     $this->setDefaults(array('with_contact' => 1));
-    $this->addDefaultButtons(ts('Continue >>'));
+    $this->addDefaultButtons(ts('Continue'));
   }
 
   /**

diff --git a/CRM/Activity/Form/Task/PickProfile.php b/CRM/Activity/Form/Task/PickProfile.php
index ffc938ffea3f91c1abe62cd6e71ad93780ba3182..8230af89b2a28fde7e5695c3f0e89e46a6c34f06 100755 (executable)
--- a/CRM/Activity/Form/Task/PickProfile.php
+++ b/CRM/Activity/Form/Task/PickProfile.php
@@ -130,7 +130,7 @@ class CRM_Activity_Form_Task_PickProfile extends CRM_Activity_Form_Task {
       array(
         '' => ts('- select profile -')) + $profiles, TRUE
     );
-    $this->addDefaultButtons(ts('Continue >>'));
+    $this->addDefaultButtons(ts('Continue'));
   }
 
   /**

diff --git a/CRM/Activity/Import/Form/DataSource.php b/CRM/Activity/Import/Form/DataSource.php
index db08ae6ad3c7298c25020fa0d783036c368427d2..a1987ad0c9fcada8d7a4e1c159b78c1c9c79fc2f 100644 (file)
--- a/CRM/Activity/Import/Form/DataSource.php
+++ b/CRM/Activity/Import/Form/DataSource.php
@@ -109,7 +109,7 @@ class CRM_Activity_Import_Form_DataSource extends CRM_Core_Form {
     $this->addButtons(array(
         array(
           'type' => 'upload',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '          ',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Activity/Import/Form/MapField.php b/CRM/Activity/Import/Form/MapField.php
index 3916e36a9c659cba363f47e23695fe62c50f90a4..6b10ff32fa2aa64402f50fcf436c2e1280b5b26c 100644 (file)
--- a/CRM/Activity/Import/Form/MapField.php
+++ b/CRM/Activity/Import/Form/MapField.php
@@ -246,11 +246,11 @@ class CRM_Activity_Import_Form_MapField extends CRM_Import_Form_MapField {
     $this->addButtons(array(
         array(
           'type' => 'back',
-          'name' => ts('<< Previous'),
+          'name' => ts('Previous'),
         ),
         array(
           'type' => 'next',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Campaign/Form/Survey.php b/CRM/Campaign/Form/Survey.php
index 31375bd15356b57d08069c02f2ea880ebab9be5a..a3357b49a34607ef36c0e47934dfee7cf040b8d0 100644 (file)
--- a/CRM/Campaign/Form/Survey.php
+++ b/CRM/Campaign/Form/Survey.php
@@ -122,7 +122,7 @@ class CRM_Campaign_Form_Survey extends CRM_Core_Form {
       $buttons = array(
         array(
           'type' => 'upload',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '                 ',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Contact/Form/Task/PickProfile.php b/CRM/Contact/Form/Task/PickProfile.php
index dd3422c3bb07befd71cdd6f8336ec80f1ae9835a..571cf5faa9261ed9bce9e6c53575854d89379eb3 100644 (file)
--- a/CRM/Contact/Form/Task/PickProfile.php
+++ b/CRM/Contact/Form/Task/PickProfile.php
@@ -120,7 +120,7 @@ class CRM_Contact_Form_Task_PickProfile extends CRM_Contact_Form_Task {
     }
     $ufGroupElement = $this->add('select', 'uf_group_id', ts('Select Profile'), array('' => ts('- select profile -')) + $profiles, TRUE, array('class' => 'crm-select2 huge'));
 
-    $this->addDefaultButtons(ts('Continue >>'));
+    $this->addDefaultButtons(ts('Continue'));
   }
 
   /**

diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php
index 5a88617e37c427c220f934484e2c16dc67a7a4e1..df202c8ac65bbd698a5495b01f261b23c5cd4714 100644 (file)
--- a/CRM/Contact/Import/Form/DataSource.php
+++ b/CRM/Contact/Import/Form/DataSource.php
@@ -219,7 +219,7 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Core_Form {
     $this->addButtons(array(
         array(
           'type' => 'upload',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '          ',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index 33f86c8a96cd42b8ffad7da61460ff035896f0cb..335e537d3531a2064913f0c2a39a41f97fc17450 100644 (file)
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -601,11 +601,11 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
     $this->addButtons(array(
       array(
         'type' => 'back',
-        'name' => ts('<< Previous'),
+        'name' => ts('Previous'),
       ),
        array(
          'type' => 'next',
-         'name' => ts('Continue >>'),
+         'name' => ts('Continue'),
          'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
          'isDefault' => TRUE,
        ),

diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
index 152cea52e0b5b2cb1652e2f65257973d9467aa02..3046780685e4046aeecc1ec2b2866d293329dd6b 100644 (file)
--- a/CRM/Contact/Import/Form/Preview.php
+++ b/CRM/Contact/Import/Form/Preview.php
@@ -163,12 +163,12 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
     $buttons = array(
       array(
         'type' => 'back',
-        'name' => ts('<< Previous'),
+        'name' => ts('Previous'),
         'js' => array('onclick' => "location.href='{$previousURL}'; return false;"),
       ),
       array(
         'type' => 'next',
-        'name' => ts('Import Now >>'),
+        'name' => ts('Import Now'),
         'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
         'isDefault' => TRUE,
         'js' => array('onclick' => "return verify( );"),

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 5cd5c6f576fec1e0b35e9b5c1b6cdce8ba77aa6f..46f58f679d8713b1eece6bba9a0cc51d2aec4e2a 100644 (file)
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -569,7 +569,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
       $this->addButtons(array(
           array(
             'type' => 'back',
-            'name' => ts('<< Go Back'),
+            'name' => ts('Go Back'),
           ),
         )
       );
@@ -579,7 +579,7 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
         $this->_amount <= 0.0 || $this->_params['is_pay_later'] ||
         ($this->_separateMembershipPayment && $this->_amount <= 0.0)
       ) {
-        $contribButton = ts('Continue >>');
+        $contribButton = ts('Continue');
         $this->assign('button', ts('Continue'));
       }
       else {

diff --git a/CRM/Contribute/Form/ContributionPage.php b/CRM/Contribute/Form/ContributionPage.php
index ea742c6d63fb3420e4df16e876014760f6bd6546..cbb26bb62d9a438c42ce2849983e20629376c23a 100644 (file)
--- a/CRM/Contribute/Form/ContributionPage.php
+++ b/CRM/Contribute/Form/ContributionPage.php
@@ -186,13 +186,13 @@ class CRM_Contribute_Form_ContributionPage extends CRM_Core_Form {
       if (!$this->_first) {
         $buttons[] = array(
           'type' => 'back',
-          'name' => ts('<< Previous'),
+          'name' => ts('Previous'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
         );
       }
       $buttons[] = array(
         'type' => 'next',
-        'name' => ts('Continue >>'),
+        'name' => ts('Continue'),
         'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
         'isDefault' => TRUE,
       );

diff --git a/CRM/Contribute/Form/Task/PickProfile.php b/CRM/Contribute/Form/Task/PickProfile.php
index 9294417d0ffdd23158dcb69ad2ca41a64fdcf925..10de37179037893981ae6472c3ed2a69bbe68f3a 100644 (file)
--- a/CRM/Contribute/Form/Task/PickProfile.php
+++ b/CRM/Contribute/Form/Task/PickProfile.php
@@ -105,7 +105,7 @@ class CRM_Contribute_Form_Task_PickProfile extends CRM_Contribute_Form_Task {
       array(
         '' => ts('- select profile -')) + $profiles, TRUE
     );
-    $this->addDefaultButtons(ts('Continue >>'));
+    $this->addDefaultButtons(ts('Continue'));
   }
 
   /**

diff --git a/CRM/Contribute/Import/Form/DataSource.php b/CRM/Contribute/Import/Form/DataSource.php
index 356be735543b9cd115abf3ed05a222884204c88f..640b63b2699519a9544a9c7588809dcd4889b7da 100644 (file)
--- a/CRM/Contribute/Import/Form/DataSource.php
+++ b/CRM/Contribute/Import/Form/DataSource.php
@@ -135,7 +135,7 @@ class CRM_Contribute_Import_Form_DataSource extends CRM_Core_Form {
     $this->addButtons(array(
         array(
           'type' => 'upload',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '          ',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Contribute/Import/Form/MapField.php b/CRM/Contribute/Import/Form/MapField.php
index 2312392dfa80d845c64d981928a34c0adf2c3daf..288769ed413201fcbac68ee6f359f47de513c115 100644 (file)
--- a/CRM/Contribute/Import/Form/MapField.php
+++ b/CRM/Contribute/Import/Form/MapField.php
@@ -318,11 +318,11 @@ class CRM_Contribute_Import_Form_MapField extends CRM_Import_Form_MapField {
     $this->addButtons(array(
         array(
           'type' => 'back',
-          'name' => ts('<< Previous'),
+          'name' => ts('Previous'),
         ),
         array(
           'type' => 'next',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Custom/Import/Form/DataSource.php b/CRM/Custom/Import/Form/DataSource.php
index e883decf0afda9d86b39a933556d1d7573dd3a84..a8c0d3662dd5a9750258b91eec83e17a22a3ce6a 100644 (file)
--- a/CRM/Custom/Import/Form/DataSource.php
+++ b/CRM/Custom/Import/Form/DataSource.php
@@ -146,7 +146,7 @@ class CRM_Custom_Import_Form_DataSource extends CRM_Core_Form {
     $this->addButtons(array(
         array(
           'type' => 'upload',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '          ',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Event/Cart/Form/Checkout/ConferenceEvents.php b/CRM/Event/Cart/Form/Checkout/ConferenceEvents.php
index 26cbe8e3768e6405b4489e94686d15511847d4d7..7f8c70d5d7569786717ab5cfae6170204e257235 100644 (file)
--- a/CRM/Event/Cart/Form/Checkout/ConferenceEvents.php
+++ b/CRM/Event/Cart/Form/Checkout/ConferenceEvents.php
@@ -97,13 +97,13 @@ EOS;
 
     $buttons = array();
     $buttons[] = array(
-      'name' => ts('<< Go Back'),
+      'name' => ts('Go Back'),
       'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp',
       'type' => 'back',
     );
     $buttons[] = array(
       'isDefault' => TRUE,
-      'name' => ts('Continue >>'),
+      'name' => ts('Continue'),
       'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
       'type' => 'next',
     );

diff --git a/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php b/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php
index 4d46789cdc2cf595e9286556a3d44aff93605323..897f8478db7c81673e6b3d3c7f6ffe8160820932 100644 (file)
--- a/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php
+++ b/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php
@@ -34,7 +34,7 @@ class CRM_Event_Cart_Form_Checkout_ParticipantsAndPrices extends CRM_Event_Cart_
       array(
         array(
           'type' => 'upload',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '         ',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Event/Cart/Form/Checkout/Payment.php b/CRM/Event/Cart/Form/Checkout/Payment.php
index 8b9dbf8e54a0e675305000572447c7b785f13365..c433ca8e7d4ca618be37c939f3b4ea8d95076027 100644 (file)
--- a/CRM/Event/Cart/Form/Checkout/Payment.php
+++ b/CRM/Event/Cart/Form/Checkout/Payment.php
@@ -195,13 +195,13 @@ class CRM_Event_Cart_Form_Checkout_Payment extends CRM_Event_Cart_Form_Cart {
     $this->assign('total', $this->total);
     $buttons = array();
     $buttons[] = array(
-      'name' => ts('<< Go Back'),
+      'name' => ts('Go Back'),
       'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp',
       'type' => 'back',
     );
     $buttons[] = array(
       'isDefault' => TRUE,
-      'name' => ts('Complete Transaction >>'),
+      'name' => ts('Complete Transaction'),
       'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
       'type' => 'next',
     );

diff --git a/CRM/Event/Form/ManageEvent.php b/CRM/Event/Form/ManageEvent.php
index 76dbf160c1ebe9f33c28e7e0d401710838614e26..7e1e55a5c0fbb5654cdc891ef28ee43c43d85d34 100644 (file)
--- a/CRM/Event/Form/ManageEvent.php
+++ b/CRM/Event/Form/ManageEvent.php
@@ -304,13 +304,13 @@ class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
       if (!$this->_first) {
         $buttons[] = array(
           'type' => 'back',
-          'name' => ts('<< Previous'),
+          'name' => ts('Previous'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
         );
       }
       $buttons[] = array(
         'type' => 'upload',
-        'name' => ts('Continue >>'),
+        'name' => ts('Continue'),
         'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
         'isDefault' => TRUE,
       );

diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php
index 92198dfa2df8891f47c95cd6eafe9f19d4113962..d5c05caa65730c729bc4e9424b0d83498b3ff5a3 100644 (file)
--- a/CRM/Event/Form/Registration/AdditionalParticipant.php
+++ b/CRM/Event/Form/Registration/AdditionalParticipant.php
@@ -329,8 +329,8 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R
 
     $buttons = array(
       array(
-    'type' => 'back',
-        'name' => ts('<< Go Back'),
+        'type' => 'back',
+        'name' => ts('Go Back'),
         'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp',
       ),
     );
@@ -339,8 +339,8 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R
     if ($allowToProceed) {
       $buttons = array_merge($buttons, array(
         array(
-      'type' => 'next',
-            'name' => ts('Continue >>'),
+            'type' => 'next',
+            'name' => ts('Continue'),
             'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
             'isDefault' => TRUE,
             'js' => $js,
@@ -350,11 +350,11 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R
       if ($includeSkipButton) {
         $buttons = array_merge($buttons, array(
           array(
-        'type' => 'next',
-              'name' => ts('Skip Participant >>|'),
-              'subName' => 'skip',
-            ),
-          )
+            'type' => 'next',
+            'name' => ts('Skip Participant'),
+            'subName' => 'skip',
+            'icon' => 'seek-next',
+          ))
         );
       }
     }

diff --git a/CRM/Event/Form/Registration/Confirm.php b/CRM/Event/Form/Registration/Confirm.php
index 730aa276fa18c424c0c46e56abc5f10752bc3189..d02c88692f2f0c4af007c39243283b6f5933cafd 100644 (file)
--- a/CRM/Event/Form/Registration/Confirm.php
+++ b/CRM/Event/Form/Registration/Confirm.php
@@ -329,17 +329,17 @@ class CRM_Event_Form_Registration_Confirm extends CRM_Event_Form_Registration {
       $this->addButtons(array(
           array(
             'type' => 'back',
-            'name' => ts('<< Go Back'),
+            'name' => ts('Go Back'),
           ),
         )
       );
     }
     else {
-      $contribButton = ts('Continue >>');
+      $contribButton = ts('Continue');
       $this->addButtons(array(
           array(
             'type' => 'back',
-            'name' => ts('<< Go Back'),
+            'name' => ts('Go Back'),
           ),
           array(
             'type' => 'next',

diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php
index 2f910888e0af9d01e75ee8683289d9e758c6a70a..f6616307304249945a94a7532502a95064f4260d 100644 (file)
--- a/CRM/Event/Form/Registration/Register.php
+++ b/CRM/Event/Form/Registration/Register.php
@@ -515,10 +515,10 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration {
         && !$this->_values['event']['is_monetary']
         && !$this->_values['event']['is_confirm_enabled']
       ) {
-        $buttonLabel = ts('Register >>');
+        $buttonLabel = ts('Register');
       }
       else {
-        $buttonLabel = ts('Continue >>');
+        $buttonLabel = ts('Continue');
       }
 
       $this->addButtons(array(

diff --git a/CRM/Event/Form/Task/PickProfile.php b/CRM/Event/Form/Task/PickProfile.php
index 8cf6ee03f63edd0a69b76165eecc26fbf47332bb..5b020ab93fbb8176822e8f370f0b4aee5100061f 100644 (file)
--- a/CRM/Event/Form/Task/PickProfile.php
+++ b/CRM/Event/Form/Task/PickProfile.php
@@ -103,7 +103,7 @@ class CRM_Event_Form_Task_PickProfile extends CRM_Event_Form_Task {
       array(
         '' => ts('- select profile -')) + $profiles, TRUE
     );
-    $this->addDefaultButtons(ts('Continue >>'));
+    $this->addDefaultButtons(ts('Continue'));
   }
 
   /**

diff --git a/CRM/Event/Import/Form/DataSource.php b/CRM/Event/Import/Form/DataSource.php
index da3e3f00faa87247e300a70e5d7437cc6eaac484..fda54b9f0400c8ed022e8957f7c70e214685d46a 100644 (file)
--- a/CRM/Event/Import/Form/DataSource.php
+++ b/CRM/Event/Import/Form/DataSource.php
@@ -138,7 +138,7 @@ class CRM_Event_Import_Form_DataSource extends CRM_Core_Form {
     $this->addButtons(array(
         array(
           'type' => 'upload',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '          ',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Event/Import/Form/MapField.php b/CRM/Event/Import/Form/MapField.php
index 1a6150b608c4852176a19a811c7bbab71b6f9a80..1d498ce15c72d2ff2f900f055b4ac8c599f54b81 100644 (file)
--- a/CRM/Event/Import/Form/MapField.php
+++ b/CRM/Event/Import/Form/MapField.php
@@ -261,11 +261,11 @@ class CRM_Event_Import_Form_MapField extends CRM_Import_Form_MapField {
     $this->addButtons(array(
         array(
           'type' => 'back',
-          'name' => ts('<< Previous'),
+          'name' => ts('Previous'),
         ),
         array(
           'type' => 'next',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Export/Form/Map.php b/CRM/Export/Form/Map.php
index 25f9f37b6253c1c00d07b8d23a5b9da7eab0ae13..b41ed45370277404519a0eb45d22a63a0497c5ae 100644 (file)
--- a/CRM/Export/Form/Map.php
+++ b/CRM/Export/Form/Map.php
@@ -88,11 +88,11 @@ class CRM_Export_Form_Map extends CRM_Core_Form {
     $this->addButtons(array(
         array(
           'type' => 'back',
-          'name' => ts('<< Previous'),
+          'name' => ts('Previous'),
         ),
         array(
           'type' => 'next',
-          'name' => ts('Export >>'),
+          'name' => ts('Export'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
         ),
         array(

diff --git a/CRM/Export/Form/Select.php b/CRM/Export/Form/Select.php
index cb5c94d35e88856df7db96c8727e91d6b0662ede..e716a8be515d87a1a43671d3e43cc0d648772502 100644 (file)
--- a/CRM/Export/Form/Select.php
+++ b/CRM/Export/Form/Select.php
@@ -323,7 +323,7 @@ FROM   {$this->_componentTable}
     $this->addButtons(array(
         array(
           'type' => 'next',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '          ',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Import/Form/Preview.php b/CRM/Import/Form/Preview.php
index f134b4f23c6f1dc32ff0169f6f3ef3a79724acc1..f66f91750fc03a860bc999425fe1d4f6d5edbbb8 100644 (file)
--- a/CRM/Import/Form/Preview.php
+++ b/CRM/Import/Form/Preview.php
@@ -58,11 +58,11 @@ abstract class CRM_Import_Form_Preview extends CRM_Core_Form {
     $this->addButtons(array(
         array(
           'type' => 'back',
-          'name' => ts('<< Previous'),
+          'name' => ts('Previous'),
         ),
         array(
           'type' => 'next',
-          'name' => ts('Import Now >>'),
+          'name' => ts('Import Now'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Mailing/Form/Group.php b/CRM/Mailing/Form/Group.php
index e2d6e9a76d42166c52ed187fd88d67d7a7ec5e2f..6c0d168d89818580aeceab692dce20399f85f9cc 100644 (file)
--- a/CRM/Mailing/Form/Group.php
+++ b/CRM/Mailing/Form/Group.php
@@ -284,8 +284,8 @@ class CRM_Mailing_Form_Group extends CRM_Contact_Form_Task {
 
     $buttons = array(
       array(
-    'type' => 'next',
-        'name' => ts('Next >>'),
+        'type' => 'next',
+        'name' => ts('Next'),
         'spacing' => '                 ',
         'isDefault' => TRUE,
       ),

diff --git a/CRM/Mailing/Form/Schedule.php b/CRM/Mailing/Form/Schedule.php
index 24a8d71114a1dc71d72edae1ad4f0cfe151505fc..a09e2b09ce1f558d9c60986a0f656d2d954c1762 100644 (file)
--- a/CRM/Mailing/Form/Schedule.php
+++ b/CRM/Mailing/Form/Schedule.php
@@ -125,8 +125,8 @@ class CRM_Mailing_Form_Schedule extends CRM_Core_Form {
       if ($this->_searchBasedMailing) {
         $buttons = array(
           array(
-        'type' => 'back',
-            'name' => ts('<< Previous'),
+            'type' => 'back',
+            'name' => ts('Previous'),
           ),
           array(
             'type' => 'next',
@@ -139,8 +139,8 @@ class CRM_Mailing_Form_Schedule extends CRM_Core_Form {
       else {
         $buttons = array(
           array(
-        'type' => 'back',
-            'name' => ts('<< Previous'),
+            'type' => 'back',
+            'name' => ts('Previous'),
           ),
           array(
             'type' => 'next',

diff --git a/CRM/Mailing/Form/Settings.php b/CRM/Mailing/Form/Settings.php
index 2c409047e4e9a49f0cac06236f04f592c2a40f09..59443fb6044eb4323ad7ccc03d25a89dd9d89eff 100644 (file)
--- a/CRM/Mailing/Form/Settings.php
+++ b/CRM/Mailing/Form/Settings.php
@@ -143,12 +143,12 @@ class CRM_Mailing_Form_Settings extends CRM_Core_Form {
 
     $buttons = array(
       array(
-    'type' => 'back',
-        'name' => ts('<< Previous'),
+        'type' => 'back',
+        'name' => ts('Previous'),
       ),
       array(
         'type' => 'next',
-        'name' => ts('Next >>'),
+        'name' => ts('Next'),
         'spacing' => '&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;',
         'isDefault' => TRUE,
       ),

diff --git a/CRM/Mailing/Form/Test.php b/CRM/Mailing/Form/Test.php
index d77e7507c95a4b2856c0a074a66a8ffadc44c9ef..faf55cd6b28d0b5cf69a2f0004bdfee3d1399f28 100644 (file)
--- a/CRM/Mailing/Form/Test.php
+++ b/CRM/Mailing/Form/Test.php
@@ -80,7 +80,7 @@ class CRM_Mailing_Form_Test extends CRM_Core_Form {
     $this->setDefaults($defaults);
 
     $this->add('submit', 'sendtest', ts('Send a Test Mailing'));
-    $name = ts('Next >>');
+    $name = ts('Next');
     if (CRM_Mailing_Info::workflowEnabled()) {
       if (!CRM_Core_Permission::check('schedule mailings') &&
         CRM_Core_Permission::check('create mailings')
@@ -91,8 +91,8 @@ class CRM_Mailing_Form_Test extends CRM_Core_Form {
 
     $buttons = array(
       array(
-    'type' => 'back',
-        'name' => ts('<< Previous'),
+        'type' => 'back',
+        'name' => ts('Previous'),
       ),
       array(
         'type' => 'next',

diff --git a/CRM/Mailing/Form/Upload.php b/CRM/Mailing/Form/Upload.php
index dfd088ddaa360db242ccfb82a60cab9b6c7959df..223456d304503efb74320233127f080976a55ebb 100644 (file)
--- a/CRM/Mailing/Form/Upload.php
+++ b/CRM/Mailing/Form/Upload.php
@@ -296,12 +296,12 @@ class CRM_Mailing_Form_Upload extends CRM_Core_Form {
 
     $buttons = array(
       array(
-    'type' => 'back',
-        'name' => ts('<< Previous'),
+        'type' => 'back',
+        'name' => ts('Previous'),
       ),
       array(
         'type' => 'upload',
-        'name' => ts('Next >>'),
+        'name' => ts('Next'),
         'spacing' => '&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;',
         'isDefault' => TRUE,
       ),

diff --git a/CRM/Member/Form/Task/PickProfile.php b/CRM/Member/Form/Task/PickProfile.php
index 9c95dd95333781615b7eabd786378d049521cf9e..a61c6c25407964b6cf3e85dee47f844879903ad8 100644 (file)
--- a/CRM/Member/Form/Task/PickProfile.php
+++ b/CRM/Member/Form/Task/PickProfile.php
@@ -102,7 +102,7 @@ class CRM_Member_Form_Task_PickProfile extends CRM_Member_Form_Task {
       array(
         '' => ts('- select profile -')) + $profiles, TRUE
     );
-    $this->addDefaultButtons(ts('Continue >>'));
+    $this->addDefaultButtons(ts('Continue'));
   }
 
   /**

diff --git a/CRM/Member/Import/Form/DataSource.php b/CRM/Member/Import/Form/DataSource.php
index 08203a2f9a8feb6463139ac5dcffb43f2d9c2c33..39a7a32b220c163687f027b20a550cdd20e4a70b 100644 (file)
--- a/CRM/Member/Import/Form/DataSource.php
+++ b/CRM/Member/Import/Form/DataSource.php
@@ -132,7 +132,7 @@ class CRM_Member_Import_Form_DataSource extends CRM_Core_Form {
     $this->addButtons(array(
         array(
           'type' => 'upload',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '          ',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/Member/Import/Form/MapField.php b/CRM/Member/Import/Form/MapField.php
index f5c462f4cd244071c61262bf325a9967bc11dddf..dddb23aad2f5c7ef73b8472851469d0788b87452 100644 (file)
--- a/CRM/Member/Import/Form/MapField.php
+++ b/CRM/Member/Import/Form/MapField.php
@@ -278,11 +278,11 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField {
     $this->addButtons(array(
         array(
           'type' => 'back',
-          'name' => ts('<< Previous'),
+          'name' => ts('Previous'),
         ),
         array(
           'type' => 'next',
-          'name' => ts('Continue >>'),
+          'name' => ts('Continue'),
           'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
           'isDefault' => TRUE,
         ),

diff --git a/CRM/PCP/Form/PCPAccount.php b/CRM/PCP/Form/PCPAccount.php
index 9c2f0fc1d01c2eb931bb3a24fdf9ccc12a16bd9c..091c5babbc5200fb7d5ca1ef875cf54bb3c0d9f2 100644 (file)
--- a/CRM/PCP/Form/PCPAccount.php
+++ b/CRM/PCP/Form/PCPAccount.php
@@ -210,7 +210,7 @@ class CRM_PCP_Form_PCPAccount extends CRM_Core_Form {
     else {
       $button[] = array(
         'type' => 'next',
-        'name' => ts('Continue >>'),
+        'name' => ts('Continue'),
         'spacing' => '         ',
         'isDefault' => TRUE,
       );

diff --git a/CRM/SMS/Form/Group.php b/CRM/SMS/Form/Group.php
index 90e96d2d69a487d39c729374fc7321ee68152016..d435e8ee95b42d60a38aa8a79ac99821f9eb10cd 100644 (file)
--- a/CRM/SMS/Form/Group.php
+++ b/CRM/SMS/Form/Group.php
@@ -167,7 +167,7 @@ class CRM_SMS_Form_Group extends CRM_Contact_Form_Task {
 
     $buttons = array(
       array('type' => 'next',
-        'name' => ts('Next >>'),
+        'name' => ts('Next'),
         'spacing' => '                 ',
         'isDefault' => TRUE,
       ),

diff --git a/CRM/SMS/Form/Schedule.php b/CRM/SMS/Form/Schedule.php
index 297d5527cc4a802a853941080c8007478d2e8498..a75cd67df799377edcec7de217ad4170728305a4 100644 (file)
--- a/CRM/SMS/Form/Schedule.php
+++ b/CRM/SMS/Form/Schedule.php
@@ -84,7 +84,7 @@ class CRM_SMS_Form_Schedule extends CRM_Core_Form {
 
     $buttons = array(
       array('type' => 'back',
-        'name' => ts('<< Previous'),
+        'name' => ts('Previous'),
       ),
       array(
         'type' => 'next',

diff --git a/CRM/SMS/Form/Upload.php b/CRM/SMS/Form/Upload.php
index 459e2976dd6b96902c276acd159c122b5d96f8ed..23fae2b5b5854acddda54a48ca7fa29799261711 100644 (file)
--- a/CRM/SMS/Form/Upload.php
+++ b/CRM/SMS/Form/Upload.php
@@ -171,11 +171,11 @@ class CRM_SMS_Form_Upload extends CRM_Core_Form {
 
     $buttons = array(
       array('type' => 'back',
-        'name' => ts('<< Previous'),
+        'name' => ts('Previous'),
       ),
       array(
         'type' => 'upload',
-        'name' => ts('Next >>'),
+        'name' => ts('Next'),
         'spacing' => '&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;',
         'isDefault' => TRUE,
       ),

diff --git a/templates/CRM/Activity/Form/Search.tpl b/templates/CRM/Activity/Form/Search.tpl
index 56b870bc3cf2818cac4d9c6ea12b9e89c5a31026..79a8cac7e06d7f8f54407200380302e57b68102e 100644 (file)
--- a/templates/CRM/Activity/Form/Search.tpl
+++ b/templates/CRM/Activity/Form/Search.tpl
@@ -35,9 +35,8 @@
         {strip}
           <table class="form-layout">
             <tr>
-              <td class="font-size12pt" colspan="3">
+              <td class="font-size12pt" colspan="2">
                 {$form.sort_name.label}&nbsp;&nbsp;{$form.sort_name.html|crmAddClass:'twenty'}
-                &nbsp;&nbsp;&nbsp;{$form.buttons.html}
                 <div>
                   <div class="description font-italic">{ts}Complete OR Partial Name{/ts}
                     <span class="contact-name-option option-1">{ts} of the Source Contact{/ts}</span>
@@ -46,12 +45,13 @@
                   </div>
                 </div>
               </td>
+              <td>{include file="CRM/common/formButtons.tpl" location="top"}</td>
             </tr>
 
             {include file="CRM/Activity/Form/Search/Common.tpl"}
 
             <tr>
-              <td colspan="3">{$form.buttons.html}</td>
+              <td colspan="3">{include file="CRM/common/formButtons.tpl" location="botton"}</td>
             </tr>
           </table>
         {/strip}

diff --git a/templates/CRM/Batch/Form/Search.tpl b/templates/CRM/Batch/Form/Search.tpl
index 004240178e02aad74a09eaa212e54ff801159bb6..143899125e88c735d9370a53cfb68a666ef88230 100644 (file)
--- a/templates/CRM/Batch/Form/Search.tpl
+++ b/templates/CRM/Batch/Form/Search.tpl
@@ -33,7 +33,7 @@
         {ts}Complete OR partial batch name.{/ts}
         </span>
       </td>
-      <td>{$form.buttons.html}</td>
+      <td>{include file="CRM/common/formButtons.tpl"}</td>
     </tr>
   </table>
 </div>

diff --git a/templates/CRM/Case/Form/Search.tpl b/templates/CRM/Case/Form/Search.tpl
index b5ed0ac824207aebccd1a00f7e8e3e4f30e8968c..5adf01ca2163a2476dc3b60e3797bcd764e0d1b0 100644 (file)
--- a/templates/CRM/Case/Form/Search.tpl
+++ b/templates/CRM/Case/Form/Search.tpl
@@ -37,9 +37,10 @@
         {strip}
             <table class="form-layout">
             <tr class="crm-case-search-form-block-sort_name">
-               <td class="font-size12pt" colspan="3">
-                   {$form.sort_name.label}&nbsp;&nbsp;{$form.sort_name.html|crmAddClass:'twenty'}&nbsp;&nbsp;&nbsp;{$form.buttons.html}
+               <td class="font-size12pt" colspan="2">
+                   {$form.sort_name.label}&nbsp;&nbsp;{$form.sort_name.html|crmAddClass:'twenty'}
                </td>
+              <td>{include file="CRM/common/formButtons.tpl" location="top"}</td>
             </tr>
             {include file="CRM/Case/Form/Search/Common.tpl"}
 

diff --git a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index 092d129b0ea0c1bc5f7d3d526564c00bbca1750a..50798e1216c136f690c731f0f1bd5da85c3b9218 100644 (file)
--- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -130,7 +130,7 @@ CRM.$(function($) {
 
     <table class="form-layout">
         <tr>
-            <td>{$form.buttons.html}</td>
+            <td>{include file="CRM/common/formButtons.tpl" location="botton"}</td>
         </tr>
     </table>
 {/strip}

diff --git a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
index e351941b2e0d5b719f65e8062c91fb06c69b2048..d5d938988777479c6844c581a8a7ea5c2b3073fa 100644 (file)
--- a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
@@ -49,7 +49,7 @@
     </td>
     <td class="labels" rowspan="2">
       <div class="crm-submit-buttons">
-        {include file="CRM/common/formButtons.tpl" location="top" buttonStyle="width:80px; text-align:center;"}
+        {include file="CRM/common/formButtons.tpl" location="top"}
       </div>
       <div class="crm-submit-buttons reset-advanced-search">
         <a href="{crmURL p='civicrm/contact/search/advanced' q='reset=1'}" id="resetAdvancedSearch" class="crm-hover-button" title="{ts}Clear all search criteria{/ts}">