From 8a4f27dc447187974f46a9fbb0c5efc3d093dfc4 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 7 Feb 2014 13:31:14 -0800 Subject: [PATCH] CRM-13929 - Parameterize radio clear widget --- CRM/Activity/BAO/Query.php | 5 +-- CRM/Contact/Form/Edit/Demographics.php | 2 +- CRM/Contact/Form/Search/Criteria.php | 14 ++++---- CRM/Contribute/BAO/Query.php | 12 +++---- .../Form/ContributionPage/Amount.php | 2 +- CRM/Contribute/Form/Task/PDFLetter.php | 2 +- CRM/Core/BAO/CustomField.php | 7 ++-- CRM/Core/BAO/UFGroup.php | 5 ++- CRM/Core/Form.php | 36 +++++++++---------- CRM/Core/Form/Renderer.php | 4 +-- CRM/Event/BAO/Query.php | 4 +-- CRM/Event/Form/ManageEvent/Fee.php | 2 +- CRM/Grant/BAO/Query.php | 2 +- CRM/Mailing/BAO/Query.php | 9 ++--- CRM/Mailing/Form/Search.php | 2 +- CRM/Member/BAO/Query.php | 8 ++--- CRM/Member/Form/MembershipBlock.php | 2 +- CRM/Pledge/BAO/Query.php | 2 +- css/civicrm.css | 2 +- .../Contact/Form/Search/Criteria/Basic.tpl | 2 +- .../Form/ContributionPage/Amount.tpl | 2 +- templates/CRM/Event/Form/ManageEvent/Fee.tpl | 2 +- 22 files changed, 67 insertions(+), 61 deletions(-) diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php index 0550a372ab..7e96aaf01f 100644 --- a/CRM/Activity/BAO/Query.php +++ b/CRM/Activity/BAO/Query.php @@ -445,6 +445,7 @@ class CRM_Activity_BAO_Query { * * @access public * + * @param $form CRM_Core_Form * @return void * @static */ @@ -469,13 +470,13 @@ class CRM_Activity_BAO_Query { 2 => ts('Assigned to'), 1 => ts('Added by'), ); - $form->addRadio('activity_role', NULL, $activityRoles); + $form->addRadio('activity_role', NULL, $activityRoles, array('unselectable' => TRUE)); $form->setDefaults(array('activity_role' => 3)); $activityStatus = CRM_Core_PseudoConstant::activityStatus(); foreach ($activityStatus as $activityStatusID => $activityStatusName) { $activity_status[] = $form->createElement('checkbox', $activityStatusID, NULL, $activityStatusName); } - $form->addGroup($activity_status, 'activity_status', ts('Activity Status')); + $form->addGroup($activity_status, 'activity_status', ts('Activity Status'), TRUE); $form->setDefaults(array('activity_status[1]' => 1, 'activity_status[2]' => 1)); $form->addElement('text', 'activity_subject', ts('Subject'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'sort_name')); $form->addYesNo('activity_test', ts('Activity is a Test?')); diff --git a/CRM/Contact/Form/Edit/Demographics.php b/CRM/Contact/Form/Edit/Demographics.php index 6a4dfea8e1..7325c54441 100644 --- a/CRM/Contact/Form/Edit/Demographics.php +++ b/CRM/Contact/Form/Edit/Demographics.php @@ -57,7 +57,7 @@ class CRM_Contact_Form_Edit_Demographics { array('id' => "civicrm_gender_{$var}_{$key}") ); } - $form->addGroup($genderOptions, 'gender_id', ts('Gender')); + $form->addGroup($genderOptions, 'gender_id', ts('Gender'))->setAttribute('unselectable', TRUE); $form->addDate('birth_date', ts('Date of Birth'), FALSE, array('formatType' => 'birth')); diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php index e485e728f6..878f42c96c 100644 --- a/CRM/Contact/Form/Search/Criteria.php +++ b/CRM/Contact/Form/Search/Criteria.php @@ -33,7 +33,9 @@ * */ class CRM_Contact_Form_Search_Criteria { - + /** + * @param $form CRM_Core_Form + */ static function basic(&$form) { $form->addElement('hidden', 'hidden_basic', 1); @@ -124,7 +126,7 @@ class CRM_Contact_Form_Search_Criteria { } // add checkbox for cms users only - $form->addYesNo('uf_user', ts('CMS User?')); + $form->addYesNo('uf_user', ts('CMS User?'), TRUE); // tag all search $form->add('text', 'tag_search', ts('All Tags')); @@ -238,7 +240,7 @@ class CRM_Contact_Form_Search_Criteria { 1 => ts('Exclude'), 2 => ts('Include by Privacy Option(s)'), ); - $form->addRadio('privacy_toggle', ts('Privacy Options'), $options); + $form->addRadio('privacy_toggle', ts('Privacy Options'), $options, NULL, NULL, TRUE); // preferred communication method $comm = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'preferred_communication_method'); @@ -416,7 +418,7 @@ class CRM_Contact_Form_Search_Criteria { $form->addElement('text', 'changed_by', ts('Modified By'), NULL); $dates = array(1 => ts('Added'), 2 => ts('Modified')); - $form->addRadio('log_date', NULL, $dates, NULL, '
'); + $form->addRadio('log_date', NULL, $dates, array('unselectable' => TRUE), '
'); CRM_Core_Form_Date::buildDateRange($form, 'log_date', 1, '_low', '_high', ts('From'), FALSE, FALSE); } @@ -483,7 +485,7 @@ class CRM_Contact_Form_Search_Criteria { array('id' => "civicrm_gender_{$var}_{$key}") ); } - $form->addGroup($genderOptions, 'gender_id', ts('Gender')); + $form->addGroup($genderOptions, 'gender_id', ts('Gender'))->setAttribute('unselectable', TRUE); CRM_Core_Form_Date::buildDateRange($form, 'birth_date', 1, '_low', '_high', ts('From'), FALSE, FALSE, 'birth'); @@ -491,7 +493,7 @@ class CRM_Contact_Form_Search_Criteria { // radio button for is_deceased - $form->addYesNo( 'is_deceased', ts('Deceased')); + $form->addYesNo( 'is_deceased', ts('Deceased'), TRUE); } static function notes(&$form) { diff --git a/CRM/Contribute/BAO/Query.php b/CRM/Contribute/BAO/Query.php index 48335e2452..d0a98a8640 100644 --- a/CRM/Contribute/BAO/Query.php +++ b/CRM/Contribute/BAO/Query.php @@ -801,11 +801,11 @@ class CRM_Contribute_BAO_Query { $form->addGroup($status, 'contribution_status_id', ts('Contribution Status')); // Add fields for thank you and receipt - $form->addYesNo('contribution_thankyou_date_is_not_null', ts('Thank-you sent?')); - $form->addYesNo('contribution_receipt_date_is_not_null', ts('Receipt sent?')); + $form->addYesNo('contribution_thankyou_date_is_not_null', ts('Thank-you sent?'), TRUE); + $form->addYesNo('contribution_receipt_date_is_not_null', ts('Receipt sent?'), TRUE); - $form->addYesNo('contribution_pay_later', ts('Contribution is Pay Later?')); - $form->addYesNo('contribution_recurring', ts('Contribution is Recurring?')); + $form->addYesNo('contribution_pay_later', ts('Contribution is Pay Later?'), TRUE); + $form->addYesNo('contribution_recurring', ts('Contribution is Recurring?'), TRUE); // Recurring contribution fields foreach (self::getRecurringFields() as $key => $label) { @@ -816,7 +816,7 @@ class CRM_Contribute_BAO_Query { } } - $form->addYesNo('contribution_test', ts('Contribution is a Test?')); + $form->addYesNo('contribution_test', ts('Contribution is a Test?'), TRUE); // Add field for transaction ID search $form->addElement('text', 'contribution_transaction_id', ts("Transaction ID")); @@ -824,7 +824,7 @@ class CRM_Contribute_BAO_Query { $form->addElement('text', 'contribution_check_number', ts('Check Number')); // Add field for pcp display in roll search - $form->addYesNo('contribution_pcp_display_in_roll', ts('Personal Campaign Page Honor Roll?')); + $form->addYesNo('contribution_pcp_display_in_roll', ts('Personal Campaign Page Honor Roll?'), TRUE); // Add all the custom searchable fields $contribution = array('Contribution'); diff --git a/CRM/Contribute/Form/ContributionPage/Amount.php b/CRM/Contribute/Form/ContributionPage/Amount.php index 9f629fe468..64d7b43509 100644 --- a/CRM/Contribute/Form/ContributionPage/Amount.php +++ b/CRM/Contribute/Form/ContributionPage/Amount.php @@ -70,7 +70,7 @@ class CRM_Contribute_Form_ContributionPage_Amount extends CRM_Contribute_Form_Co //CRM-12055 $this->add('text', 'amount_label', ts('Contribution Amounts Label')); - $default = array(); + $default = array($this->createElement('radio', NULL, NULL, NULL, 0)); $this->add('hidden', "price_field_id", '', array('id' => "price_field_id")); $this->add('hidden', "price_field_other", '', array('id' => "price_field_option")); for ($i = 1; $i <= self::NUM_OPTION; $i++) { diff --git a/CRM/Contribute/Form/Task/PDFLetter.php b/CRM/Contribute/Form/Task/PDFLetter.php index 3d3eb74d2a..a4f717de9a 100644 --- a/CRM/Contribute/Form/Task/PDFLetter.php +++ b/CRM/Contribute/Form/Task/PDFLetter.php @@ -114,7 +114,7 @@ class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task { // Group options for tokens are not yet implemented. dgg $options = array(ts('Contact'), ts('Recurring')); - $this->addRadio('is_group_by', ts('Grouping contributions in one letter based on'), $options, array(), "
", FALSE); + $this->addRadio('is_group_by', ts('Grouping contributions in one letter based on'), $options, array('unselectable' => TRUE), "
", FALSE); $this->addButtons(array( array( diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php index 63a65d7866..ebcce7d398 100644 --- a/CRM/Core/BAO/CustomField.php +++ b/CRM/Core/BAO/CustomField.php @@ -844,16 +844,19 @@ class CRM_Core_BAO_CustomField extends CRM_Core_DAO_CustomField { foreach ($customOption as $v => $l) { $choice[] = $qf->createElement('radio', NULL, '', $l, (string)$v, $field->attributes); } - $qf->addGroup($choice, $elementName, $label); + $group = $qf->addGroup($choice, $elementName, $label); } else { $choice[] = $qf->createElement('radio', NULL, '', ts('Yes'), '1', $field->attributes); $choice[] = $qf->createElement('radio', NULL, '', ts('No'), '0', $field->attributes); - $qf->addGroup($choice, $elementName, $label); + $group = $qf->addGroup($choice, $elementName, $label); } if ($useRequired && !$search) { $qf->addRule($elementName, ts('%1 is a required field.', array(1 => $label)), 'required'); } + else { + $group->setAttribute('unselectable', TRUE); + } break; case 'Select': diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php index f3a2517039..40fbe5d6eb 100644 --- a/CRM/Core/BAO/UFGroup.php +++ b/CRM/Core/BAO/UFGroup.php @@ -1873,10 +1873,13 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) foreach ($gender as $key => $var) { $genderOptions[$key] = $form->createElement('radio', NULL, ts('Gender'), $var, $key); } - $form->addGroup($genderOptions, $name, $title); + $group = $form->addGroup($genderOptions, $name, $title); if ($required) { $form->addRule($name, ts('%1 is a required field.', array(1 => $title)), 'required'); } + else { + $group->setAttribute('unselectable', TRUE); + } } elseif ($fieldName === 'prefix_id' || $fieldName === 'suffix_id') { $form->add('select', $name, $title, diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php index 77af71cc84..382a76ce35 100644 --- a/CRM/Core/Form.php +++ b/CRM/Core/Form.php @@ -773,14 +773,12 @@ class CRM_Core_Form extends HTML_QuickForm_Page { return self::$_template->get_template_vars($name); } - function &addRadio($name, $title, &$values, $attributes = NULL, $separator = NULL, $required = FALSE) { + function &addRadio($name, $title, $values, $attributes = array(), $separator = NULL, $required = FALSE) { $options = array(); - if (empty($attributes)) { - $attributes = array('id_suffix' => $name); - } - else { - $attributes = array_merge($attributes, array('id_suffix' => $name)); - } + $attributes = $attributes ? $attributes : array(); + $unselectable = !empty($attributes['unselectable']); + unset($attributes['unselectable']); + $attributes += array('id_suffix' => $name); foreach ($values as $key => $var) { $options[] = $this->createElement('radio', NULL, NULL, $var, $key, $attributes); } @@ -788,24 +786,22 @@ class CRM_Core_Form extends HTML_QuickForm_Page { if ($required) { $this->addRule($name, ts('%1 is a required field.', array(1 => $title)), 'required'); } + if ($unselectable) { + $group->setAttribute('unselectable', TRUE); + } return $group; } - function addYesNo($id, $title, $dontKnow = NULL, $required = NULL, $attribute = NULL) { - if (empty($attribute)) { - $attribute = array('id_suffix' => $id); - } - else { - $attribute = array_merge($attribute, array('id_suffix' => $id)); - } + function addYesNo($id, $title, $unselectable = FALSE, $required = NULL, $attributes = array()) { + $attributes += array('id_suffix' => $id); $choice = array(); - $choice[] = $this->createElement('radio', NULL, '11', ts('Yes'), '1', $attribute); - $choice[] = $this->createElement('radio', NULL, '11', ts('No'), '0', $attribute); - if ($dontKnow) { - $choice[] = $this->createElement('radio', NULL, '22', ts("Don't Know"), '2', $attribute); - } - $this->addGroup($choice, $id, $title); + $choice[] = $this->createElement('radio', NULL, '11', ts('Yes'), '1', $attributes); + $choice[] = $this->createElement('radio', NULL, '11', ts('No'), '0', $attributes); + $group = $this->addGroup($choice, $id, $title); + if ($unselectable) { + $group->setAttribute('unselectable', TRUE); + } if ($required) { $this->addRule($id, ts('%1 is a required field.', array(1 => $title)), 'required'); } diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php index 3665afb9a2..713bead502 100644 --- a/CRM/Core/Form/Renderer.php +++ b/CRM/Core/Form/Renderer.php @@ -130,7 +130,7 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty { $this->addOptionsEditLink($el, $element); } - if ($element->getType() == 'group' && strpos($el['html'], 'crm-form-radio')) { + if ($element->getType() == 'group' && $element->getAttribute('unselectable')) { $this->appendUnselectButton($el, $element); } } @@ -235,7 +235,7 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty { function appendUnselectButton(&$el, $field) { // Initially hide if not needed // Note: visibility:hidden prevents layout jumping around unlike display:none - $display = $field->getValue() ? '' : ' style="visibility:hidden;"'; + $display = $field->getValue() !== NULL ? '' : ' style="visibility:hidden;"'; $el['html'] .= ' '; } } diff --git a/CRM/Event/BAO/Query.php b/CRM/Event/BAO/Query.php index ec486c1592..92a137e1e8 100644 --- a/CRM/Event/BAO/Query.php +++ b/CRM/Event/BAO/Query.php @@ -578,8 +578,8 @@ class CRM_Event_BAO_Query { $form->_participantRole = &$form->addElement('checkbox', "participant_role_id[$rId]", NULL, $rName); } - $form->addYesNo('participant_test', ts('Participant is a Test?')); - $form->addYesNo('participant_pay_later', ts('Participant is Pay Later?')); + $form->addYesNo('participant_test', ts('Participant is a Test?'), TRUE); + $form->addYesNo('participant_pay_later', ts('Participant is Pay Later?'), TRUE); $form->addElement('text', 'participant_fee_amount_low', ts('From'), array('size' => 8, 'maxlength' => 8)); $form->addElement('text', 'participant_fee_amount_high', ts('To'), array('size' => 8, 'maxlength' => 8)); diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php index 0c4351e242..2c693ee268 100644 --- a/CRM/Event/Form/ManageEvent/Fee.php +++ b/CRM/Event/Form/ManageEvent/Fee.php @@ -305,7 +305,7 @@ class CRM_Event_Form_ManageEvent_Fee extends CRM_Event_Form_ManageEvent { '' => ts('- none -')) + $price, NULL, array('onchange' => "return showHideByValue('price_set_id', '', 'map-field', 'block', 'select', false);") ); - $default = array(); + $default = array($this->createElement('radio', NULL, NULL, NULL, 0)); $this->add('hidden', 'price_field_id', '', array('id' => 'price_field_id')); for ($i = 1; $i <= self::NUM_OPTION; $i++) { // label diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php index 91da27c50d..4de3e35ddf 100644 --- a/CRM/Grant/BAO/Query.php +++ b/CRM/Grant/BAO/Query.php @@ -331,7 +331,7 @@ class CRM_Grant_BAO_Query { $form->addElement('checkbox', 'grant_decision_date_notset', ts(''), NULL); - $form->addYesNo('grant_report_received', ts('Grant report received?')); + $form->addYesNo('grant_report_received', ts('Grant report received?'), TRUE); $form->add('text', 'grant_amount_low', ts('Minimum Amount'), array('size' => 8, 'maxlength' => 8)); $form->addRule('grant_amount_low', ts('Please enter a valid money value (e.g. %1).', array(1 => CRM_Utils_Money::format('9.99', ' '))), 'money'); diff --git a/CRM/Mailing/BAO/Query.php b/CRM/Mailing/BAO/Query.php index 5b14a88136..edcec18088 100644 --- a/CRM/Mailing/BAO/Query.php +++ b/CRM/Mailing/BAO/Query.php @@ -354,6 +354,7 @@ class CRM_Mailing_BAO_Query { * * @access public * + * @param $form CRM_Core_Form * @return void * @static */ @@ -387,10 +388,10 @@ class CRM_Mailing_BAO_Query { ); // event filters - $form->addRadio('mailing_delivery_status', ts('Delivery Status'), CRM_Mailing_PseudoConstant::yesNoOptions('delivered')); - $form->addRadio('mailing_open_status', ts('Trackable Opens'), CRM_Mailing_PseudoConstant::yesNoOptions('open')); - $form->addRadio('mailing_click_status', ts('Trackable URLs'), CRM_Mailing_PseudoConstant::yesNoOptions('click')); - $form->addRadio('mailing_reply_status', ts('Trackable Replies'), CRM_Mailing_PseudoConstant::yesNoOptions('reply')); + $form->addRadio('mailing_delivery_status', ts('Delivery Status'), CRM_Mailing_PseudoConstant::yesNoOptions('delivered'), array('unselectable' => TRUE)); + $form->addRadio('mailing_open_status', ts('Trackable Opens'), CRM_Mailing_PseudoConstant::yesNoOptions('open'), array('unselectable' => TRUE)); + $form->addRadio('mailing_click_status', ts('Trackable URLs'), CRM_Mailing_PseudoConstant::yesNoOptions('click'), array('unselectable' => TRUE)); + $form->addRadio('mailing_reply_status', ts('Trackable Replies'), CRM_Mailing_PseudoConstant::yesNoOptions('reply'), array('unselectable' => TRUE)); $form->add('checkbox', 'mailing_unsubscribe', ts('Unsubscribe Requests')); $form->add('checkbox', 'mailing_optout', ts('Opt-out Requests')); diff --git a/CRM/Mailing/Form/Search.php b/CRM/Mailing/Form/Search.php index fa27eb8d4b..cdfd59b368 100644 --- a/CRM/Mailing/Form/Search.php +++ b/CRM/Mailing/Form/Search.php @@ -59,7 +59,7 @@ class CRM_Mailing_Form_Search extends CRM_Core_Form { $this->addElement('checkbox', "mailing_status[$status]", NULL, $status); } $this->addElement('checkbox', 'status_unscheduled', NULL, 'Draft / Unscheduled'); - $this->addYesNo('is_archived', ts('Mailing is Archived')); + $this->addYesNo('is_archived', ts('Mailing is Archived'), TRUE); if ($parent->_sms) { $this->addElement('hidden', 'sms', $parent->_sms); diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php index 20e1a7cc3a..3f029f1648 100644 --- a/CRM/Member/BAO/Query.php +++ b/CRM/Member/BAO/Query.php @@ -424,10 +424,10 @@ class CRM_Member_BAO_Query { CRM_Core_Form_Date::buildDateRange($form, 'member_end_date', 1, '_low', '_high', ts('From'), FALSE); - $form->addYesNo('member_is_primary', ts('Primary Member?')); - $form->addYesNo('member_pay_later', ts('Pay Later?')); - $form->addYesNo('member_auto_renew', ts('Auto-Renew?')); - $form->addYesNo('member_test', ts('Membership is a Test?')); + $form->addYesNo('member_is_primary', ts('Primary Member?'), TRUE); + $form->addYesNo('member_pay_later', ts('Pay Later?'), TRUE); + $form->addYesNo('member_auto_renew', ts('Auto-Renew?'), TRUE); + $form->addYesNo('member_test', ts('Membership is a Test?'), TRUE); // add all the custom searchable fields $extends = array('Membership'); diff --git a/CRM/Member/Form/MembershipBlock.php b/CRM/Member/Form/MembershipBlock.php index 795d014c3a..9394cc30d8 100644 --- a/CRM/Member/Form/MembershipBlock.php +++ b/CRM/Member/Form/MembershipBlock.php @@ -162,7 +162,7 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa $this->assign('auto_renew', $this->_renewOption); } $this->addGroup($membership, 'membership_type', ts('Membership Types')); - $this->addGroup($membershipDefault, 'membership_type_default', ts('Membership Types Default')); + $this->addGroup($membershipDefault, 'membership_type_default', ts('Membership Types Default'))->setAttribute('unselectable', TRUE); $this->addFormRule(array('CRM_Member_Form_MembershipBlock', 'formRule'), $this->_id); } diff --git a/CRM/Pledge/BAO/Query.php b/CRM/Pledge/BAO/Query.php index 05b50c6797..4ccbc9955d 100644 --- a/CRM/Pledge/BAO/Query.php +++ b/CRM/Pledge/BAO/Query.php @@ -520,7 +520,7 @@ class CRM_Pledge_BAO_Query { // pledge payment related dates CRM_Core_Form_Date::buildDateRange($form, 'pledge_payment_date', 1, '_low', '_high', ts('From'), FALSE); - $form->addYesNo('pledge_test', ts('Pledge is a Test?')); + $form->addYesNo('pledge_test', ts('Pledge is a Test?'), TRUE); $form->add('text', 'pledge_amount_low', ts('From'), array('size' => 8, 'maxlength' => 8)); $form->addRule('pledge_amount_low', ts('Please enter a valid money value (e.g. %1).', array(1 => CRM_Utils_Money::format('9.99', ' '))), 'money'); diff --git a/css/civicrm.css b/css/civicrm.css index ae3ff81521..ae41b77a42 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -225,7 +225,7 @@ div.crm-container fieldset label{ } .crm-container textarea, -.crm-container .crm-form-multiselect { +.crm-container select.crm-form-multiselect { border: 1px solid #999; } diff --git a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl index e05611ea44..386ddd1c76 100644 --- a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl +++ b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl @@ -123,7 +123,7 @@ {if $isTagset} {include file="CRM/common/Tag.tpl"} {/if} - {$form.tag_search.label} {help id="id-all-tags"}
{$form.tag_search.html|crmReplace:class:big} + {$form.tag_search.label} {help id="id-all-tags"}
{$form.tag_search.html} {if ! $isTagset}   {/if} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl index f9918e5b42..7583dde506 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl @@ -180,7 +180,7 @@
{ts}Fixed Contribution Options{/ts} {ts}Use the table below to enter up to ten fixed contribution amounts. These will be presented as a list of radio button options. Both the label and dollar amount will be displayed.{/ts}{if $isQuick}{ts} Click here if you want to configure the Fixed Contribution Options below as part of a Price Set, with the added flexibility and complexity that entails.{/ts}{/if}
- + {section name=loop start=1 loop=11} {assign var=idx value=$smarty.section.loop.index} diff --git a/templates/CRM/Event/Form/ManageEvent/Fee.tpl b/templates/CRM/Event/Form/ManageEvent/Fee.tpl index 0a99dcb6b0..585f770b8b 100644 --- a/templates/CRM/Event/Form/ManageEvent/Fee.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Fee.tpl @@ -154,7 +154,7 @@ {ts}Use the table below to enter descriptive labels and amounts for up to ten event fee levels. These will be presented as a list of radio button options. Both the label and dollar amount will be displayed. You can also configure one or more sets of discounted fees by checking "Discounts by Signup Date" below.{/ts}
{if $isQuick}{ts}Click here if you want to configure the Regular Fees below as part of a Price Set, with the added flexibility and complexity that entails.{/ts}{/if}
{ts}Contribution Label{/ts}{ts}Amount{/ts}{ts}Default?{/ts}
{ts}Contribution Label{/ts}{ts}Amount{/ts}{ts}Default?{/ts}
{$form.default.0.html}
{$form.label.$idx.html}{$form.value.$idx.html|crmMoney}{$form.default.$idx.html}
- + {section name=loop start=1 loop=11} {assign var=idx value=$smarty.section.loop.index} -- 2.25.1
{ts}Fee Label{/ts}{ts}Amount{/ts}{ts}Default?{/ts}
{ts}Fee Label{/ts}{ts}Amount{/ts}{ts}Default?{/ts}
{$form.default.0.html}
{$form.label.$idx.html}{$form.value.$idx.html|crmMoney}{$form.default.$idx.html}