From 3440831560791cd63dc4cd249467a72cdeadef76 Mon Sep 17 00:00:00 2001 From: Eileen Date: Thu, 2 Jan 2014 17:34:44 +1300 Subject: [PATCH] CRM-12055, other commit, replace tabs with double spaces ---------------------------------------- * CRM-12055: Allow users to change label used for Contribution Amounts in online contribution page w/o switching to a price set http://issues.civicrm.org/jira/browse/CRM-12055 --- .../Form/ContributionPage/Amount.tpl | 8 +++--- templates/CRM/Member/Form/MembershipType.tpl | 26 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl index c4150f64d9..973392ceff 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl @@ -157,11 +157,11 @@ {/if} - - + + {$form.amount_label.label} * - {$form.amount_label.html} - + {$form.amount_label.html} + {$form.is_allow_other_amount.label} {$form.is_allow_other_amount.html}
{ts}Check this box if you want to give users the option to enter their own contribution amount. Your page will then include a text field labeled Other Amount.{/ts} diff --git a/templates/CRM/Member/Form/MembershipType.tpl b/templates/CRM/Member/Form/MembershipType.tpl index 76ef81831f..9217e5b326 100644 --- a/templates/CRM/Member/Form/MembershipType.tpl +++ b/templates/CRM/Member/Form/MembershipType.tpl @@ -204,18 +204,18 @@ cj(function(){ }); {/literal} - {if $action eq 2} - {literal} - showHideMaxRelated(cj('#relationship_type_id').val()); - cj('#relationship_type_id').change(function(){ - showHideMaxRelated(cj('#relationship_type_id').val()); - }); - {/literal}{else}{literal} - showHideMaxRelated(cj('#relationship_type_id :selected').val()); - cj('#relationship_type_id').change(function(){ - showHideMaxRelated(cj('#relationship_type_id :selected').val()); - }); - {/literal}{/if}{literal} + {if $action eq 2} + {literal} + showHideMaxRelated(cj('#relationship_type_id').val()); + cj('#relationship_type_id').change(function(){ + showHideMaxRelated(cj('#relationship_type_id').val()); + }); + {/literal}{else}{literal} + showHideMaxRelated(cj('#relationship_type_id :selected').val()); + cj('#relationship_type_id').change(function(){ + showHideMaxRelated(cj('#relationship_type_id :selected').val()); + }); + {/literal}{/if}{literal} }); function showHidePeriodSettings() { @@ -231,7 +231,7 @@ function showHidePeriodSettings() { } if (!cj("#fixed_period_rollover_day_d").val()) { cj("#fixed_period_rollover_day_d").val("31"); - } + } cj("#month_fixed_rollover_day_row").val(""); } else if ((cj("#period_type :selected").val() == "fixed" ) && -- 2.25.1