From f212d37d5ee36a991eb5529211b692dee29378c0 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 8 Jan 2015 13:40:51 -0500 Subject: [PATCH] CRM-15789 - Remove ascii art from button text --- CRM/Activity/Form/Task/FileOnCase.php | 2 +- CRM/Activity/Form/Task/PickOption.php | 2 +- CRM/Activity/Form/Task/PickProfile.php | 2 +- CRM/Activity/Import/Form/DataSource.php | 2 +- CRM/Activity/Import/Form/MapField.php | 4 ++-- CRM/Campaign/Form/Survey.php | 2 +- CRM/Contact/Form/Task/PickProfile.php | 2 +- CRM/Contact/Import/Form/DataSource.php | 2 +- CRM/Contact/Import/Form/MapField.php | 4 ++-- CRM/Contact/Import/Form/Preview.php | 4 ++-- CRM/Contribute/Form/Contribution/Confirm.php | 4 ++-- CRM/Contribute/Form/ContributionPage.php | 4 ++-- CRM/Contribute/Form/Task/PickProfile.php | 2 +- CRM/Contribute/Import/Form/DataSource.php | 2 +- CRM/Contribute/Import/Form/MapField.php | 4 ++-- CRM/Custom/Import/Form/DataSource.php | 2 +- .../Cart/Form/Checkout/ConferenceEvents.php | 4 ++-- .../Form/Checkout/ParticipantsAndPrices.php | 2 +- CRM/Event/Cart/Form/Checkout/Payment.php | 4 ++-- CRM/Event/Form/ManageEvent.php | 4 ++-- .../Registration/AdditionalParticipant.php | 18 +++++++++--------- CRM/Event/Form/Registration/Confirm.php | 6 +++--- CRM/Event/Form/Registration/Register.php | 4 ++-- CRM/Event/Form/Task/PickProfile.php | 2 +- CRM/Event/Import/Form/DataSource.php | 2 +- CRM/Event/Import/Form/MapField.php | 4 ++-- CRM/Export/Form/Map.php | 4 ++-- CRM/Export/Form/Select.php | 2 +- CRM/Import/Form/Preview.php | 4 ++-- CRM/Mailing/Form/Group.php | 4 ++-- CRM/Mailing/Form/Schedule.php | 8 ++++---- CRM/Mailing/Form/Settings.php | 6 +++--- CRM/Mailing/Form/Test.php | 6 +++--- CRM/Mailing/Form/Upload.php | 6 +++--- CRM/Member/Form/Task/PickProfile.php | 2 +- CRM/Member/Import/Form/DataSource.php | 2 +- CRM/Member/Import/Form/MapField.php | 4 ++-- CRM/PCP/Form/PCPAccount.php | 2 +- CRM/SMS/Form/Group.php | 2 +- CRM/SMS/Form/Schedule.php | 2 +- CRM/SMS/Form/Upload.php | 4 ++-- templates/CRM/Activity/Form/Search.tpl | 6 +++--- templates/CRM/Batch/Form/Search.tpl | 2 +- templates/CRM/Case/Form/Search.tpl | 5 +++-- .../Contact/Form/Search/AdvancedCriteria.tpl | 2 +- .../CRM/Contact/Form/Search/Criteria/Basic.tpl | 2 +- 46 files changed, 85 insertions(+), 84 deletions(-) diff --git a/CRM/Activity/Form/Task/FileOnCase.php b/CRM/Activity/Form/Task/FileOnCase.php index 7d712d593b..c4a043d1cb 100644 --- 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 f85f7af820..e9ef39a468 100644 --- 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 ffc938ffea..8230af89b2 100755 --- 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 db08ae6ad3..a1987ad0c9 100644 --- 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 3916e36a9c..6b10ff32fa 100644 --- 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' => '          ', 'isDefault' => TRUE, ), diff --git a/CRM/Campaign/Form/Survey.php b/CRM/Campaign/Form/Survey.php index 31375bd153..a3357b49a3 100644 --- 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 dd3422c3bb..571cf5faa9 100644 --- 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 5a88617e37..df202c8ac6 100644 --- 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 33f86c8a96..335e537d35 100644 --- 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' => '          ', 'isDefault' => TRUE, ), diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php index 152cea52e0..3046780685 100644 --- 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' => '          ', 'isDefault' => TRUE, 'js' => array('onclick' => "return verify( );"), diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index 5cd5c6f576..46f58f679d 100644 --- 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 ea742c6d63..cbb26bb62d 100644 --- 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' => '     ', ); } $buttons[] = array( 'type' => 'next', - 'name' => ts('Continue >>'), + 'name' => ts('Continue'), 'spacing' => '         ', 'isDefault' => TRUE, ); diff --git a/CRM/Contribute/Form/Task/PickProfile.php b/CRM/Contribute/Form/Task/PickProfile.php index 9294417d0f..10de371790 100644 --- 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 356be73554..640b63b269 100644 --- 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 2312392dfa..288769ed41 100644 --- 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' => '          ', 'isDefault' => TRUE, ), diff --git a/CRM/Custom/Import/Form/DataSource.php b/CRM/Custom/Import/Form/DataSource.php index e883decf0a..a8c0d3662d 100644 --- 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 26cbe8e376..7f8c70d5d7 100644 --- 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' => '    ', 'type' => 'back', ); $buttons[] = array( 'isDefault' => TRUE, - 'name' => ts('Continue >>'), + 'name' => ts('Continue'), 'spacing' => '                  ', 'type' => 'next', ); diff --git a/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php b/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.php index 4d46789cdc..897f8478db 100644 --- 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 8b9dbf8e54..c433ca8e7d 100644 --- 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' => '    ', 'type' => 'back', ); $buttons[] = array( 'isDefault' => TRUE, - 'name' => ts('Complete Transaction >>'), + 'name' => ts('Complete Transaction'), 'spacing' => '                  ', 'type' => 'next', ); diff --git a/CRM/Event/Form/ManageEvent.php b/CRM/Event/Form/ManageEvent.php index 76dbf160c1..7e1e55a5c0 100644 --- 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' => '     ', ); } $buttons[] = array( 'type' => 'upload', - 'name' => ts('Continue >>'), + 'name' => ts('Continue'), 'spacing' => '         ', 'isDefault' => TRUE, ); diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php index 92198dfa2d..d5c05caa65 100644 --- 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' => '    ', ), ); @@ -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' => '                  ', '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 730aa276fa..d02c88692f 100644 --- 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 2f910888e0..f661630730 100644 --- 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 8cf6ee03f6..5b020ab93f 100644 --- 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 da3e3f00fa..fda54b9f04 100644 --- 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 1a6150b608..1d498ce15c 100644 --- 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' => '          ', 'isDefault' => TRUE, ), diff --git a/CRM/Export/Form/Map.php b/CRM/Export/Form/Map.php index 25f9f37b62..b41ed45370 100644 --- 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' => '          ', ), array( diff --git a/CRM/Export/Form/Select.php b/CRM/Export/Form/Select.php index cb5c94d35e..e716a8be51 100644 --- 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 f134b4f23c..f66f91750f 100644 --- 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' => '          ', 'isDefault' => TRUE, ), diff --git a/CRM/Mailing/Form/Group.php b/CRM/Mailing/Form/Group.php index e2d6e9a76d..6c0d168d89 100644 --- 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 24a8d71114..a09e2b09ce 100644 --- 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 2c409047e4..59443fb604 100644 --- 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' => '                 ', 'isDefault' => TRUE, ), diff --git a/CRM/Mailing/Form/Test.php b/CRM/Mailing/Form/Test.php index d77e7507c9..faf55cd6b2 100644 --- 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 dfd088ddaa..223456d304 100644 --- 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' => '                 ', 'isDefault' => TRUE, ), diff --git a/CRM/Member/Form/Task/PickProfile.php b/CRM/Member/Form/Task/PickProfile.php index 9c95dd9533..a61c6c2540 100644 --- 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 08203a2f9a..39a7a32b22 100644 --- 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 f5c462f4cd..dddb23aad2 100644 --- 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' => '          ', 'isDefault' => TRUE, ), diff --git a/CRM/PCP/Form/PCPAccount.php b/CRM/PCP/Form/PCPAccount.php index 9c2f0fc1d0..091c5babbc 100644 --- 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 90e96d2d69..d435e8ee95 100644 --- 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 297d5527cc..a75cd67df7 100644 --- 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 459e2976dd..23fae2b5b5 100644 --- 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' => '                 ', 'isDefault' => TRUE, ), diff --git a/templates/CRM/Activity/Form/Search.tpl b/templates/CRM/Activity/Form/Search.tpl index 56b870bc3c..79a8cac7e0 100644 --- a/templates/CRM/Activity/Form/Search.tpl +++ b/templates/CRM/Activity/Form/Search.tpl @@ -35,9 +35,8 @@ {strip} - + {include file="CRM/Activity/Form/Search/Common.tpl"} - +
+ {$form.sort_name.label}  {$form.sort_name.html|crmAddClass:'twenty'} -    {$form.buttons.html}
{ts}Complete OR Partial Name{/ts} {ts} of the Source Contact{/ts} @@ -46,12 +45,13 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.buttons.html}{include file="CRM/common/formButtons.tpl" location="botton"}
{/strip} diff --git a/templates/CRM/Batch/Form/Search.tpl b/templates/CRM/Batch/Form/Search.tpl index 004240178e..143899125e 100644 --- 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} - {$form.buttons.html} + {include file="CRM/common/formButtons.tpl"} diff --git a/templates/CRM/Case/Form/Search.tpl b/templates/CRM/Case/Form/Search.tpl index b5ed0ac824..5adf01ca21 100644 --- a/templates/CRM/Case/Form/Search.tpl +++ b/templates/CRM/Case/Form/Search.tpl @@ -37,9 +37,10 @@ {strip} - + {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 092d129b0e..50798e1216 100644 --- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl +++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl @@ -130,7 +130,7 @@ CRM.$(function($) {
- {$form.sort_name.label}  {$form.sort_name.html|crmAddClass:'twenty'}   {$form.buttons.html} + + {$form.sort_name.label}  {$form.sort_name.html|crmAddClass:'twenty'} {include file="CRM/common/formButtons.tpl" location="top"}
- +
{$form.buttons.html}{include file="CRM/common/formButtons.tpl" location="botton"}
{/strip} diff --git a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl index e351941b2e..d5d9389887 100644 --- a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl +++ b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl @@ -49,7 +49,7 @@
- {include file="CRM/common/formButtons.tpl" location="top" buttonStyle="width:80px; text-align:center;"} + {include file="CRM/common/formButtons.tpl" location="top"}
-- 2.25.1