From 7ecddde4e151e4ad4bd3912320111ea1f8c9a97e Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 2 Jan 2015 14:29:26 -0500 Subject: [PATCH] CRM-15773 - Use the term Order instead of Weight consistently --- CRM/Admin/Form/LabelFormats.php | 4 ++-- CRM/Admin/Form/Options.php | 2 +- CRM/Admin/Form/ParticipantStatus.php | 2 +- CRM/Admin/Form/PdfFormats.php | 2 +- CRM/Campaign/Form/SurveyType.php | 2 +- CRM/Contribute/Form/ContributionPage/AddProduct.php | 2 +- CRM/Member/Form/MembershipStatus.php | 2 +- CRM/Report/Form/Register.php | 2 +- templates/CRM/Admin/Page/ParticipantStatus.tpl | 2 +- templates/CRM/Campaign/Form/ResultOptions.tpl | 2 +- templates/CRM/Campaign/Form/Search/Survey.tpl | 2 +- templates/CRM/Contact/Form/DedupeRules.tpl | 2 +- templates/CRM/Contribute/Page/Premium.tpl | 2 +- templates/CRM/Custom/Form/Optionfields.tpl | 2 +- templates/CRM/Price/Form/OptionFields.tpl | 2 +- xml/schema/Activity/Activity.xml | 1 + xml/schema/Case/CaseType.xml | 2 +- xml/schema/Contact/DashboardContact.xml | 1 + xml/schema/Contribute/PremiumsProduct.xml | 2 +- xml/schema/Core/CustomField.xml | 2 +- xml/schema/Core/CustomGroup.xml | 2 +- xml/schema/Core/Dashboard.xml | 2 +- xml/schema/Core/Menu.xml | 1 + xml/schema/Core/Navigation.xml | 1 + xml/schema/Core/OptionValue.xml | 2 +- xml/schema/Core/UFField.xml | 2 +- xml/schema/Core/UFJoin.xml | 2 +- xml/schema/Event/ParticipantStatusType.xml | 2 +- xml/schema/Member/MembershipStatus.xml | 2 +- xml/schema/Member/MembershipType.xml | 2 +- xml/schema/Price/PriceField.xml | 2 +- xml/schema/Price/PriceFieldValue.xml | 1 + xml/schema/Queue/QueueItem.xml | 1 + 33 files changed, 34 insertions(+), 28 deletions(-) diff --git a/CRM/Admin/Form/LabelFormats.php b/CRM/Admin/Form/LabelFormats.php index 98918ad186..b7dadd2c2c 100644 --- a/CRM/Admin/Form/LabelFormats.php +++ b/CRM/Admin/Form/LabelFormats.php @@ -133,7 +133,7 @@ class CRM_Admin_Form_LabelFormats extends CRM_Admin_Form { $this->add('text', 'SpaceY', ts('Vertical Spacing'), array('size' => 8, 'maxlength' => 8) + $disabled, $required); $this->add('text', 'lPadding', ts('Left Padding'), array('size' => 8, 'maxlength' => 8), $required); $this->add('text', 'tPadding', ts('Top Padding'), array('size' => 8, 'maxlength' => 8), $required); - $this->add('text', 'weight', ts('Weight'), CRM_Core_DAO::getAttribute('CRM_Core_BAO_LabelFormat', 'weight'), TRUE); + $this->add('text', 'weight', ts('Order'), CRM_Core_DAO::getAttribute('CRM_Core_BAO_LabelFormat', 'weight'), TRUE); $this->addRule('label', ts('Name already exists in Database.'), 'objectExists', array( 'CRM_Core_BAO_LabelFormat', @@ -149,7 +149,7 @@ class CRM_Admin_Form_LabelFormats extends CRM_Admin_Form { $this->addRule('tPadding', ts('Must be numeric'), 'numeric'); $this->addRule('width', ts('Must be numeric'), 'numeric'); $this->addRule('height', ts('Must be numeric'), 'numeric'); - $this->addRule('weight', ts('Weight must be integer'), 'integer'); + $this->addRule('weight', ts('Must be integer'), 'integer'); } /** diff --git a/CRM/Admin/Form/Options.php b/CRM/Admin/Form/Options.php index e05d59a118..e67a05389c 100644 --- a/CRM/Admin/Form/Options.php +++ b/CRM/Admin/Form/Options.php @@ -245,7 +245,7 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form { $this->add('text', 'weight', - ts('Weight'), + ts('Order'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_OptionValue', 'weight'), TRUE ); diff --git a/CRM/Admin/Form/ParticipantStatus.php b/CRM/Admin/Form/ParticipantStatus.php index 9a1994fa6b..e9b7e153b2 100644 --- a/CRM/Admin/Form/ParticipantStatus.php +++ b/CRM/Admin/Form/ParticipantStatus.php @@ -62,7 +62,7 @@ class CRM_Admin_Form_ParticipantStatus extends CRM_Admin_Form { $this->add('checkbox', 'is_active', ts('Active?')); $this->add('checkbox', 'is_counted', ts('Counted?')); - $this->add('text', 'weight', ts('Weight'), $attributes['weight'], TRUE); + $this->add('text', 'weight', ts('Order'), $attributes['weight'], TRUE); $this->add('select', 'visibility_id', ts('Visibility'), CRM_Core_PseudoConstant::visibility(), TRUE); } diff --git a/CRM/Admin/Form/PdfFormats.php b/CRM/Admin/Form/PdfFormats.php index eebecdb67b..15c50218f2 100644 --- a/CRM/Admin/Form/PdfFormats.php +++ b/CRM/Admin/Form/PdfFormats.php @@ -81,7 +81,7 @@ class CRM_Admin_Form_PdfFormats extends CRM_Admin_Form { $this->add('text', 'margin_right', ts('Right Margin'), array('size' => 8, 'maxlength' => 8), TRUE); $this->add('text', 'margin_top', ts('Top Margin'), array('size' => 8, 'maxlength' => 8), TRUE); $this->add('text', 'margin_bottom', ts('Bottom Margin'), array('size' => 8, 'maxlength' => 8), TRUE); - $this->add('text', 'weight', ts('Weight'), CRM_Core_DAO::getAttribute('CRM_Core_BAO_PdfFormat', 'weight'), TRUE); + $this->add('text', 'weight', ts('Order'), CRM_Core_DAO::getAttribute('CRM_Core_BAO_PdfFormat', 'weight'), TRUE); $this->addRule('name', ts('Name already exists in Database.'), 'objectExists', array('CRM_Core_BAO_PdfFormat', $this->_id)); $this->addRule('margin_left', ts('Margin must be numeric'), 'numeric'); diff --git a/CRM/Campaign/Form/SurveyType.php b/CRM/Campaign/Form/SurveyType.php index 49d75148e6..20d523493b 100644 --- a/CRM/Campaign/Form/SurveyType.php +++ b/CRM/Campaign/Form/SurveyType.php @@ -140,7 +140,7 @@ class CRM_Campaign_Form_SurveyType extends CRM_Admin_Form { ) { $this->freeze(array('label', 'is_active')); } - $this->add('text', 'weight', ts('Weight'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_OptionValue', 'weight'), TRUE); + $this->add('text', 'weight', ts('Order'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_OptionValue', 'weight'), TRUE); $this->assign('id', $this->_id); } diff --git a/CRM/Contribute/Form/ContributionPage/AddProduct.php b/CRM/Contribute/Form/ContributionPage/AddProduct.php index 326622df34..0238893e9b 100644 --- a/CRM/Contribute/Form/ContributionPage/AddProduct.php +++ b/CRM/Contribute/Form/ContributionPage/AddProduct.php @@ -165,7 +165,7 @@ class CRM_Contribute_Form_ContributionPage_AddProduct extends CRM_Contribute_For $this->add('select', 'product_id', ts('Select the Product') . ' ', $this->_products, TRUE); - $this->addElement('text', 'weight', ts('Weight'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_PremiumsProduct', 'weight')); + $this->addElement('text', 'weight', ts('Order'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_PremiumsProduct', 'weight')); $financialType = CRM_Contribute_PseudoConstant::financialType( ); $premiumFinancialType = array(); diff --git a/CRM/Member/Form/MembershipStatus.php b/CRM/Member/Form/MembershipStatus.php index d658acaf26..9af2aaa2e4 100644 --- a/CRM/Member/Form/MembershipStatus.php +++ b/CRM/Member/Form/MembershipStatus.php @@ -97,7 +97,7 @@ class CRM_Member_Form_MembershipStatus extends CRM_Member_Form_MembershipConfig $this->add('checkbox', 'is_current_member', ts('Current Membership?')); $this->add('checkbox', 'is_admin', ts('Administrator Only?')); - $this->add('text', 'weight', ts('Weight'), + $this->add('text', 'weight', ts('Order'), CRM_Core_DAO::getAttribute('CRM_Member_DAO_MembershipStatus', 'weight') ); $this->add('checkbox', 'is_default', ts('Default?')); diff --git a/CRM/Report/Form/Register.php b/CRM/Report/Form/Register.php index 3bf87fb470..35b752328b 100644 --- a/CRM/Report/Form/Register.php +++ b/CRM/Report/Form/Register.php @@ -105,7 +105,7 @@ class CRM_Report_Form_Register extends CRM_Core_Form { $this->add('text', 'label', ts('Title'), array('size' => 40), TRUE); $this->add('text', 'value', ts('URL'), array('size' => 40), TRUE); $this->add('text', 'name', ts('Class'), array('size' => 40), TRUE); - $element = $this->add('text', 'weight', ts('Weight'), array('size' => 4), TRUE); + $element = $this->add('text', 'weight', ts('Order'), array('size' => 4), TRUE); // $element->freeze( ); $this->add('text', 'description', ts('Description'), array('size' => 40), TRUE); diff --git a/templates/CRM/Admin/Page/ParticipantStatus.tpl b/templates/CRM/Admin/Page/ParticipantStatus.tpl index d0f40c3c92..b71ffd2b3d 100644 --- a/templates/CRM/Admin/Page/ParticipantStatus.tpl +++ b/templates/CRM/Admin/Page/ParticipantStatus.tpl @@ -41,7 +41,7 @@ {ts}Reserved?{/ts} {ts}Active?{/ts} {ts}Counted?{/ts} - {ts}Weight{/ts} + {ts}Order{/ts} {ts}Visibility{/ts} diff --git a/templates/CRM/Campaign/Form/ResultOptions.tpl b/templates/CRM/Campaign/Form/ResultOptions.tpl index abee5477d5..879ab262ce 100644 --- a/templates/CRM/Campaign/Form/ResultOptions.tpl +++ b/templates/CRM/Campaign/Form/ResultOptions.tpl @@ -51,7 +51,7 @@ {ts}Label{/ts} {ts}Value{/ts} {ts}Recontact Interval{/ts} - {ts}Weight{/ts} + {ts}Order{/ts} {section name=rowLoop start=1 loop=12} diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl index c8abec2b45..8c9b32209d 100755 --- a/templates/CRM/Campaign/Form/Search/Survey.tpl +++ b/templates/CRM/Campaign/Form/Search/Survey.tpl @@ -267,7 +267,7 @@ function displayResultSet( surveyId, surveyTitle, OptionGroupId ) { data['survey_id'] = surveyId; var dataUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Campaign_Page_AJAX&fnName=loadOptionGroupDetails' }"{literal}; - var content = '{/literal}{ts escape='js'}Label{/ts}{literal}{/literal}{ts escape='js'}Value{/ts}{literal}{/literal}{ts escape='js'}Recontact Interval{/ts}{literal}{/literal}{ts escape='js'}Weight{/ts}{literal}'; + var content = '{/literal}{ts escape='js'}Label{/ts}{literal}{/literal}{ts escape='js'}Value{/ts}{literal}{/literal}{ts escape='js'}Recontact Interval{/ts}{literal}{/literal}{ts escape='js'}Order{/ts}{literal}'; var setTitle = '{/literal}{ts escape='js'}Result Set for{/ts} {literal}' + surveyTitle; CRM.$.post( dataUrl, data, function( opGroup ) { diff --git a/templates/CRM/Contact/Form/DedupeRules.tpl b/templates/CRM/Contact/Form/DedupeRules.tpl index 6515c4db55..b1fe54df3a 100644 --- a/templates/CRM/Contact/Form/DedupeRules.tpl +++ b/templates/CRM/Contact/Form/DedupeRules.tpl @@ -92,7 +92,7 @@ {/if} - {ts}Field{/ts}{ts}Length{/ts}{ts}Weight{/ts} + {ts}Field{/ts}{ts}Length{/ts}{ts}Order{/ts} {section name=count loop=5} {capture assign=where}where_{$smarty.section.count.index}{/capture} {capture assign=length}length_{$smarty.section.count.index}{/capture} diff --git a/templates/CRM/Contribute/Page/Premium.tpl b/templates/CRM/Contribute/Page/Premium.tpl index 74ffdf9c02..7355e21a09 100644 --- a/templates/CRM/Contribute/Page/Premium.tpl +++ b/templates/CRM/Contribute/Page/Premium.tpl @@ -38,7 +38,7 @@ {ts}Market Value{/ts} {ts}Min Contribution{/ts} {ts}Financial Type{/ts} - {ts}Weight{/ts} + {ts}Order{/ts} {foreach from=$rows item=row} diff --git a/templates/CRM/Custom/Form/Optionfields.tpl b/templates/CRM/Custom/Form/Optionfields.tpl index 7c997c15b2..67964d0fd3 100644 --- a/templates/CRM/Custom/Form/Optionfields.tpl +++ b/templates/CRM/Custom/Form/Optionfields.tpl @@ -49,7 +49,7 @@ {ts}Default{/ts} {ts}Label{/ts} {ts}Value{/ts} - {ts}Weight{/ts} + {ts}Order{/ts} {ts}Active?{/ts} diff --git a/templates/CRM/Price/Form/OptionFields.tpl b/templates/CRM/Price/Form/OptionFields.tpl index f57bd7b406..a9dbde2bb8 100644 --- a/templates/CRM/Price/Form/OptionFields.tpl +++ b/templates/CRM/Price/Form/OptionFields.tpl @@ -47,7 +47,7 @@ {ts}Participant Count{/ts} {help id="id-participant-count"} {ts}Max Participant{/ts} {help id="id-participant-max"} {/if} - {ts}Weight{/ts} + {ts}Order{/ts} {ts}Active?{/ts} diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml index 73fce03f90..9fbc397894 100644 --- a/xml/schema/Activity/Activity.xml +++ b/xml/schema/Activity/Activity.xml @@ -451,6 +451,7 @@ weight + Order int 4.1 diff --git a/xml/schema/Case/CaseType.xml b/xml/schema/Case/CaseType.xml index e3e18b4bdd..8af587a5b5 100644 --- a/xml/schema/Case/CaseType.xml +++ b/xml/schema/Case/CaseType.xml @@ -68,7 +68,7 @@ weight - Case Type Weight + Order int true 1 diff --git a/xml/schema/Contact/DashboardContact.xml b/xml/schema/Contact/DashboardContact.xml index cc653ccacc..95d990523a 100644 --- a/xml/schema/Contact/DashboardContact.xml +++ b/xml/schema/Contact/DashboardContact.xml @@ -80,6 +80,7 @@ weight + Order int Ordering of the widgets. 0 diff --git a/xml/schema/Contribute/PremiumsProduct.xml b/xml/schema/Contribute/PremiumsProduct.xml index b61e4a7d3a..2fb8d57f33 100644 --- a/xml/schema/Contribute/PremiumsProduct.xml +++ b/xml/schema/Contribute/PremiumsProduct.xml @@ -54,7 +54,7 @@ weight - Weight + Order int unsigned true 2.0 diff --git a/xml/schema/Core/CustomField.xml b/xml/schema/Core/CustomField.xml index 52b8d51756..30787425df 100644 --- a/xml/schema/Core/CustomField.xml +++ b/xml/schema/Core/CustomField.xml @@ -120,7 +120,7 @@ weight int - Custom Field Weight + Order true 1 Controls field display order within an extended property group. diff --git a/xml/schema/Core/CustomGroup.xml b/xml/schema/Core/CustomGroup.xml index b0c4be0bee..afaf5ffb0f 100644 --- a/xml/schema/Core/CustomGroup.xml +++ b/xml/schema/Core/CustomGroup.xml @@ -122,7 +122,7 @@ weight int - Custom Group Weight + Order true 1 Controls display order when multiple extended property groups are setup for the same class. diff --git a/xml/schema/Core/Dashboard.xml b/xml/schema/Core/Dashboard.xml index 676549b25c..3915e73ff8 100644 --- a/xml/schema/Core/Dashboard.xml +++ b/xml/schema/Core/Dashboard.xml @@ -135,7 +135,7 @@ weight int - Dashlet Weight + Order Ordering of the dashlets. 0 3.1 diff --git a/xml/schema/Core/Menu.xml b/xml/schema/Core/Menu.xml index a3adb4adc2..1bcb7626ae 100644 --- a/xml/schema/Core/Menu.xml +++ b/xml/schema/Core/Menu.xml @@ -153,6 +153,7 @@ weight + Order int true 1 diff --git a/xml/schema/Core/Navigation.xml b/xml/schema/Core/Navigation.xml index 74a5573daa..0dcdf82485 100644 --- a/xml/schema/Core/Navigation.xml +++ b/xml/schema/Core/Navigation.xml @@ -96,6 +96,7 @@ weight + Order int Ordering of the navigation items in various blocks. 3.0 diff --git a/xml/schema/Core/OptionValue.xml b/xml/schema/Core/OptionValue.xml index 0d54ef7a92..31d7fc20c3 100644 --- a/xml/schema/Core/OptionValue.xml +++ b/xml/schema/Core/OptionValue.xml @@ -94,7 +94,7 @@ weight - Option Weight + Order int unsigned true Controls display sort order. diff --git a/xml/schema/Core/UFField.xml b/xml/schema/Core/UFField.xml index 702fee07ba..55eb156e60 100644 --- a/xml/schema/Core/UFField.xml +++ b/xml/schema/Core/UFField.xml @@ -77,7 +77,7 @@ weight - Profile Field Weight + Order int true 1 diff --git a/xml/schema/Core/UFJoin.xml b/xml/schema/Core/UFJoin.xml index 6f23639427..f0aae07b34 100644 --- a/xml/schema/Core/UFJoin.xml +++ b/xml/schema/Core/UFJoin.xml @@ -65,7 +65,7 @@ weight - Profile Weight + Order int true 1 diff --git a/xml/schema/Event/ParticipantStatusType.xml b/xml/schema/Event/ParticipantStatusType.xml index ee3e033712..2f112c633d 100644 --- a/xml/schema/Event/ParticipantStatusType.xml +++ b/xml/schema/Event/ParticipantStatusType.xml @@ -77,7 +77,7 @@ weight - Status Weight + Order int unsigned true controls sort order diff --git a/xml/schema/Member/MembershipStatus.xml b/xml/schema/Member/MembershipStatus.xml index 14ae53aa4c..b25d44f453 100644 --- a/xml/schema/Member/MembershipStatus.xml +++ b/xml/schema/Member/MembershipStatus.xml @@ -117,7 +117,7 @@ weight - Weight + Order int 1.5 diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml index db21761192..a076d0ebbc 100644 --- a/xml/schema/Member/MembershipType.xml +++ b/xml/schema/Member/MembershipType.xml @@ -214,7 +214,7 @@ weight - Weight + Order int 1.5 diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml index a9c6d1d643..df314209c5 100644 --- a/xml/schema/Price/PriceField.xml +++ b/xml/schema/Price/PriceField.xml @@ -114,7 +114,7 @@ weight - Price Field Weight + Order int 1 Order in which the fields should appear diff --git a/xml/schema/Price/PriceFieldValue.xml b/xml/schema/Price/PriceFieldValue.xml index 3a0a490c9e..060c9e4524 100644 --- a/xml/schema/Price/PriceFieldValue.xml +++ b/xml/schema/Price/PriceFieldValue.xml @@ -102,6 +102,7 @@ weight + Order int 1 Order in which the field options should appear diff --git a/xml/schema/Queue/QueueItem.xml b/xml/schema/Queue/QueueItem.xml index fa2ed63e8b..1f3f11818f 100644 --- a/xml/schema/Queue/QueueItem.xml +++ b/xml/schema/Queue/QueueItem.xml @@ -31,6 +31,7 @@ weight + Order int true -- 2.25.1