Merge branch 'CRM-14696-v2' of https://github.com/JKingsnorth/civicrm-core into CRM...

[civicrm-core.git] / templates / CRM / Grant / Form / Grant.tpl

diff --git a/templates/CRM/Grant/Form/Grant.tpl b/templates/CRM/Grant/Form/Grant.tpl
index a2e00235a0528cfd581470bc748ac0c5f9b8b972..c787fac3db2ace008eb654eeaae175638a2129d9 100644 (file)
--- a/templates/CRM/Grant/Form/Grant.tpl
+++ b/templates/CRM/Grant/Form/Grant.tpl
@@ -29,19 +29,11 @@
   {include file="CRM/Custom/Form/CustomData.tpl"}
 {else}
 
-{if $action eq 1 and $context ne 'standalone'}
-   <h3>{ts}New Grant{/ts}</h3>
-{elseif $action eq 2}
-   <h3>{ts}Edit Grant{/ts}</h3>
-{elseif $action eq 8}
-   <h3>{ts}Delete Grant{/ts}</h3>
-{/if}
-
 <div class="crm-block crm-form-block crm-grant-form-block">
   {if $action eq 8}
      <div class="messages status">
          <p><div class="icon inform-icon"></div>&nbsp;
-         {ts}Are you sure you want to delete this Grant?{/ts} {ts}This operation cannot be undone.{/ts}</p>
+         {ts}Are you sure you want to delete this Grant?{/ts} {ts}This action cannot be undone.{/ts}</p>
          <p>{include file="CRM/Grant/Form/Task.tpl"}</p>
      </div>
   {else}
@@ -78,7 +70,7 @@
          <td>{if $hideCalendar neq true}
                       {include file="CRM/common/jcalendar.tpl" elementName=application_received_date}
                    {else}
-                      {$form.application_received_date.html|crmDate}
+                      {$form.application_received_date.value|crmDate}
                    {/if}</td>
       </tr>
       <tr class="crm-grant-form-block-decision_date">
@@ -86,7 +78,7 @@
          <td>{if $hideCalendar neq true}
                       {include file="CRM/common/jcalendar.tpl" elementName=decision_date}
                    {else}
-                      {$form.decision_date.html|crmDate}
+                      {$form.decision_date.value|crmDate}
                    {/if}<br />
                    <span class="description">{ts}Date on which the grant decision was finalized.{/ts}</span></td>
       </tr>
@@ -94,14 +86,14 @@
         <td>{if $hideCalendar neq true}
                        {include file="CRM/common/jcalendar.tpl" elementName=money_transfer_date}
                     {else}
-                       {$form.money_transfer_date.html|crmDate}
+                       {$form.money_transfer_date.value|crmDate}
                     {/if}<br /><span class="description">{ts}Date on which the grant money was transferred.{/ts}</span></td>
       </tr>
       <tr class="crm-grant-form-block-grant_due_date"><td class="label">{$form.grant_due_date.label}</td>
     <td>{if $hideCalendar neq true}
                        {include file="CRM/common/jcalendar.tpl" elementName=grant_due_date}
                     {else}
-                       {$form.grant_due_date.html|crmDate}
+                       {$form.grant_due_date.value|crmDate}
                     {/if}</td>
       </tr>
       <tr class="crm-grant-form-block-grant_report_received">