From 472eb698fcafe03b4b6657df8fa83d9e47b5e090 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 13 May 2013 14:27:01 +1200 Subject: [PATCH] CRM-12595 fix formatting in templates files (G) --- templates/CRM/Grant/Form/Grant.tpl | 108 ++++++++++++------------- templates/CRM/Grant/Form/GrantView.tpl | 16 ++-- templates/CRM/Grant/Form/Search.tpl | 20 ++--- templates/CRM/Grant/Form/Selector.tpl | 18 ++--- 4 files changed, 81 insertions(+), 81 deletions(-) diff --git a/templates/CRM/Grant/Form/Grant.tpl b/templates/CRM/Grant/Form/Grant.tpl index 0f718eaff6..5257139e7d 100644 --- a/templates/CRM/Grant/Form/Grant.tpl +++ b/templates/CRM/Grant/Form/Grant.tpl @@ -38,83 +38,83 @@ {/if}
- {if $action eq 8} + {if $action eq 8}

  {ts}Are you sure you want to delete this Grant?{/ts} {ts}This operation cannot be undone.{/ts}

{include file="CRM/Grant/Form/Task.tpl"}

{else} -
{include file="CRM/common/formButtons.tpl" location="top"}
- - {if $context eq 'standalone'} +
{include file="CRM/common/formButtons.tpl" location="top"}
+
+ {if $context eq 'standalone'} {include file="CRM/Contact/Form/NewContact.tpl"} {/if} - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - + + - - - + + - - - - - - - - - - - - - -
{$form.status_id.label}{$form.status_id.html}
{$form.grant_type_id.label}{$form.grant_type_id.html}
{$form.amount_total.label}{$form.amount_total.html}
{$form.amount_requested.label}{$form.amount_requested.html}
{ts}Amount requested for grant in original currency (if different).{/ts}
{$form.amount_granted.label}{$form.amount_granted.html}
{$form.application_received_date.label}{if $hideCalendar neq true} +
{$form.status_id.label}{$form.status_id.html}
{$form.grant_type_id.label}{$form.grant_type_id.html}
{$form.amount_total.label}{$form.amount_total.html}
{$form.amount_requested.label}{$form.amount_requested.html}
{ts}Amount requested for grant in original currency (if different).{/ts}
{$form.amount_granted.label}{$form.amount_granted.html}
{$form.application_received_date.label}{if $hideCalendar neq true} {include file="CRM/common/jcalendar.tpl" elementName=application_received_date} {else} {$form.application_received_date.html|crmDate} {/if}
{$form.decision_date.label}{if $hideCalendar neq true} +
{$form.decision_date.label}{if $hideCalendar neq true} {include file="CRM/common/jcalendar.tpl" elementName=decision_date} {else} {$form.decision_date.html|crmDate} {/if}
{ts}Date on which the grant decision was finalized.{/ts}
{$form.money_transfer_date.label}{if $hideCalendar neq true} +
{$form.money_transfer_date.label}{if $hideCalendar neq true} {include file="CRM/common/jcalendar.tpl" elementName=money_transfer_date} {else} {$form.money_transfer_date.html|crmDate} {/if}
{ts}Date on which the grant money was transferred.{/ts}
{$form.grant_due_date.label}{if $hideCalendar neq true} +
{$form.grant_due_date.label}{if $hideCalendar neq true} {include file="CRM/common/jcalendar.tpl" elementName=grant_due_date} {else} {$form.grant_due_date.html|crmDate} {/if}
{$form.grant_report_received.label}{$form.grant_report_received.html}
{$form.rationale.label}{$form.rationale.html}
{$form.note.label}{$form.note.html}
- + + + {$form.grant_report_received.label} + {$form.grant_report_received.html} + + + {$form.rationale.label} + {$form.rationale.html} + + + {$form.note.label} + {$form.note.html} + + +
{*include custom data js file*} {include file="CRM/common/customData.tpl"} @@ -131,7 +131,7 @@ }); cj(function() { - cj().crmAccordions(); + cj().crmAccordions(); }); {/literal} @@ -144,4 +144,4 @@
{include file="CRM/common/formButtons.tpl" location="bottom"}
-{/if} {* closing of main custom data if *} +{/if} {* closing of main custom data if *} diff --git a/templates/CRM/Grant/Form/GrantView.tpl b/templates/CRM/Grant/Form/GrantView.tpl index d451b81f6c..6d2892c19c 100644 --- a/templates/CRM/Grant/Form/GrantView.tpl +++ b/templates/CRM/Grant/Form/GrantView.tpl @@ -35,7 +35,7 @@
{ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviGrant')} - {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context"} + {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context&key=$searchKey"} {/if} @@ -66,16 +66,16 @@
{if call_user_func(array('CRM_Core_Permission','check'), 'edit grants')} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=update&context=$context"} - {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} - {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=update&context=$context&key=$searchKey"} - {/if} + {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} + {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=update&context=$context&key=$searchKey"} + {/if}
{ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviGrant')} - {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context"} - {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} - {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context&key=$searchKey"} - {/if} + {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context"} + {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} + {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context&key=$searchKey"} + {/if}
{ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} diff --git a/templates/CRM/Grant/Form/Search.tpl b/templates/CRM/Grant/Form/Search.tpl index 4a7db7dcb5..b20065cac0 100644 --- a/templates/CRM/Grant/Form/Search.tpl +++ b/templates/CRM/Grant/Form/Search.tpl @@ -25,12 +25,12 @@ *}
-
-
- {ts}Edit Search Criteria{/ts} -
-
- {strip} +
+
+ {ts}Edit Search Criteria{/ts} +
+
+ {strip}
{ts}Use this form to find Grant(s) by Contact name, Grant Status, Grant Type, Total Amount , etc .{/ts}
@@ -38,7 +38,7 @@ {$form.sort_name.label}  {$form.sort_name.html|crmReplace:class:'twenty'}   {$form.buttons.html}
- + {include file="CRM/Grant/Form/Search/Common.tpl"} @@ -57,8 +57,8 @@ {/if} {if $rows} - {* Search request has returned 1 or more matching rows. Display results and collapse the search criteria fieldset. *} -
+ {* 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/common/searchResultTasks.tpl"} @@ -73,7 +73,7 @@ {literal} {/literal} diff --git a/templates/CRM/Grant/Form/Selector.tpl b/templates/CRM/Grant/Form/Selector.tpl index 7f43a6ce91..5b5592aa40 100644 --- a/templates/CRM/Grant/Form/Selector.tpl +++ b/templates/CRM/Grant/Form/Selector.tpl @@ -32,7 +32,7 @@ {if ! $single and $context eq 'Search' } - {$form.toggleSelect.html} + {$form.toggleSelect.html} {/if} {foreach from=$columnHeaders item=header} @@ -48,16 +48,16 @@ {counter start=0 skip=1 print=false} - {foreach from=$rows item=row} + {foreach from=$rows item=row} - {if !$single } - {if $context eq 'Search' } + {if !$single } + {if $context eq 'Search' } {assign var=cbName value=$row.checkbox} - {$form.$cbName.html} - {/if} - {$row.contact_type} - {$row.sort_name} + {$form.$cbName.html} + {/if} + {$row.contact_type} + {$row.sort_name} {/if} {$row.grant_status} {$row.grant_type} @@ -81,7 +81,7 @@ {if $context EQ 'Search'} {/if} -- 2.25.1