From c67e7149bbeff4fcec6ea0c70bb2824c89c927f8 Mon Sep 17 00:00:00 2001 From: Mukesh Ram Date: Fri, 23 Mar 2018 14:02:56 +0530 Subject: [PATCH] Fix template structures --- templates/CRM/Admin/Form/MessageTemplates.tpl | 3 ++- templates/CRM/Admin/Form/Setting/Mail.tpl | 4 ++-- templates/CRM/Admin/Page/MailSettings.tpl | 5 +++-- templates/CRM/Contribute/Form/Contribution.tpl | 16 +++++++++------- .../Contribute/Form/ContributionPage/Amount.tpl | 5 ++++- templates/CRM/Contribute/Form/SoftCredit.tpl | 7 ++++--- templates/CRM/Custom/Form/Group.tpl | 2 +- templates/CRM/Friend/Form/Friend.tpl | 3 --- 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/templates/CRM/Admin/Form/MessageTemplates.tpl b/templates/CRM/Admin/Form/MessageTemplates.tpl index 3de688e519e..6988b048a5f 100644 --- a/templates/CRM/Admin/Form/MessageTemplates.tpl +++ b/templates/CRM/Admin/Form/MessageTemplates.tpl @@ -26,13 +26,14 @@ {* this template is used for adding/editing/deleting Message Templates *} {capture assign=tokenDocsRepeated}{docURL page="user/common-workflows/tokens-and-mail-merge" text="token documentation"}{/capture} -

{if $action eq 1}{ts}New Message Template{/ts}{elseif $action eq 2}{ts}Edit Message Template{/ts}{else}{ts}Delete Message Template{/ts}{/if}

{if $action neq 8}
{ts}Use this form to add or edit re-usable message templates.{/ts} {help id="id-intro" file="CRM/Admin/Page/MessageTemplates.hlp"}
{/if} +

{if $action eq 1}{ts}New Message Template{/ts}{elseif $action eq 2}{ts}Edit Message Template{/ts}{else}{ts}Delete Message Template{/ts}{/if}

+
{if $action eq 8} diff --git a/templates/CRM/Admin/Form/Setting/Mail.tpl b/templates/CRM/Admin/Form/Setting/Mail.tpl index 3235e35dfeb..8c9ae9c0b05 100644 --- a/templates/CRM/Admin/Form/Setting/Mail.tpl +++ b/templates/CRM/Admin/Form/Setting/Mail.tpl @@ -24,9 +24,9 @@ +--------------------------------------------------------------------+ *} {capture assign=docLink}{docURL page="CiviMail Mailer Settings" text="CiviMail Mailer Settings and Optimization" resource="wiki"}{/capture} -
-
+
{ts 1=$docLink}These settings are used to configure mailer properties for the optional CiviMail component and may allow you to significantly optimize performance. Please read the %1 documentation, and make sure you understand it before modifying default values. (These settings are NOT used for the built-in 'Email - send now' feature).{/ts}
+
{include file='CRM/Admin/Form/Setting/SettingForm.tpl'}
diff --git a/templates/CRM/Admin/Page/MailSettings.tpl b/templates/CRM/Admin/Page/MailSettings.tpl index a5f543cc857..19dcfee283c 100644 --- a/templates/CRM/Admin/Page/MailSettings.tpl +++ b/templates/CRM/Admin/Page/MailSettings.tpl @@ -27,12 +27,12 @@ {include file="CRM/Admin/Form/MailSettings.tpl"} {else} +
{if $rows}
-

{strip} - +
@@ -79,3 +79,4 @@ {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton} {/if} + diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl index 78b55f37a63..ccc742dad4a 100644 --- a/templates/CRM/Contribute/Form/Contribution.tpl +++ b/templates/CRM/Contribute/Form/Contribution.tpl @@ -31,13 +31,6 @@ {include file="CRM/Contribute/Form/AdditionalInfo/$formType.tpl"} {else} {include file="CRM/Contribute/Form/AdditionalInfo/Payment.tpl"} -
- - {if !$email and $action neq 8 and $context neq 'standalone'} -
-
 {ts}You will not be able to send an automatic email receipt for this contribution because there is no email address recorded for this contact. If you want a receipt to be sent when this contribution is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the contribution.{/ts} -
- {/if} {if $contributionMode}
{if $contactId && $payNow} @@ -51,6 +44,15 @@ {/if}
{/if} + +
+ + {if !$email and $action neq 8 and $context neq 'standalone'} +
+
 {ts}You will not be able to send an automatic email receipt for this contribution because there is no email address recorded for this contact. If you want a receipt to be sent when this contribution is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the contribution.{/ts} +
+ {/if} + {if $action eq 8}
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl index 78eb734c504..ffdf1f82b94 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl @@ -202,7 +202,10 @@
{ts}Name{/ts} {ts}Server{/ts}
{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}
+
+ {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} diff --git a/templates/CRM/Contribute/Form/SoftCredit.tpl b/templates/CRM/Contribute/Form/SoftCredit.tpl index 69fad09a61b..a5db4a6a1f1 100644 --- a/templates/CRM/Contribute/Form/SoftCredit.tpl +++ b/templates/CRM/Contribute/Form/SoftCredit.tpl @@ -30,13 +30,14 @@ diff --git a/templates/CRM/Custom/Form/Group.tpl b/templates/CRM/Custom/Form/Group.tpl index 467063de5a3..9381bd39bf2 100644 --- a/templates/CRM/Custom/Form/Group.tpl +++ b/templates/CRM/Custom/Form/Group.tpl @@ -24,8 +24,8 @@ +--------------------------------------------------------------------+ *} {* add/update/view custom data group *} +
{ts}Use Custom Field Sets to add logically related fields for a specific type of CiviCRM record (e.g. contact records, contribution records, etc.).{/ts} {help id="id-group_intro"}
-
{ts}Use Custom Field Sets to add logically related fields for a specific type of CiviCRM record (e.g. contact records, contribution records, etc.).{/ts} {help id="id-group_intro"}
{include file="CRM/common/formButtons.tpl" location="top"}
{ts}Contribution Label{/ts}{ts}Amount{/ts}{ts}Default?{/ts}
{$form.default.0.html}
- {$form.soft_credit_contact_id.$rowNumber.label} {$form.soft_credit_contact_id.$rowNumber.html|crmAddClass:twenty} + {$form.soft_credit_contact_id.$rowNumber.label}
{$form.soft_credit_contact_id.$rowNumber.html|crmAddClass:twenty} 		- {$form.soft_credit_amount.$rowNumber.label} {$form.soft_credit_amount.$rowNumber.html|crmAddClass:eight} + {$form.soft_credit_amount.$rowNumber.label}
{$form.soft_credit_amount.$rowNumber.html|crmAddClass:eight} 		- {$form.soft_credit_type.$rowNumber.label} {$form.soft_credit_type.$rowNumber.html} + {$form.soft_credit_type.$rowNumber.label}
+ {$form.soft_credit_type.$rowNumber.html}  
diff --git a/templates/CRM/Friend/Form/Friend.tpl b/templates/CRM/Friend/Form/Friend.tpl index 20c83638621..9165352a3e5 100644 --- a/templates/CRM/Friend/Form/Friend.tpl +++ b/templates/CRM/Friend/Form/Friend.tpl @@ -42,9 +42,6 @@
{include file="CRM/common/formButtons.tpl" location="top"}
- - -
{$form.tf_is_active.html} {$form.tf_is_active.label}