From: eileen Date: Mon, 13 May 2013 02:26:25 +0000 (+1200) Subject: CRM-12595 fix formatting in templates files (C) X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b2603e29bb13e9f163eabaa65a8757a9da23ae29;hp=cb2036b19d3c6872a83f8f391fea398e626476d6;p=civicrm-core.git CRM-12595 fix formatting in templates files (C) --- diff --git a/templates/CRM/Campaign/Form/Petition/Block.tpl b/templates/CRM/Campaign/Form/Petition/Block.tpl index c833b299ae..4f99a74491 100644 --- a/templates/CRM/Campaign/Form/Petition/Block.tpl +++ b/templates/CRM/Campaign/Form/Petition/Block.tpl @@ -52,7 +52,7 @@ {if $field.options_per_line != 0}
- {* Show explanatory text for field if not in 'view' or 'preview' modes *} + {* Show explanatory text for field if not in 'view' or 'preview' modes *} {if $field.help_pre && $action neq 4 && $action neq 1028}   {$field.help_pre} {/if} @@ -90,7 +90,7 @@
{else}
- {* Show explanatory text for field if not in 'view' or 'preview' modes *} + {* Show explanatory text for field if not in 'view' or 'preview' modes *} {if $field.help_pre && $action neq 4 && $action neq 1028}   {$field.help_pre} {/if} diff --git a/templates/CRM/Campaign/Form/Task/Interview.tpl b/templates/CRM/Campaign/Form/Task/Interview.tpl index 55a29d4b17..beb1688fc4 100644 --- a/templates/CRM/Campaign/Form/Task/Interview.tpl +++ b/templates/CRM/Campaign/Form/Task/Interview.tpl @@ -74,7 +74,7 @@ {if $index eq 1} {$form.buttons._qf_Interview_submit_orderBy.html} - {/if} + {/if} {/section} @@ -295,7 +295,7 @@ function registerInterview( voterId ) { //carry contact related profile field data. var fieldName = 'field_' + voterId; var checkBoxFieldName = 'field[' + voterId + ']'; - cj('[id^="'+ fieldName +'"], [id^="'+ checkBoxFieldName +'"]').each(function( ) { + cj('[id^="'+ fieldName +'"], [id^="'+ checkBoxFieldName +'"]').each(function( ) { fldId = cj(this).attr('id'); if (fldId.indexOf('_custom_') == -1 && fldId.indexOf('_result') == -1 && diff --git a/templates/CRM/Campaign/Form/Task/Print.tpl b/templates/CRM/Campaign/Form/Task/Print.tpl index f2dcdc5415..ba1224c8b8 100755 --- a/templates/CRM/Campaign/Form/Task/Print.tpl +++ b/templates/CRM/Campaign/Form/Task/Print.tpl @@ -27,7 +27,7 @@ {$form.buttons.html}
-{if $rows } +{if $rows }

{include file="CRM/Campaign/Form/Selector.tpl"} diff --git a/templates/CRM/Campaign/Form/Task/Release.tpl b/templates/CRM/Campaign/Form/Task/Release.tpl index 1605d8b8f3..8aab26d86c 100644 --- a/templates/CRM/Campaign/Form/Task/Release.tpl +++ b/templates/CRM/Campaign/Form/Task/Release.tpl @@ -30,11 +30,11 @@
{include file="CRM/common/formButtons.tpl" location="top"}
- + + diff --git a/templates/CRM/Case/Audit/Audit.tpl b/templates/CRM/Case/Audit/Audit.tpl index 74e497397b..90812a5835 100644 --- a/templates/CRM/Case/Audit/Audit.tpl +++ b/templates/CRM/Case/Audit/Audit.tpl @@ -1,182 +1,182 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 4.3 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2013 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{* -Notes: -- Any id's should be prefixed with civicase-audit to avoid name collisions. -- The idea behind the regex_replace is that for a css selector on a field, we can make it simple by saying the convention is to use the field label, but convert to lower case and strip out all except a-z and 0-9. -There's the potential for collisions (two different labels having the same shortened version), but it would be odd for the user to configure fields that way, and at most affects styling as opposed to crashing or something. -- Note the whole output gets contained within a with name="Report". -*} - - - - -
+
 {ts 1=$surveyTitle}Do you want to release respondents for '%1' ?{/ts} -
-
{include file="CRM/Contact/Form/Task.tpl"}
- - - - - - - - - -
-     -     -
-
- - -
- - - - - -{foreach from=$activities item=activity name=activityloop} - - - - -{/foreach} -
 {ts}Description{/ts}
- {if $activity.completed} - - {else} - - {ts}Incomplete{/ts} - - {/if} - - - {foreach from=$activity.leftpane item=field name=fieldloop} - - {if $field.datatype == 'File'}{/if} - {if $field.datatype == 'Date'} - {if $field.includeTime} - {$field.value|escape|replace:'T':' '|crmDate} - {else} - {$field.value|escape|truncate:10:'':true|crmDate} - {/if} - {else} - {$field.value|escape} - {/if} - {if $field.datatype == 'File'}{/if} -
- {/foreach} - -
-		  -
- {foreach from=$activities item=activity name=activityloop} - - {/foreach} -
-
- {foreach from=$activities item=activity name=activityloop} -
- {foreach from=$activity.rightpanebody item=field name=fieldloop} -
- - {if $field.datatype == 'File'}{/if} - {if $field.datatype == 'Date'} - {if $field.includeTime} - {$field.value|escape|replace:'T':' '|crmDate} - {else} - {$field.value|escape|truncate:10:'':true|crmDate} - {/if} - {elseif $field.label eq 'Details'} - {$field.value} - {else} - {$field.value|escape} - {/if} - {if $field.datatype == 'File'}{/if} - -
- {/foreach} -
- {/foreach} -
-
-
-
-     -     -
-{literal} - -{/literal} +{* + +--------------------------------------------------------------------+ + | CiviCRM version 4.3 | + +--------------------------------------------------------------------+ + | Copyright CiviCRM LLC (c) 2004-2013 | + +--------------------------------------------------------------------+ + | This file is a part of CiviCRM. | + | | + | CiviCRM is free software; you can copy, modify, and distribute it | + | under the terms of the GNU Affero General Public License | + | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | + | | + | CiviCRM is distributed in the hope that it will be useful, but | + | WITHOUT ANY WARRANTY; without even the implied warranty of | + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | + | See the GNU Affero General Public License for more details. | + | | + | You should have received a copy of the GNU Affero General Public | + | License and the CiviCRM Licensing Exception along | + | with this program; if not, contact CiviCRM LLC | + | at info[AT]civicrm[DOT]org. If you have questions about the | + | GNU Affero General Public License or the licensing of CiviCRM, | + | see the CiviCRM license FAQ at http://civicrm.org/licensing | + +--------------------------------------------------------------------+ +*} +{* +Notes: +- Any id's should be prefixed with civicase-audit to avoid name collisions. +- The idea behind the regex_replace is that for a css selector on a field, we can make it simple by saying the convention is to use the field label, but convert to lower case and strip out all except a-z and 0-9. +There's the potential for collisions (two different labels having the same shortened version), but it would be odd for the user to configure fields that way, and at most affects styling as opposed to crashing or something. +- Note the whole output gets contained within a with name="Report". +*} + + + + + + + + + + + + + + +
+     +     +
+
+ + +
+ + + + + +{foreach from=$activities item=activity name=activityloop} + + + + +{/foreach} +
 {ts}Description{/ts}
+ {if $activity.completed} + + {else} + + {ts}Incomplete{/ts} + + {/if} + + + {foreach from=$activity.leftpane item=field name=fieldloop} + + {if $field.datatype == 'File'}{/if} + {if $field.datatype == 'Date'} + {if $field.includeTime} + {$field.value|escape|replace:'T':' '|crmDate} + {else} + {$field.value|escape|truncate:10:'':true|crmDate} + {/if} + {else} + {$field.value|escape} + {/if} + {if $field.datatype == 'File'}{/if} +
+ {/foreach} + +
+		  +
+ {foreach from=$activities item=activity name=activityloop} + + {/foreach} +
+
+ {foreach from=$activities item=activity name=activityloop} +
+ {foreach from=$activity.rightpanebody item=field name=fieldloop} +
+ + {if $field.datatype == 'File'}{/if} + {if $field.datatype == 'Date'} + {if $field.includeTime} + {$field.value|escape|replace:'T':' '|crmDate} + {else} + {$field.value|escape|truncate:10:'':true|crmDate} + {/if} + {elseif $field.label eq 'Details'} + {$field.value} + {else} + {$field.value|escape} + {/if} + {if $field.datatype == 'File'}{/if} + +
+ {/foreach} +
+ {/foreach} +
+
+
+
+     +     +
+{literal} + +{/literal} diff --git a/templates/CRM/Case/Page/DashBoard.tpl b/templates/CRM/Case/Page/DashBoard.tpl index 102e6fb714..8fc01ac266 100644 --- a/templates/CRM/Case/Page/DashBoard.tpl +++ b/templates/CRM/Case/Page/DashBoard.tpl @@ -1,112 +1,112 @@ -{* - +--------------------------------------------------------------------+ - | CiviCRM version 4.3 | - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2013 | - +--------------------------------------------------------------------+ - | This file is a part of CiviCRM. | - | | - | CiviCRM is free software; you can copy, modify, and distribute it | - | under the terms of the GNU Affero General Public License | - | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | - | | - | CiviCRM is distributed in the hope that it will be useful, but | - | WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | - | See the GNU Affero General Public License for more details. | - | | - | You should have received a copy of the GNU Affero General Public | - | License and the CiviCRM Licensing Exception along | - | with this program; if not, contact CiviCRM LLC | - | at info[AT]civicrm[DOT]org. If you have questions about the | - | GNU Affero General Public License or the licensing of CiviCRM, | - | see the CiviCRM license FAQ at http://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{* CiviCase DashBoard (launch page) *} - -
-{if $notConfigured} {* Case types not present. Component is not configured for use. *} - {include file="CRM/Case/Page/ConfigureError.tpl"} -{else} - -{capture assign=newCaseURL}{crmURL p="civicrm/case/add" q="action=add&context=standalone&reset=1"}{/capture} - -
- {if $newClient and $allowToAddNewCase} -
{ts}Add Case{/ts} - {/if} - {ts}Find My Cases{/ts} - -
- {if $myCases} - {* check for access all cases and activities *} - {if call_user_func(array('CRM_Core_Permission','check'), 'access all cases and activities')} -
{ts}All Cases with Upcoming Activities{/ts}
-
{ts}My Cases with Upcoming Activities{/ts}
- {/if} - {else} -
{ts}All Cases with Upcoming Activities{/ts}
-
{ts}My Cases with Upcoming Activities{/ts}
- {/if} -
-
- - -

-{if $myCases} - {ts}Summary of Case Involvement{/ts} -{else} - {ts}Summary of All Cases{/ts} -{/if} -

- - - - {foreach from=$casesSummary.headers item=header} - - {/foreach} - - {foreach from=$casesSummary.rows item=row key=caseType} - - - {foreach from=$casesSummary.headers item=header} - {assign var="caseStatus" value=$header.status} - - {/foreach} - - {/foreach} -
 {$header.status}
{$caseType} - {if $row.$caseStatus} - {$row.$caseStatus.count} - {else} - 0 - {/if} -
-{capture assign=findCasesURL}{ts}Find Cases{/ts}{/capture} - -
-

{if $myCases}{ts}My Cases With Upcoming Activities{/ts}{else}{ts}All Cases With Upcoming Activities{/ts}{/if}

- {if $upcomingCases} -
- {include file="CRM/Case/Page/DashboardSelector.tpl" context="dashboard" list="upcoming" rows=$upcomingCases} -
- {else} -
- {ts 1=$findCasesURL}There are no open cases with activities scheduled in the next two weeks. Use %1 to expand your search.{/ts} -
- {/if} - -
-

{if $myCases}{ts}My Cases With Recently Performed Activities{/ts}{else}{ts}All Cases With Recently Performed Activities{/ts}{/if}

- {if $recentCases} -
- {include file="CRM/Case/Page/DashboardSelector.tpl" context="dashboard" list="recent" rows=$recentCases} -
- {else} -
- {ts 1=$findCasesURL}There are no cases with activities scheduled in the past two weeks. Use %1 to expand your search.{/ts} -
- {/if} -{/if} -
+{* + +--------------------------------------------------------------------+ + | CiviCRM version 4.3 | + +--------------------------------------------------------------------+ + | Copyright CiviCRM LLC (c) 2004-2013 | + +--------------------------------------------------------------------+ + | This file is a part of CiviCRM. | + | | + | CiviCRM is free software; you can copy, modify, and distribute it | + | under the terms of the GNU Affero General Public License | + | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. | + | | + | CiviCRM is distributed in the hope that it will be useful, but | + | WITHOUT ANY WARRANTY; without even the implied warranty of | + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | + | See the GNU Affero General Public License for more details. | + | | + | You should have received a copy of the GNU Affero General Public | + | License and the CiviCRM Licensing Exception along | + | with this program; if not, contact CiviCRM LLC | + | at info[AT]civicrm[DOT]org. If you have questions about the | + | GNU Affero General Public License or the licensing of CiviCRM, | + | see the CiviCRM license FAQ at http://civicrm.org/licensing | + +--------------------------------------------------------------------+ +*} +{* CiviCase DashBoard (launch page) *} + +
+{if $notConfigured} {* Case types not present. Component is not configured for use. *} + {include file="CRM/Case/Page/ConfigureError.tpl"} +{else} + +{capture assign=newCaseURL}{crmURL p="civicrm/case/add" q="action=add&context=standalone&reset=1"}{/capture} + +
+ {if $newClient and $allowToAddNewCase} +
{ts}Add Case{/ts} + {/if} + {ts}Find My Cases{/ts} + +
+ {if $myCases} + {* check for access all cases and activities *} + {if call_user_func(array('CRM_Core_Permission','check'), 'access all cases and activities')} +
{ts}All Cases with Upcoming Activities{/ts}
+
{ts}My Cases with Upcoming Activities{/ts}
+ {/if} + {else} +
{ts}All Cases with Upcoming Activities{/ts}
+
{ts}My Cases with Upcoming Activities{/ts}
+ {/if} +
+
+ + +

+{if $myCases} + {ts}Summary of Case Involvement{/ts} +{else} + {ts}Summary of All Cases{/ts} +{/if} +

+ + + + {foreach from=$casesSummary.headers item=header} + + {/foreach} + + {foreach from=$casesSummary.rows item=row key=caseType} + + + {foreach from=$casesSummary.headers item=header} + {assign var="caseStatus" value=$header.status} + + {/foreach} + + {/foreach} +
 {$header.status}
{$caseType} + {if $row.$caseStatus} + {$row.$caseStatus.count} + {else} + 0 + {/if} +
+{capture assign=findCasesURL}{ts}Find Cases{/ts}{/capture} + +
+

{if $myCases}{ts}My Cases With Upcoming Activities{/ts}{else}{ts}All Cases With Upcoming Activities{/ts}{/if}

+ {if $upcomingCases} +
+ {include file="CRM/Case/Page/DashboardSelector.tpl" context="dashboard" list="upcoming" rows=$upcomingCases} +
+ {else} +
+ {ts 1=$findCasesURL}There are no open cases with activities scheduled in the next two weeks. Use %1 to expand your search.{/ts} +
+ {/if} + +
+

{if $myCases}{ts}My Cases With Recently Performed Activities{/ts}{else}{ts}All Cases With Recently Performed Activities{/ts}{/if}

+ {if $recentCases} +
+ {include file="CRM/Case/Page/DashboardSelector.tpl" context="dashboard" list="recent" rows=$recentCases} +
+ {else} +
+ {ts 1=$findCasesURL}There are no cases with activities scheduled in the past two weeks. Use %1 to expand your search.{/ts} +
+ {/if} +{/if} +
diff --git a/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl b/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl index 99d46c76f5..003946fd04 100644 --- a/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl +++ b/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl @@ -74,14 +74,14 @@ {/if} {if $rows} -
+
{* Search request has returned 1 or more matching rows. Display results and collapse the search criteria fieldset. *} {* This section handles form elements for action task select and submit *}
{include file="CRM/Contact/Form/Search/ResultTasks.tpl"} -
+
{* This section displays the rows along and includes the paging controls *} -
+
{include file="CRM/common/pager.tpl" location="top"} diff --git a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl index af1ba9c52c..114784326d 100644 --- a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl +++ b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl @@ -68,9 +68,9 @@ {/foreach} {/strip} - {if !$table and $summary.addShowAllLink.Contact}
» {ts}View all results for contacts{/ts}
{/if} - {* note we using location="below" because we don't want to use rows per page for now. And therefore don't put location="bottom" for now. *} - {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} + {if !$table and $summary.addShowAllLink.Contact}
» {ts}View all results for contacts{/ts}
{/if} + {* note we using location="below" because we don't want to use rows per page for now. And therefore don't put location="bottom" for now. *} + {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *}
{/if} @@ -115,7 +115,7 @@ {/foreach} {/strip} - {if !$table and $summary.addShowAllLink.Activity}
» {ts}View all results for activities{/ts}
{/if} + {if !$table and $summary.addShowAllLink.Activity}
» {ts}View all results for activities{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *}
@@ -149,17 +149,17 @@ {$row.case_end_date|crmDate:"%b %d, %Y %l:%M %P"} {$row.case_id} {if $row.case_is_deleted} - {ts}Restore Case{/ts} - {else} - {ts}Manage{/ts} - {/if} + {ts}Restore Case{/ts} + {else} + {ts}Manage{/ts} + {/if} {$row.case_start_date|crmDate} {$row.case_end_date|crmDate} {/foreach} {/strip} - {if !$table and $summary.addShowAllLink.Case}
» {ts}View all results for cases{/ts}
{/if} + {if !$table and $summary.addShowAllLink.Case}
» {ts}View all results for cases{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *}
@@ -201,7 +201,7 @@ {/foreach} {/strip} - {if !$table and $summary.addShowAllLink.Contribution}
» {ts}View all results for contributions{/ts}
{/if} + {if !$table and $summary.addShowAllLink.Contribution}
» {ts}View all results for contributions{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *} @@ -246,7 +246,7 @@ {/foreach} {/strip} - {if !$table and $summary.addShowAllLink.Participant}
» {ts}View all results for participants{/ts}
{/if} + {if !$table and $summary.addShowAllLink.Participant}
» {ts}View all results for participants{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *} @@ -291,7 +291,7 @@ {/foreach} {/strip} - {if !$table and $summary.addShowAllLink.Membership}
» {ts}View all results for memberships{/ts}
{/if} + {if !$table and $summary.addShowAllLink.Membership}
» {ts}View all results for memberships{/ts}
{/if} {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if} {* END Actions/Results section *} diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl index 902ef3a57a..265098edf4 100644 --- a/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl +++ b/templates/CRM/Contribute/Form/AdditionalInfo/AdditionalDetail.tpl @@ -23,7 +23,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{* this template is used for adding/editing Additional Detail *} +{* this template is used for adding/editing Additional Detail *} {if $isOnline}{assign var=valueStyle value=" class='view-value'"}{else}{assign var=valueStyle value=""}{/if}
@@ -33,7 +33,7 @@ {ts}Non-deductible portion of this contribution.{/ts}{$form.fee_amount.html|crmMoney:$currency:'XXX':'YYY'}
{ts}Processing fee for this transaction (if applicable).{/ts} - + {$form.net_amount.html|crmMoney:$currency:'':1}
{ts}Net value of the contribution (Total Amount minus Fee).{/ts}{$form.invoice_id.html}
@@ -41,4 +41,4 @@
{$form.fee_amount.label}
{$form.net_amount.label}
{$form.invoice_id.label}
{$form.thankyou_date.label}{include file="CRM/common/jcalendar.tpl" elementName=thankyou_date}
{ts}Date that a thank-you message was sent to the contributor.{/ts}
-
+ diff --git a/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl b/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl index 3f8159cbe6..ba0ea333c8 100644 --- a/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl +++ b/templates/CRM/Contribute/Form/Contribution/AuthorizeNetARB.tpl @@ -99,11 +99,11 @@ {if $invoiceNumber} - + {$invoiceNumber} {if $name}{$name}{/if} - {/if} + {/if} {$contactID} {$email} diff --git a/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl b/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl index 255a8146ab..a03d5f42dd 100644 --- a/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl +++ b/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl @@ -33,7 +33,7 @@ {if $premiumBlock.premiums_intro_text}
{$premiumBlock.premiums_intro_text} -
+ {/if} {/if} @@ -63,7 +63,7 @@ {$premiumBlock.premiums_nothankyou_label} - {/if} + {/if} {foreach from=$products item=row}
@@ -92,7 +92,7 @@ {/if} {else}
-

{$row.options}

+

{$row.options}

{/if} {if ( ($premiumBlock.premiums_display_min_contribution AND $context EQ "makeContribution") OR $preview EQ 1) AND $row.min_contribution GT 0 } @@ -113,7 +113,7 @@ {$premiumBlock.premiums_nothankyou_label}
- {/if} + {/if} {/strip} @@ -123,15 +123,15 @@ {/if} - + {if $context EQ "makeContribution"} {literal} - \ No newline at end of file diff --git a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl index bf0bbd0a3e..fbf0e0ca04 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Amount.tpl @@ -69,7 +69,7 @@ {$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} - + @@ -206,7 +206,7 @@ cj('.crm-contribution-contributionpage-amount-form-block-payment_processor input[type="checkbox"]').each(function(){ if(cj(this).attr('checked')) { var id = cj(this).attr('id').split('_')[2]; - ids.push(id); + ids.push(id); } }); return ids; @@ -239,7 +239,7 @@ cj('#is_pay_later').click( function() { payLater('is_pay_later'); }); - + function minMax(chkbox) { if (chkbox.checked) { @@ -321,7 +321,7 @@ cj( '#recurringContribution' ).hide( ); } } - + {/literal} {if $form.is_recur} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl b/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl index 9b15b562fe..2907b2e851 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Delete.tpl @@ -30,7 +30,7 @@ {ts 1=$title}You cannot delete this Contribution Page because it has already been used to submit a contribution or membership payment. It is recommended that your disable the page instead of deleting it, to preserve the integrity of your contribution records. If you do want to completely delete this contribution page, you first need to search for and delete all of the contribution transactions associated with this page in CiviContribute.{/ts} {else} WARNING: Are you sure you want to Delete the selected Contribution Page? A Delete operation cannot be undone. Do you want to continue? - {/if} + {/if}
{include file="CRM/common/formButtons.tpl"} diff --git a/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp b/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp index 7b7d2943b4..c737c54f2f 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/PCP.hlp @@ -50,7 +50,7 @@ {htxt id="id-notify"}

{ts}Notification will be sent to this email address whenever a Personal Campaign Page linked to this contribution page is either created or updated. The notification will include links to view the campaign page as well as the contact record of the creator of the page.{/ts}

{ts}If you want Administrator of your organization to receive each PCP Notification receipt, enter one or more email addresses here. Multiple email addresses should be separated by a comma (e.g. jane@example.org, paula@example.org) First Email will be sent to PCP user for support.{/ts}

-{/htxt} +{/htxt} {htxt id="id-supporter_profile-title"} {ts}Supporter Profile{/ts} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl index a801e1502b..be57daafea 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl @@ -38,7 +38,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}
{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}
+ {$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"} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp index e032a051fd..5f82983753 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp @@ -27,7 +27,7 @@ {ts}Contribution Page Configuration{/ts} {/htxt} {htxt id="id-configure-contrib-pages"} - +
diff --git a/templates/CRM/Contribute/Form/ManagePremiums.tpl b/templates/CRM/Contribute/Form/ManagePremiums.tpl index 3bec236b28..ae152c37ba 100644 --- a/templates/CRM/Contribute/Form/ManagePremiums.tpl +++ b/templates/CRM/Contribute/Form/ManagePremiums.tpl @@ -104,7 +104,7 @@ {ts 1=$ftUrl}There are no financial types configured with linked 'Cost of Sales Premiums' and 'Premiums Inventory Account' accounts. If you want to generate accounting transactions which track the cost of premiums used click here to configure financial types and accounts.{/ts} {else} {$form.financial_type_id.html}
- {ts}Select a financial type that is linked to both a 'Cost of Sales Premiums Account' and a 'Premiums Inventory Account' if you want to generate accounting transactions to track the cost of premiums used.{/ts} + {ts}Select a financial type that is linked to both a 'Cost of Sales Premiums Account' and a 'Premiums Inventory Account' if you want to generate accounting transactions to track the cost of premiums used.{/ts} {/if} diff --git a/templates/CRM/Contribute/Page/ContributionType.tpl b/templates/CRM/Contribute/Page/ContributionType.tpl index f9fc6ad6ed..5d8e3dd46c 100644 --- a/templates/CRM/Contribute/Page/ContributionType.tpl +++ b/templates/CRM/Contribute/Page/ContributionType.tpl @@ -63,7 +63,7 @@ {if $action ne 1 and $action ne 2}
-
{ts}Add Financial Type{/ts} +
{ts}Add Financial Type{/ts}
{/if} diff --git a/templates/CRM/Contribute/Page/ManagePremiums.tpl b/templates/CRM/Contribute/Page/ManagePremiums.tpl index 2bee35b1d1..cea53109aa 100644 --- a/templates/CRM/Contribute/Page/ManagePremiums.tpl +++ b/templates/CRM/Contribute/Page/ManagePremiums.tpl @@ -50,7 +50,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/templates/CRM/Contribute/Page/Premium.tpl b/templates/CRM/Contribute/Page/Premium.tpl index 4a7e664e66..539d443091 100644 --- a/templates/CRM/Contribute/Page/Premium.tpl +++ b/templates/CRM/Contribute/Page/Premium.tpl @@ -37,7 +37,7 @@ - + @@ -47,7 +47,7 @@ - +
» {ts}Title and Settings{/ts} {ts}Use this form to edit the page title, financial type (e.g. donation, campaign contribution, etc.), goal amount, introduction, and status (active/inactive) for this online contribution page.{/ts}
{ts}Name{/ts} {ts}SKU{/ts} {ts}Market Value{/ts}{ts}Financial Type{/ts}{ts}Financial Type{/ts} {ts}Min Contribution{/ts} {ts}Active?{/ts} {$row.name} {$row.sku} {$row.price }{$row.financial_type_id}{$row.financial_type_id} {$row.min_contribution} {if $row.is_active eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} {$row.action|replace:'xx':$row.id}{ts}SKU{/ts} {ts}Market Value{/ts} {ts}Min Contribution{/ts}{ts}Financial Type{/ts}{ts}Financial Type{/ts} {ts}Weight{/ts}
{$row.sku} {$row.price } {$row.min_contribution}{$row.financial_type_id}{$row.financial_type_id} {$row.weight} {$row.action}