From a48d1d9c710f9bcd1de2380dd2e0c19757b27441 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 13 May 2013 14:26:52 +1200 Subject: [PATCH] CRM-12595 fix formatting in templates files (F) --- templates/CRM/Financial/ExportFormat/IIF.tpl | 2 +- .../CRM/Financial/Form/BatchTransaction.tpl | 6 +- .../CRM/Financial/Form/FinancialBatch.tpl | 6 +- .../CRM/Financial/Form/FinancialType.tpl | 42 ++--- .../Financial/Form/FinancialTypeAccount.tpl | 164 +++++++++--------- .../CRM/Financial/Page/BatchTransaction.tpl | 4 +- 6 files changed, 112 insertions(+), 112 deletions(-) diff --git a/templates/CRM/Financial/ExportFormat/IIF.tpl b/templates/CRM/Financial/ExportFormat/IIF.tpl index 1ca972a0af..9c28635e29 100644 --- a/templates/CRM/Financial/ExportFormat/IIF.tpl +++ b/templates/CRM/Financial/ExportFormat/IIF.tpl @@ -39,7 +39,7 @@ character. And watch out for editors that add spaces/tabs at the end of lines. {assign var='tabchar' value=9|chr} {if !empty($accounts)} !ACCNT{$tabchar}NAME{$tabchar}REFNUM{$tabchar}TIMESTAMP{$tabchar}ACCNTTYPE{$tabchar}OBAMOUNT{$tabchar}DESC{$tabchar}ACCNUM -{* I don't think we need these fields - SCD BANKNUM EXTRA HIDDEN DELCOUNT USEID WKPAPERREF +{* I don't think we need these fields - SCD BANKNUM EXTRA HIDDEN DELCOUNT USEID WKPAPERREF *} {foreach from=$accounts key=account_id item=acct} diff --git a/templates/CRM/Financial/Form/BatchTransaction.tpl b/templates/CRM/Financial/Form/BatchTransaction.tpl index c9638ddd62..8be7dd060f 100644 --- a/templates/CRM/Financial/Form/BatchTransaction.tpl +++ b/templates/CRM/Financial/Form/BatchTransaction.tpl @@ -96,10 +96,10 @@ {ts}Name{/ts} {ts}Amount{/ts} - {ts}Trxn ID{/ts} + {ts}Trxn ID{/ts} {ts}Received{/ts} {ts}Pay Method{/ts} - {ts}Status{/ts} + {ts}Status{/ts} {ts}Financial Type{/ts} @@ -364,7 +364,7 @@ function bulkAssignRemove( action ) { } else { CRM.alert(data.status); - } + } }, 'json'); } diff --git a/templates/CRM/Financial/Form/FinancialBatch.tpl b/templates/CRM/Financial/Form/FinancialBatch.tpl index 6c254c352a..db78d80b32 100644 --- a/templates/CRM/Financial/Form/FinancialBatch.tpl +++ b/templates/CRM/Financial/Form/FinancialBatch.tpl @@ -52,9 +52,9 @@ {if $action eq 2} - {ts}Created By{/ts} - {$contactName} - + {ts}Created By{/ts} + {$contactName} + {ts}Opened Date{/ts} {$created_date|crmDate} diff --git a/templates/CRM/Financial/Form/FinancialType.tpl b/templates/CRM/Financial/Form/FinancialType.tpl index 5e3cfba567..e85e5f6596 100644 --- a/templates/CRM/Financial/Form/FinancialType.tpl +++ b/templates/CRM/Financial/Form/FinancialType.tpl @@ -28,43 +28,43 @@
{if $action eq 8}
-
+
{ts}WARNING: You cannot delete a financial type if it is currently used by any Contributions, Contribution Pages or Membership Types. Consider disabling this option instead.{/ts} {ts}Deleting a financial type cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
{else}
{include file="CRM/common/formButtons.tpl" location="top"}
- - + + - - - + + + - + - - + + - - - + + + - - - + + + - -
{$form.name.label}{$form.name.html}{$form.name.label}{$form.name.html}
{$form.description.label}{$form.description.html}
{$form.description.label}{$form.description.html}
{$form.is_deductible.label}{$form.is_deductible.html}
- {ts}Are contributions of this type tax-deductible?{/ts} - 		{$form.is_deductible.label}{$form.is_deductible.html}
+ {ts}Are contributions of this type tax-deductible?{/ts} +
{$form.is_active.label}{$form.is_active.html}
{$form.is_active.label}{$form.is_active.html}
{$form.is_reserved.label}{$form.is_reserved.html}
{$form.is_reserved.label}{$form.is_reserved.html}
+ + {/if}
{include file="CRM/common/formButtons.tpl" location="botttom"}
{if $action eq 2 or $action eq 4 } {* Update or View*}
- {ts}View or Edit Financial Accounts{/ts} + {ts}View or Edit Financial Accounts{/ts}
- {/if} + {/if}
diff --git a/templates/CRM/Financial/Form/FinancialTypeAccount.tpl b/templates/CRM/Financial/Form/FinancialTypeAccount.tpl index ec2faa118c..363d5c0fb0 100644 --- a/templates/CRM/Financial/Form/FinancialTypeAccount.tpl +++ b/templates/CRM/Financial/Form/FinancialTypeAccount.tpl @@ -28,24 +28,24 @@
{if $action eq 8}
-
+
{ts}WARNING: You cannot delete a financial type if it is currently used by any Contributions, Contribution Pages or Membership Types. Consider disabling this option instead.{/ts} {ts}Deleting a financial type cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
{else}
{include file="CRM/common/formButtons.tpl" location="top"}
- + - - - - + + + + - - - + + + - -
+ + {/if}
{include file="CRM/common/formButtons.tpl" location="botttom"}
@@ -56,112 +56,112 @@ cj("#financial_account_id").change(function() { {/literal} relationID = "#account_relationship" - financialAccountID = "#financial_account_id" + financialAccountID = "#financial_account_id" callbackURL = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancialRelation'}" {literal} var financialId = cj("#financial_account_id").val(); - var check = cj(relationID).val(); + var check = cj(relationID).val(); if( check == 'select' || financialId == 'select' ){ - callbackURL = callbackURL+"&_value="+financialId; + callbackURL = callbackURL+"&_value="+financialId; cj.ajax({ url: callbackURL, context: document.body, success: function( data, textStatus ){ - cj(relationID).html("");//clear old options - data = eval(data);//get json array + cj(relationID).html("");//clear old options + data = eval(data);//get json array if ( data != null ) { - for (i = 0; i < data.length; i++) { - if( data[i].selected == 'Selected') - var idf = data[i].value; - cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); - } - } - if( idf != null) - cj(relationID).val(idf); - //cj("option:first", relationID).attr( "selected", "selected" );//select first option - - } - }); - if( financialId == 'select' ){ + for (i = 0; i < data.length; i++) { + if( data[i].selected == 'Selected') + var idf = data[i].value; + cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); + } + } + if( idf != null) + cj(relationID).val(idf); + //cj("option:first", relationID).attr( "selected", "selected" );//select first option + + } + }); + if( financialId == 'select' ){ {/literal} - - callbackURLs = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancial'}" + + callbackURLs = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancial'}" {literal} - callbackURLs = callbackURLs+"&_value=select"; - cj.ajax({ + callbackURLs = callbackURLs+"&_value=select"; + cj.ajax({ url: callbackURLs, context: document.body, success: function( data, textStatus ){ - cj(financialAccountID).html("");//clear old options - data = eval(data);//get json array + cj(financialAccountID).html("");//clear old options + data = eval(data);//get json array if ( data != null ) { - for (i = 0; i < data.length; i++) { - cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); - } - } - - } - }); - } - } + for (i = 0; i < data.length; i++) { + cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); + } + } + + } + }); + } + } }); {/literal} {literal} - + cj("#account_relationship").change(function() { {/literal} - relationID = "#account_relationship" - financialAccountID = "#financial_account_id" + relationID = "#account_relationship" + financialAccountID = "#financial_account_id" callbackURLs = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancial'}" {literal} - var financialId = cj("#account_relationship").val(); - var check = cj(financialAccountID).val(); + var financialId = cj("#account_relationship").val(); + var check = cj(financialAccountID).val(); if( check == 'select' || financialId == 'select' ){ - callbackURLs = callbackURLs+"&_value="+financialId; + callbackURLs = callbackURLs+"&_value="+financialId; cj.ajax({ url: callbackURLs, context: document.body, success: function( data, textStatus ){ - cj(financialAccountID).html("");//clear old options - data = eval(data);//get json array + cj(financialAccountID).html("");//clear old options + data = eval(data);//get json array if ( data != null ) { - for (i = 0; i < data.length; i++) { - cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); - } - } - - } - }); - - if( financialId == 'select' ){ + for (i = 0; i < data.length; i++) { + cj(financialAccountID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); + } + } + + } + }); + + if( financialId == 'select' ){ {/literal} - callbackURL = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancialRelation'}" -{literal} - callbackURL = callbackURL+"&_value=select"; - cj.ajax({ + callbackURL = "{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Financial_Page_AJAX&fnName=jqFinancialRelation'}" +{literal} + callbackURL = callbackURL+"&_value=select"; + cj.ajax({ url: callbackURL, context: document.body, success: function( data, textStatus ){ - cj(relationID).html("");//clear old options - data = eval(data);//get json array + cj(relationID).html("");//clear old options + data = eval(data);//get json array if ( data != null ) { - for (i = 0; i < data.length; i++) { - if( data[i].selected == 'Selected') - var idf = data[i].value; - cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); - } - } - if( idf != null) - cj(relationID).val(idf); - //cj("option:first", relationID).attr( "selected", "selected" );//select first option - - } - }); - } - - } + for (i = 0; i < data.length; i++) { + if( data[i].selected == 'Selected') + var idf = data[i].value; + cj(relationID).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null); + } + } + if( idf != null) + cj(relationID).val(idf); + //cj("option:first", relationID).attr( "selected", "selected" );//select first option + + } + }); + } + + } }); {/literal} \ No newline at end of file diff --git a/templates/CRM/Financial/Page/BatchTransaction.tpl b/templates/CRM/Financial/Page/BatchTransaction.tpl index 4812c6aaa3..118ad9c1d6 100644 --- a/templates/CRM/Financial/Page/BatchTransaction.tpl +++ b/templates/CRM/Financial/Page/BatchTransaction.tpl @@ -59,10 +59,10 @@ {ts}Name{/ts} {ts}Amount{/ts} - {ts}Trxn ID{/ts} + {ts}Trxn ID{/ts} {ts}Received{/ts} {ts}Pay Method{/ts} - {ts}Status{/ts} + {ts}Status{/ts} {ts}Type{/ts} -- 2.25.1