Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix html template structure with classes, divs & tags #11796

Merged
merged 2 commits into from
Mar 13, 2018
Merged

Fix html template structure with classes, divs & tags #11796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
878813b
Fix template structure
mukeshcompucorp Mar 10, 2018
2f00bb9
Call labels from logic instead of static
mukeshcompucorp Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CRM/Grant/BAO/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,22 +320,22 @@ public static function buildSearchForm(&$form) {
$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);

Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Grant/Form/Grant.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions templates/CRM/Grant/Form/Search/Common.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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}
Expand Down
12 changes: 7 additions & 5 deletions templates/CRM/Grant/Form/Task/Delete.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
55 changes: 30 additions & 25 deletions templates/CRM/Profile/Page/Overlay.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}