Unverified Commit b4c2cdd6 authored by colemanw's avatar colemanw Committed by GitHub

Merge pull request #11796 from mukeshcompucorp/fix-template-structure-issues

Fix html template structure with classes, divs & tags
parents ed477ea0 2f00bb9c
......@@ -320,22 +320,22 @@ class CRM_Grant_BAO_Query extends CRM_Core_BAO_Query {
$form->addDate('grant_application_received_date_low', ts('App. Received Date - From'), FALSE, array('formatType' => 'searchDate'));
$form->addDate('grant_application_received_date_high', ts('To'), FALSE, array('formatType' => 'searchDate'));
$form->addElement('checkbox', 'grant_application_received_notset', '', NULL);
$form->addElement('checkbox', 'grant_application_received_notset', ts('Date is not set'), NULL);
$form->addDate('grant_money_transfer_date_low', ts('Money Sent Date - From'), FALSE, array('formatType' => 'searchDate'));
$form->addDate('grant_money_transfer_date_high', ts('To'), FALSE, array('formatType' => 'searchDate'));
$form->addElement('checkbox', 'grant_money_transfer_date_notset', '', NULL);
$form->addElement('checkbox', 'grant_money_transfer_date_notset', ts('Date is not set'), NULL);
$form->addDate('grant_due_date_low', ts('Report Due Date - From'), FALSE, array('formatType' => 'searchDate'));
$form->addDate('grant_due_date_high', ts('To'), FALSE, array('formatType' => 'searchDate'));
$form->addElement('checkbox', 'grant_due_date_notset', '', NULL);
$form->addElement('checkbox', 'grant_due_date_notset', ts('Date is not set'), NULL);
$form->addDate('grant_decision_date_low', ts('Grant Decision Date - From'), FALSE, array('formatType' => 'searchDate'));
$form->addDate('grant_decision_date_high', ts('To'), FALSE, array('formatType' => 'searchDate'));
$form->addElement('checkbox', 'grant_decision_date_notset', '', NULL);
$form->addElement('checkbox', 'grant_decision_date_notset', ts('Date is not set'), NULL);
$form->addYesNo('grant_report_received', ts('Grant report received?'), TRUE);
......
......@@ -34,7 +34,7 @@
</div>
{else}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<table class="form-layout-compressed">
{if $context eq 'standalone'}
<tr class="crm-grant-form-block-contact_id">
<td class="label">{$form.contact_id.label}</td>
......
......@@ -55,7 +55,7 @@
<td colspan="2">
{$form.grant_application_received_date_high.label}<br />
{include file="CRM/common/jcalendar.tpl" elementName=grant_application_received_date_high}
&nbsp;{$form.grant_application_received_notset.html}&nbsp;&nbsp;{ts}Date is not set{/ts}
&nbsp;{$form.grant_application_received_notset.html}&nbsp;&nbsp;{$form.grant_application_received_notset.label}
</td>
</tr>
<tr>
......@@ -66,7 +66,7 @@
<td colspan="2">
{$form.grant_decision_date_high.label}<br />
{include file="CRM/common/jcalendar.tpl" elementName=grant_decision_date_high}
&nbsp;{$form.grant_decision_date_notset.html}&nbsp;&nbsp;{ts}Date is not set{/ts}
&nbsp;{$form.grant_decision_date_notset.html}&nbsp;&nbsp;{$form.grant_decision_date_notset.label}
</td>
</tr>
<tr>
......@@ -77,7 +77,7 @@
<td colspan="2">
{$form.grant_money_transfer_date_high.label}<br />
{include file="CRM/common/jcalendar.tpl" elementName=grant_money_transfer_date_high}
&nbsp;{$form.grant_money_transfer_date_notset.html}&nbsp;&nbsp;{ts}Date is not set{/ts}
&nbsp;{$form.grant_money_transfer_date_notset.html}&nbsp;&nbsp;{$form.grant_money_transfer_date_notset.label}
</td>
</tr>
<tr>
......@@ -88,7 +88,7 @@
<td colspan="2">
{$form.grant_due_date_high.label}<br />
{include file="CRM/common/jcalendar.tpl" elementName=grant_due_date_high}
&nbsp;{$form.grant_due_date_notset.html}&nbsp;&nbsp;{ts}Date is not set{/ts}
&nbsp;{$form.grant_due_date_notset.html}&nbsp;&nbsp;{$form.grant_due_date_notset.label}
</td>
</tr>
{if $grantGroupTree}
......
......@@ -24,9 +24,11 @@
+--------------------------------------------------------------------+
*}
{* Confirmation of Grant delete *}
<div class="messages status no-popup">
<p><div class="icon inform-icon"></div>&nbsp;
{ts}Are you sure you want to delete the selected Grants? This delete operation cannot be undone and will delete all transactions associated with these grants.{/ts}</p>
<p>{include file="CRM/Grant/Form/Task.tpl"}</p>
<div class="crm-block crm-form-block crm-grant-task-delete-form-block">
<div class="messages status no-popup">
<div class="icon inform-icon"></div>&nbsp;
{ts}Are you sure you want to delete the selected Grants? This delete operation cannot be undone and will delete all transactions associated with these grants.{/ts}
<p>{include file="CRM/Grant/Form/Task.tpl"}</p>
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
......@@ -25,31 +25,36 @@
*}
{if $overlayProfile }
<table class="crm-table-group-summary">
<tr><td>{$displayName}</td></tr>
<tr><td>
{assign var="count" value="0"}
{assign var="totalRows" value=$row|@count}
<div class="crm-summary-col-0">
{foreach from=$profileFields item=field key=rowName}
{if $count gt $totalRows/2}
</div>
</td><td>
<div class="crm-summary-col-1">
{assign var="count" value="1"}
{/if}
<div class="crm-section {$rowName}-section">
<div class="label">
{$field.label}
</div>
<div class="content">
{$field.value}
</div>
<div class="clear"></div>
</div>
{assign var="count" value=`$count+1`}
{/foreach}
</div>
</td></tr>
<tr>
<td colspan="2">{$displayName}</td>
</tr>
<tr>
<td>
{assign var="count" value="0"}
{assign var="totalRows" value=$row|@count}
<div class="crm-summary-col-0">
{foreach from=$profileFields item=field key=rowName}
{if $count gt $totalRows/2}
</div>
</td>
<td>
<div class="crm-summary-col-1">
{assign var="count" value="1"}
{/if}
<div class="crm-section {$rowName}-section">
<div class="label">
{$field.label}
</div>
<div class="content">
{$field.value}
</div>
<div class="clear"></div>
</div>
{assign var="count" value=`$count+1`}
{/foreach}
</div>
</td>
</tr>
</table>
{* fields array is not empty *}
{/if}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment