From 62ad622ded5a3d2a69ae68b36369f2ab874b5bca Mon Sep 17 00:00:00 2001 From: Mukesh Ram Date: Thu, 8 Mar 2018 18:30:25 +0530 Subject: [PATCH] Make template structure proper --- .../CRM/Campaign/Form/Survey/Results.tpl | 4 +- templates/CRM/Pledge/Form/Pledge.tpl | 155 ++++++++++-------- 2 files changed, 92 insertions(+), 67 deletions(-) diff --git a/templates/CRM/Campaign/Form/Survey/Results.tpl b/templates/CRM/Campaign/Form/Survey/Results.tpl index 2093e7d6d3..95424e10f4 100644 --- a/templates/CRM/Campaign/Form/Survey/Results.tpl +++ b/templates/CRM/Campaign/Form/Survey/Results.tpl @@ -46,11 +46,11 @@
- + - +
{$form.create_report.label}{$form.create_report.label} {$form.create_report.html}
{$form.report_title.label}{$form.report_title.label} {$form.report_title.html|crmAddClass:big}
diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl index f81f1070fb..57fe8ad98e 100644 --- a/templates/CRM/Pledge/Form/Pledge.tpl +++ b/templates/CRM/Pledge/Form/Pledge.tpl @@ -30,7 +30,7 @@ {if !$email and $action neq 8 and $context neq 'standalone'}
-

{ts}You will not be able to send an acknowledgment for this pledge because there is no email address recorded for this contact. If you want a acknowledgment to be sent when this pledge is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the pledge.{/ts}

+

{ts}You will not be able to send an acknowledgment for this pledge because there is no email address recorded for this contact. If you want a acknowledgment to be sent when this pledge is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the pledge.{/ts}

{/if} {if $action EQ 2} @@ -45,9 +45,9 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8}
-
  - {ts}WARNING: Deleting this pledge will also delete any related pledge payments.{/ts} {ts}This action cannot be undone.{/ts} -

{ts}Consider cancelling the pledge instead if you want to maintain an audit trail and avoid losing payment data. To set the pledge status to Cancelled and cancel any not-yet-paid pledge payments, first click Cancel on this form. Then click the more > link from the pledge listing, and select the Cancel action.{/ts}

+
  + {ts}WARNING: Deleting this pledge will also delete any related pledge payments.{/ts} {ts}This action cannot be undone.{/ts} +

{ts}Consider cancelling the pledge instead if you want to maintain an audit trail and avoid losing payment data. To set the pledge status to Cancelled and cancel any not-yet-paid pledge payments, first click Cancel on this form. Then click the more > link from the pledge listing, and select the Cancel action.{/ts}

