From c5f7933225f77b4f7f718ad2921a5a28a805163a Mon Sep 17 00:00:00 2001 From: larssandergreen Date: Thu, 18 May 2023 08:51:25 -0600 Subject: [PATCH] Remove unneeded descriptions or replace with help text --- .../Form/ContributionPage/Amount.php | 6 +- .../Form/ContributionPage/Amount.hlp | 58 +++++++++++++ .../Form/ContributionPage/Amount.tpl | 86 +++++++++---------- .../Form/ContributionPage/Custom.tpl | 10 +-- .../Form/ContributionPage/Premium.tpl | 4 +- .../Form/ContributionPage/Settings.hlp | 21 +++++ .../Form/ContributionPage/Settings.tpl | 77 ++++++----------- .../Form/ContributionPage/Widget.tpl | 23 +++-- .../CRM/Event/Form/ManageEvent/EventInfo.tpl | 4 +- templates/CRM/Event/Form/ManageEvent/Fee.hlp | 22 +++++ templates/CRM/Event/Form/ManageEvent/Fee.tpl | 15 +--- templates/CRM/Friend/Form/Friend.tpl | 5 +- templates/CRM/Member/Form/MembershipBlock.hlp | 8 ++ templates/CRM/Member/Form/MembershipBlock.tpl | 21 ++--- 14 files changed, 214 insertions(+), 146 deletions(-) create mode 100644 templates/CRM/Contribute/Form/ContributionPage/Amount.hlp create mode 100644 templates/CRM/Event/Form/ManageEvent/Fee.hlp diff --git a/CRM/Contribute/Form/ContributionPage/Amount.php b/CRM/Contribute/Form/ContributionPage/Amount.php index 2a2a43546d..75754d1804 100644 --- a/CRM/Contribute/Form/ContributionPage/Amount.php +++ b/CRM/Contribute/Form/ContributionPage/Amount.php @@ -145,9 +145,11 @@ class CRM_Contribute_Form_ContributionPage_Amount extends CRM_Contribute_Form_Co $this->assign('price', TRUE); } - $this->addField('price_set_id', [ - 'entity' => 'PriceField', + $this->addSelect('price_set_id', [ + 'entity' => 'PriceSet', + 'option_url' => 'civicrm/admin/price', 'options' => $price, + 'label' => 'Price Set', 'onchange' => "showHideAmountBlock( this.value, 'price_set_id' );", ]); diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.hlp b/templates/CRM/Contribute/Form/ContributionPage/Amount.hlp new file mode 100644 index 0000000000..7a78804196 --- /dev/null +++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.hlp @@ -0,0 +1,58 @@ +{* + +--------------------------------------------------------------------+ + | Copyright CiviCRM LLC. All rights reserved. | + | | + | This work is published under the GNU AGPLv3 license with some | + | permitted exceptions and without any warranty. For full license | + | and copyright information, see https://civicrm.org/licensing | + +--------------------------------------------------------------------+ +*} +{htxt id="id-is_monetary-title"} + {ts}Execute real-time monetary transactions{/ts} +{/htxt} +{htxt id="id-is_monetary"} +{ts}Uncheck this box if you are using this contribution page for free membership signup ONLY, or to solicit in-kind / non-monetary donations such as furniture, equipment.. etc.{/ts} +{/htxt} + +{htxt id="id-pay_later_receipt-title"} + {ts}Pay Later Instructions{/ts} +{/htxt} +{htxt id="id-pay_later_receipt"} +{ts}Instructions added to Confirmation and Thank-you pages, as well as the confirmation email, when the user selects the 'pay later' option (e.g. 'Mail your check to ... within 3 business days.').{/ts} +{/htxt} + +{htxt id="id-is_billing_required-title"} + {ts}Billing address required{/ts} +{/htxt} +{htxt id="id-is_billing_required"} +{ts}Check this box to require users who select the pay later option to provide billing name and address.{/ts} +{/htxt} + +{htxt id="id-amount_block_is_active-title"} + {ts}Recurring Contributions{/ts} +{/htxt} +{htxt id="id-amount_block_is_active"} +{ts}Uncheck this box if you are using this contribution page for membership signup and renewal only – and you do NOT want users to select or enter any additional contribution amounts.{/ts} +{/htxt} + +{htxt id="id-is_recur-title"} + {ts}Recurring Contributions{/ts} +{/htxt} +{htxt id="id-is_recur"} +{ts}Check this box if you want to give users the option to make recurring contributions. This feature requires that you use a payment processor which supports recurring billing / subscriptions functionality.{/ts} {docURL page="user/contributions/payment-processors"} +{/htxt} + +{htxt id="id-is_pledge_active-title"} + {ts}Pledges{/ts} +{/htxt} +{htxt id="id-is_pledge_active"} +{ts}Check this box if you want to give users the option to make a Pledge (a commitment to contribute a fixed amount on a recurring basis).{/ts} +{/htxt} + +{htxt id="id-is_allow_other_amount-title"} + {ts}Allow other amounts{/ts} +{/htxt} +{htxt id="id-is_allow_other_amount"} +{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} {ts}You can also set minimum and maximum amounts that users are allowed to enter.{/ts} +{/htxt} + diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl index bb43d307fe..55b1b29137 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl @@ -22,18 +22,16 @@ {/if} - - + + + - + {if $paymentProcessor} - + {/if} @@ -43,32 +41,33 @@ - - + + - - {if $price eq true} - - {else} - - {/if} + +
{$form.is_monetary.label}{$form.is_monetary.html}
- {ts}Uncheck this box if you are using this contribution page for free membership signup ONLY, or to solicit in-kind / non-monetary donations such as furniture, equipment.. etc.{/ts}
{$form.is_monetary.label} {help id="id-is_monetary"}{$form.is_monetary.html}
{$form.currency.label}{$form.currency.html}
- {ts}Select the currency to be used for contributions submitted from this contribution page.{/ts}		{$form.currency.html}
{$form.payment_processor.label}{$form.payment_processor.html}
- {ts}Select the payment processor to be used for contributions submitted from this contribution page (unless you are soliciting non-monetary / in-kind contributions only).{/ts} {docURL page="user/contributions/payment-processors"}		{$form.payment_processor.html}
{$form.is_pay_later.label}
  - - - - - - - + + + + + + + + + + + +
{$form.pay_later_text.label} * {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='pay_later_text' id=$contributionPageID}{/if}{$form.pay_later_text.html|crmAddClass:big}
- {ts}Text displayed next to the checkbox for the 'pay later' option on the contribution form. You may include HTML formatting tags.{/ts}
{$form.pay_later_receipt.label} * {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='pay_later_receipt' id=$contributionPageID}{/if}{$form.pay_later_receipt.html|crmAddClass:big}
- {ts}Instructions added to Confirmation and Thank-you pages, as well as the confirmation email, when the user selects the 'pay later' option (e.g. 'Mail your check to ... within 3 business days.').{/ts}
{$form.is_billing_required.label}{$form.is_billing_required.html}
- {ts}Check this box to require users who select the pay later option to provide billing name and address.{/ts} -
{$form.pay_later_text.label} * {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='pay_later_text' id=$contributionPageID}{/if}{$form.pay_later_text.html|crmAddClass:big}
+ {$form.pay_later_receipt.label} + * + {help id="id-pay_later_receipt"} + {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='pay_later_receipt' id=$contributionPageID}{/if} + {$form.pay_later_receipt.html|crmAddClass:big}
{$form.is_billing_required.label} {help id="id-is_billing_required"}{$form.is_billing_required.html}
{$form.amount_block_is_active.label}{$form.amount_block_is_active.html}
- {ts}Uncheck this box if you are using this contribution page for membership signup and renewal only – and you do NOT want users to select or enter any additional contribution amounts.{/ts}		{$form.amount_block_is_active.label} {help id="id-amount_block_is_active"}{$form.amount_block_is_active.html}
{$form.price_set_id.label}{$form.price_set_id.html}
{ts 1=$adminPriceSets}Select a pre-configured Price Set to offer multiple individually priced options for contributions. Otherwise, select "-none-" and enter one or more fixed contribution options in the table below. Create or edit Price Sets here.{/ts}
{ts 1=$adminPriceSets}No Contribution Price Sets have been configured / enabled for your site. Price sets allow you to configure more complex contribution options (e.g. "Contribute $25 more to receive our monthly magazine."). Click here if you want to configure price sets for your site.{/ts}
{$form.price_set_id.label}{$form.price_set_id.html}
{ts}Select a Price Set to offer more complex amount options. Otherwise, leave this empty and enter fixed contribution options below.{/ts}
@@ -77,17 +76,15 @@ {if $recurringPaymentProcessor} - {$form.is_recur.label} - {$form.is_recur.html}
- {ts}Check this box if you want to give users the option to make recurring contributions. This feature requires that you use a payment processor which supports recurring billing / subscriptions functionality.{/ts} {docURL page="user/contributions/payment-processors"} - + {$form.is_recur.label} {help id="id-is_recur"} + {$form.is_recur.html}   - - + + +
{$form.recur_frequency_unit.label}*{$form.recur_frequency_unit.html}
- {ts}Select recurring units supported for recurring payments.{/ts}
{$form.recur_frequency_unit.label} *{$form.recur_frequency_unit.html}
{$form.is_recur_interval.label} {$form.is_recur_interval.html}
@@ -106,7 +103,7 @@ {if $futurePaymentProcessor}   {$form.pledge_calendar_date.html} -   {$form.pledge_calendar_month.html}
{ts}Recurring payment will be processed this day of the month following submission of this contribution page.{/ts} +   {$form.pledge_calendar_month.html} {/if} @@ -114,16 +111,13 @@ {* handle CiviPledge fields *} {if $civiPledge} - - + +
{$form.is_pledge_active.label}{$form.is_pledge_active.html}
- {ts}Check this box if you want to give users the option to make a Pledge (a commitment to contribute a fixed amount on a recurring basis).{/ts} -
{$form.is_pledge_active.label} {help id="id-is_pledge_active"}{$form.is_pledge_active.html}
- + - - + + + + diff --git a/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl b/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl index e7ec385c4e..ad8a9b2bf1 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Custom.tpl @@ -15,18 +15,14 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.pledge_frequency_unit.label} *{$form.pledge_frequency_unit.html}
- {ts}Which frequencies can the user pick from (e.g. every 'week', every 'month', every 'year')?{/ts}		{$form.pledge_frequency_unit.html}
{$form.is_pledge_interval.label} {$form.is_pledge_interval.html}
@@ -170,17 +164,17 @@ 		{$form.amount_label.label} * {$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}
{$form.is_allow_other_amount.label} {help id="id-is_allow_other_amount"}{$form.is_allow_other_amount.html}
  - +
{$form.min_amount.label} {$form.min_amount.html}
{$form.max_amount.label}{$form.max_amount.html}
- {ts 1=5|crmMoney}If you have chosen to Allow Other Amounts, you can use the fields above to control minimum and/or maximum acceptable values (e.g. don't allow contribution amounts less than %1).{/ts}
{$form.max_amount.html}
- + - - + +
{$form.custom_pre_id.label} - {$form.custom_pre_id.label} {$form.custom_pre_id.html} {ts}Profile to be included above the billing information (but after the introductory message, amounts, and honoree section).{/ts}
{$form.custom_post_id.label} - {$form.custom_post_id.html} - {ts}Profile to be included at the bottom of the page.{/ts} - {$form.custom_post_id.label}{$form.custom_post_id.html}
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl index a2873446a8..f4f55b8295 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl @@ -17,9 +17,7 @@ - +
{$form.premiums_active.label}{$form.premiums_active.html}
- {ts}Is the Premiums section enabled for this Online Contributions page?{/ts} - 		{$form.premiums_active.html}
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp b/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp index f8f77332c9..744613d674 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.hlp @@ -16,6 +16,13 @@

{ts}NOTE: If you are using this contribution page for membership signup and renewals, the financial type configured in the membership type settings will be used when recording the membership payment. The financial type selected here will only be used if you are also collecting additional contributions (as configured on the Membership Settings page).{/ts}

{/htxt} +{htxt id="id-for_organization-title"} + {ts}On behalf of Label{/ts} +{/htxt} +{htxt id="id-for_organization"} +{ts}Text displayed next to the checkbox on the contribution form.{/ts} +{/htxt} + {htxt id="id-intro_msg-title"} {ts}Intro Content{/ts} {/htxt} @@ -51,6 +58,20 @@ {ts}If you want to allow contributors to specify a person whom they are honoring with their gift, check this box. An optional Honoree section will be included in the form. Honoree information is automatically saved and linked with the contribution record.{/ts} {/htxt} +{htxt id="id-honor_block_text-title"} + {ts}Honoree Introductory Message{/ts} +{/htxt} +{htxt id="id-honor_block_text"} +{ts}Optional explanatory text for the Honoree section (displayed above the Honoree fields).{/ts} +{/htxt} + +{htxt id="id-is_confirm_enabled-title"} + {ts}Use a Confirmation Page?{/ts} +{/htxt} +{htxt id="id-is_confirm_enabled"} +{ts}If you disable this contributions will be processed immediately after submitting the contribution form.{/ts} +{/htxt} + {htxt id="id-is_organization-title"} {ts}Organization{/ts} {/htxt} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl index 082f334b82..ed2d4f78d5 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl @@ -18,43 +18,40 @@ {/if}
-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - - - +
{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='title' id=$contributionPageID}{/if}{$form.title.html}
- {ts}This title will be displayed at the top of the page unless the frontend title field is filled out.
Please use only alphanumeric, spaces, hyphens and dashes for Title.{/ts}
{$form.contribution_page_frontend_title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='frontend_title' id=$contributionPageID}{/if}{$form.contribution_page_frontend_title.html}
- {ts}This title will be displayed at the top of the page.
Please use only alphanumeric, spaces, hyphens and dashes for Title.{/ts}
{$form.financial_type_id.label}{$form.financial_type_id.html}
- {ts}Select the corresponding financial type for contributions made using this page.{/ts} {help id="id-financial_type"}
+ + + + + + + + + + + + {* CRM-7362 --add campaign to contribution page *} {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignTrClass="crm-contribution-contributionpage-settings-form-block-campaign_id"} - + + + + - + diff --git a/templates/CRM/Event/Form/ManageEvent/Fee.hlp b/templates/CRM/Event/Form/ManageEvent/Fee.hlp new file mode 100644 index 0000000000..74d40fe5ed --- /dev/null +++ b/templates/CRM/Event/Form/ManageEvent/Fee.hlp @@ -0,0 +1,22 @@ +{* + +--------------------------------------------------------------------+ + | Copyright CiviCRM LLC. All rights reserved. | + | | + | This work is published under the GNU AGPLv3 license with some | + | permitted exceptions and without any warranty. For full license | + | and copyright information, see https://civicrm.org/licensing | + +--------------------------------------------------------------------+ +*} +{htxt id="id-pay-later-text-title"} + {ts}Pay Later Label{/ts} +{/htxt} +{htxt id="id-pay-later-text"} +{ts}Text displayed next to the checkbox for the 'pay later' option on the contribution form. You may include HTML formatting tags.{/ts} +{/htxt} + +{htxt id="id-is-discount-title"} + {ts}Discounts by Signup Date?{/ts} +{/htxt} +{htxt id="id-is-discount"} +{ts}Check this box if you want to offer discounted fees based on registration date (e.g. 'early-registration discounts').{/ts} +{/htxt} diff --git a/templates/CRM/Event/Form/ManageEvent/Fee.tpl b/templates/CRM/Event/Form/ManageEvent/Fee.tpl index 45abb521a6..d85976626c 100644 --- a/templates/CRM/Event/Form/ManageEvent/Fee.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Fee.tpl @@ -36,9 +36,7 @@
{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='title' id=$contributionPageID}{/if}{$form.title.html}
{$form.contribution_page_frontend_title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='frontend_title' id=$contributionPageID}{/if}{$form.contribution_page_frontend_title.html}
{$form.financial_type_id.label} {help id="id-financial_type"}{$form.financial_type_id.html}
 {$form.is_organization.html} {$form.is_organization.label} {help id="id-is_organization"}
 {$form.is_organization.html} {$form.is_organization.label} {help id="id-is_organization"}
  - - - - - + + @@ -88,47 +85,29 @@
- {capture assign="profileURL"}{crmURL p='civicrm/admin/uf/group' q='reset=1'}{/capture} - {ts 1=$profileURL}To change the organization data collected use the "On Behalf Of Organization" profile (Administer > Customize Data and Screens > Profiles).{/ts} -
{$form.onbehalf_profile_id.label} {$form.onbehalf_profile_id.html}
{$form.for_organization.label}{$form.for_organization.html}
- {ts}Text displayed next to the checkbox on the contribution form.{/ts} - 		{$form.for_organization.label} {help id="id-for_organization"}{$form.for_organization.html}
 
- - + + - + - - + + - - + +
- {$form.honor_block_title.label} - - {$form.honor_block_title.html}
- {ts}Title for the Honoree section (e.g. "Honoree Information").{/ts} - 		{$form.honor_block_title.label}{$form.honor_block_title.html}
{crmAPI var='result' entity='OptionGroup' action='get' sequential=1 name='soft_credit_type'} - {$form.honor_block_text.label} - - {$form.honor_block_text.html}
- {ts}Optional explanatory text for the Honoree section (displayed above the Honoree fields).{/ts} + {$form.honor_block_text.label} {help id="id-honor_block_text"} 		{$form.honor_block_text.html}
- {$form.soft_credit_types.label} - - {$form.soft_credit_types.html} - {$form.soft_credit_types.label}{$form.soft_credit_types.html}
- {$form.honoree_profile.label} - - {$form.honoree_profile.html} - {ts}Profile to be included in the honoree section{/ts} - {$form.honoree_profile.label}{$form.honoree_profile.html}
- + diff --git a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl index 9ae6af8026..7650bf15ad 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl @@ -27,13 +27,22 @@
 {$form.is_confirm_enabled.html} {$form.is_confirm_enabled.label}
- {ts}If you disable this contributions will be processed immediately after submitting the contribution form.{/ts}		{$form.is_confirm_enabled.html} {$form.is_confirm_enabled.label} {help id="id-is_confirm_enabled"}
 
- - - - - + + + + + + + + + + + + + + + +
{$form.title.label} *{$form.title.html}
{$form.button_title.label}{$form.button_title.html}
{$form.about.label} *{$form.about.html} -
{ts}Enter content for the about message. You may include HTML formatting tags. You can also include images, as long as they are already uploaded to a server—reference them using complete URLs.{/ts} -
{$form.title.label} *{$form.title.html}
{$form.button_title.label}{$form.button_title.html}
{$form.about.label} *{$form.about.html}
diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl index 5bb6b6a706..9dd215fe20 100644 --- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl +++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl @@ -47,9 +47,7 @@
{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='title' id=$eventID}{/if}{$form.title.html}
- {ts}Please use only alphanumeric, spaces, hyphens and dashes for event names.{/ts} - 		{$form.title.html}
{$form.summary.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='summary' id=$eventID}{/if}
- +
{$form.currency.label}{$form.currency.html}
- {ts}Select the currency to be used for event registration.{/ts} - 		{$form.currency.html}
{if $paymentProcessor} @@ -67,14 +65,10 @@ - + - - - - - +
{$form.pay_later_text.label} * {$form.pay_later_text.label} * {help id="id-pay-later-text"} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='pay_later_text' id=$id}{/if}{$form.pay_later_text.html|crmAddClass:big}
 {ts}Text displayed next to the checkbox for the 'pay later' option on the contribution form. You may include HTML formatting tags.{/ts}
{$form.pay_later_receipt.label} * {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_event' field='pay_later_receipt' id=$id}{/if}{$form.pay_later_receipt.html|crmAddClass:big} @@ -154,9 +148,8 @@
- - + +
{$form.is_discount.html}{$form.is_discount.label}
{ts}Check this box if you want to offer discounted fees based on registration date (e.g. 'early-registration discounts').{/ts} - 		{$form.is_discount.html} {help id="id-is-discount"}{$form.is_discount.label}
diff --git a/templates/CRM/Friend/Form/Friend.tpl b/templates/CRM/Friend/Form/Friend.tpl index 8d79bb433b..c67198fb0b 100644 --- a/templates/CRM/Friend/Form/Friend.tpl +++ b/templates/CRM/Friend/Form/Friend.tpl @@ -48,10 +48,7 @@ {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_tell_friend' field='intro' id=$friendId} {/if} 		{$form.intro.html}
- {ts 1=$enduser}This message is displayed to the %1 at the top of the Tell a Friend form. You may include HTML tags to add formatting or links.{/ts} - - 		{$form.intro.html}
{$form.suggested_message.label} diff --git a/templates/CRM/Member/Form/MembershipBlock.hlp b/templates/CRM/Member/Form/MembershipBlock.hlp index ca0dc6715a..7204954af9 100644 --- a/templates/CRM/Member/Form/MembershipBlock.hlp +++ b/templates/CRM/Member/Form/MembershipBlock.hlp @@ -7,6 +7,14 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} + +{htxt id="id-is-required-title"} + {ts}Require Membership Signup{/ts} +{/htxt} +{htxt id="id-is-required"} +{ts}If checked, user must signup for one of the displayed membership options before continuing.{/ts} +{/htxt} + {htxt id="id-separate-pay-title"} {ts}Separate Payment{/ts} {/htxt} diff --git a/templates/CRM/Member/Form/MembershipBlock.tpl b/templates/CRM/Member/Form/MembershipBlock.tpl index 9bf956c435..0e2e9f031e 100644 --- a/templates/CRM/Member/Form/MembershipBlock.tpl +++ b/templates/CRM/Member/Form/MembershipBlock.tpl @@ -16,35 +16,30 @@
{include file="CRM/common/formButtons.tpl" location="top"}
- +
{$form.member_is_active.html} {$form.member_is_active.label}
- {ts}Include a Membership Signup section in this Online Contribution page?{/ts}		{$form.member_is_active.html} {$form.member_is_active.label}
+ {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_membership_block' field='new_title' id=$membershipBlockId}{/if} - + + {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_membership_block' field='renewal_title' id=$membershipBlockId}{/if} - + @@ -100,16 +95,14 @@ - + - +
{$form.new_title.label} - {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_membership_block' field='new_title' id=$membershipBlockId}{/if}{$form.new_title.html}
- {ts}Membership section title - for new member signups.{/ts}		{$form.new_title.html}
{$form.new_text.label} {if $action == 2}
{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_membership_block' field='new_text' id=$membershipBlockId}{/if} 		{$form.new_text.html}
- {ts}Membership section introductory text - for new member signups.{/ts}

{$form.new_text.html}
{$form.renewal_title.label} - {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_membership_block' field='renewal_title' id=$membershipBlockId}{/if}{$form.renewal_title.html}
- {ts}Membership section title - displayed to renewing members.{/ts}		{$form.renewal_title.html}
{$form.renewal_text.label} {if $action == 2}
{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_membership_block' field='renewal_text' id=$membershipBlockId}{/if} 		{$form.renewal_text.html}
- {ts}Membership section introductory text - displayed to renewing members.{/ts}
{$form.renewal_text.html}
{$form.member_price_set_id.label}
{$form.is_required.html} {$form.is_required.label}
- {ts}If checked, user must signup for one of the displayed membership options before continuing.{/ts}		{$form.is_required.html} {$form.is_required.label} {help id="id-is-required"}
{$form.is_separate_payment.html} {$form.is_separate_payment.label} {help id="id-separate-pay"}
{ts}Check this box if you are including both Membership Signup/Renewal AND a Contribution Amount section, AND you want the membership fee to be charged separately from any additional contribution amount.{/ts}
{$form.display_min_fee.html} {$form.display_min_fee.label} {help id="id-display-fee"}
- {ts}Display the membership fee along with the membership name and description for each membership option?{/ts}		{$form.display_min_fee.html} {$form.display_min_fee.label} {help id="id-display-fee"}
-- 2.25.1