{else} @@ -58,93 +58,118 @@ {else} - - + + {/if} - - - - - - - - - - + + + + + + + + + + + + {if $form.create_date} - + - - + + + {ts}Date when pledge was made by the contributor.{/ts} + + {if $form.start_date} - - - + + - - + + + + {if $email and $outBound_option != 2} {if $form.is_acknowledge } - - - + + + + {/if} - {elseif $context eq 'standalone' and $outBound_option != 2 } - + {elseif $context eq 'standalone' and $outBound_option != 2 } + + + + {/if} - + - - - + + + - - - - + {ts}Date when an acknowledgment of the pledge was sent.{/ts} + + + + + + {* CRM-7362 --add campaign *} {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignTrClass="crm-pledge-form-block-campaign_id"} - - - - + + + + - - - - + + + + + + +
{ts}Pledge by{/ts}{$displayName}{ts}Pledge by{/ts}{$displayName}
{$form.amount.label}{$form.currency.html|crmAddClass:eight} {$form.amount.html|crmAddClass:eight} - {if $originalPledgeAmount}
 {ts 1=$originalPledgeAmount|crmMoney:$currency} Pledge total has changed due to payment adjustments. Original pledge amount was %1.{/ts}
{/if} -
{$form.installments.label}{$form.installments.html} {ts}installments of{/ts} - - {if $action eq 1 or $isPending} - {$form.eachPaymentAmount.html|crmMoney:$currency} - {elseif $action eq 2 and !$isPending} - {$eachPaymentAmount|crmMoney:$currency} - {/if} -  {ts}every{/ts} {$form.frequency_interval.html} {$form.frequency_unit.html}
{$form.frequency_day.label}{$form.frequency_day.html} {ts}day of the period{/ts}
- {ts}This applies to weekly, monthly and yearly payments.{/ts}
{$form.amount.label} + {$form.currency.html|crmAddClass:eight} {$form.amount.html|crmAddClass:eight} + {if $originalPledgeAmount}
 {ts 1=$originalPledgeAmount|crmMoney:$currency} Pledge total has changed due to payment adjustments. Original pledge amount was %1.{/ts}
{/if} +
{$form.installments.label}{$form.installments.html} {ts}installments of{/ts} + + {if $action eq 1 or $isPending} + {$form.eachPaymentAmount.html|crmMoney:$currency} + {elseif $action eq 2 and !$isPending} + {$eachPaymentAmount|crmMoney:$currency} + {/if} +  {ts}every{/ts} {$form.frequency_interval.html} {$form.frequency_unit.html} +
{$form.frequency_day.label}{$form.frequency_day.html} {ts}day of the period{/ts}
+ {ts}This applies to weekly, monthly and yearly payments.{/ts} +
{$form.create_date.label} {include file="CRM/common/jcalendar.tpl" elementName=create_date}
{/if} {if $create_date} -
{ts}Pledge Made{/ts}{$create_date|truncate:10:''|crmDate} +
{ts}Pledge Made{/ts}{$create_date|truncate:10:''|crmDate} {/if}
- {ts}Date when pledge was made by the contributor.{/ts}
{$form.start_date.label}{include file="CRM/common/jcalendar.tpl" elementName=start_date}
+
{$form.start_date.label}{include file="CRM/common/jcalendar.tpl" elementName=start_date}
{/if} {if $start_date} -
{ts}Payments Start{/ts}{$start_date|truncate:10:''|crmDate} - {/if}
- {ts}Date of first pledge payment.{/ts}
{ts}Payments Start{/ts}{$start_date|truncate:10:''|crmDate} + {/if} +
+ {ts}Date of first pledge payment.{/ts} +
{$form.is_acknowledge.label}{$form.is_acknowledge.html}
- {ts 1=$email}Automatically email an acknowledgment of this pledge to %1?{/ts}
{$form.is_acknowledge.label}{$form.is_acknowledge.html}
+ {ts 1=$email}Automatically email an acknowledgment of this pledge to %1?{/ts} +
{$form.acknowledge_date.label}
{$form.acknowledge_date.label} {include file="CRM/common/jcalendar.tpl" elementName=acknowledge_date}
- {ts}Date when an acknowledgment of the pledge was sent.{/ts}
{$form.financial_type_id.label}{$form.financial_type_id.html}
- {ts}Sets the default financial type for payments against this pledge.{/ts}
{$form.financial_type_id.label}{$form.financial_type_id.html}
+ {ts}Sets the default financial type for payments against this pledge.{/ts} +
{$form.contribution_page_id.label}{$form.contribution_page_id.html}
- {ts}Select an Online Contribution page that the user can access to make self-service pledge payments. (Only Online Contribution pages configured to include the Pledge option are listed.){/ts}
{$form.contribution_page_id.label}{$form.contribution_page_id.html}
+ {ts}Select an Online Contribution page that the user can access to make self-service pledge payments. (Only Online Contribution pages configured to include the Pledge option are listed.){/ts} +
{ts}Pledge Status{/ts}{$status}
- {ts}Pledges are "Pending" until the first payment is received. Once a payment is received, status is "In Progress" until all scheduled payments are completed. Overdue pledges are ones with payment(s) past due.{/ts}
{include file="CRM/Custom/Form/CustomData.tpl"}
{$status}
+ {ts}Pledges are "Pending" until the first payment is received. Once a payment is received, status is "In Progress" until all scheduled payments are completed. Overdue pledges are ones with payment(s) past due.{/ts} +
{include file="CRM/Custom/Form/CustomData.tpl"}
{literal}