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

Fix style glitches #11792

Merged
merged 4 commits into from
Mar 9, 2018
Merged

Fix style glitches #11792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbf0be9
Fix style glitches
mukeshcompucorp Mar 9, 2018
bfd0255
Add appropriate labels
mukeshcompucorp Mar 9, 2018
ce14eb4
Make pledge labels proper
mukeshcompucorp Mar 9, 2018
f850beb
Fix classes and tags
mukeshcompucorp Mar 9, 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
4 changes: 2 additions & 2 deletions templates/CRM/Batch/Form/Entry.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
<div class="status message status-warning">
<i class="crm-i fa-exclamation-triangle"></i> {ts}Total for amounts entered below does not match the expected batch total.{/ts}
</div>
<div class="crm-button crm-button_qf_Entry_upload_force-save">
<span class="crm-button crm-button_qf_Entry_upload_force-save">
{$form._qf_Entry_upload_force.html}
</div>
</span>
<div class="clear"></div>
{/if}
<table class="form-layout-compressed batch-totals">
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Batch/Form/Search.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</tr>
</table>
</div>
<div class="crm-submit-buttons">
<div class="action-link">
{crmButton accesskey="N" p="civicrm/batch/add" q="reset=1&action=add" id="newBatch" icon="crm-i fa-plus-circle"}{ts}New Data Entry Batch{/ts}{/crmButton}<br/>
</div>
<table class="crm-batch-selector">
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/Event/Form/ManageEvent/Location.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@
</tr>
<tr>
<td><label>{ts}Phone 1:{/ts}</label></td>
<td>{$form.phone.1.phone.html|crmAddClass:phone}&nbsp;x{$form.phone.1.phone_ext.html|crmAddClass:four}&nbsp;{$form.phone.1.phone_type_id.html}</td>
<td>{$form.phone.1.phone.html|crmAddClass:phone}&nbsp;x&nbsp;{$form.phone.1.phone_ext.html|crmAddClass:four}&nbsp;{$form.phone.1.phone_type_id.html}</td>
</tr>
<tr>
<td><label>{ts}Phone 2:{/ts}</label></td>
<td>{$form.phone.2.phone.html|crmAddClass:phone}&nbsp;x{$form.phone.2.phone_ext.html|crmAddClass:four}&nbsp;{$form.phone.2.phone_type_id.html}</td>
<td>{$form.phone.2.phone.html|crmAddClass:phone}&nbsp;x&nbsp;{$form.phone.2.phone_ext.html|crmAddClass:four}&nbsp;{$form.phone.2.phone_type_id.html}</td>
</tr>
</table>

Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Financial/Form/Search.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

{* Financial search component. *}
<div id="enableDisableStatusMsg" class="crm-container" style="display:none"></div>
<div class="crm-submit-buttons">
<div class="action-link">
<a accesskey="N" href="{crmURL p='civicrm/financial/batch' q="reset=1&action=add&context=$batchStatus"}" id="newBatch" class="button"><span><i class="crm-i fa-plus-circle"></i> {ts}New Accounting Batch{/ts}</span></a>
</div>
<div class="crm-form-block crm-search-form-block">
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/Pledge/Form/Pledge.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
{/if}
{if $create_date}
<tr class="crm-pledge-form-block-create_date">
<td class="label">{ts}Pledge Made{/ts}</td>
<td class="label"><label>{ts}Pledge Made{/ts}</label></td>
<td class="view-value">{$create_date|truncate:10:''|crmDate}
{/if}<br />
<span class="description">{ts}Date when pledge was made by the contributor.{/ts}</span>
Expand All @@ -108,7 +108,7 @@
{/if}
{if $start_date}
<tr class="crm-pledge-form-block-start_date">
<td class="label">{ts}Payments Start{/ts}</td>
<td class="label"><label>{ts}Payments Start{/ts}</label></td>
<td class="view-value">{$start_date|truncate:10:''|crmDate}
{/if}
<br />
Expand Down
25 changes: 7 additions & 18 deletions templates/CRM/Pledge/Form/Search/Common.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@
*}

<tr>
<td><label>{ts}Payment Scheduled{/ts}</label></td>
</tr>
<tr>
{include file="CRM/Core/DateRange.tpl" fieldName="pledge_payment_date" from='_low' to='_high'}
{include file="CRM/Core/DateRange.tpl" fieldName="pledge_payment_date" from='_low' to='_high' label="<label>Payment Scheduled</label>"}
</tr>
<tr>
<td colspan="2">
Expand All @@ -48,22 +45,13 @@
</td>
</tr>
<tr>
<td><label>{ts}Pledge Made{/ts}</label></td>
</tr>
<tr>
{include file="CRM/Core/DateRange.tpl" fieldName="pledge_create_date" from='_low' to='_high'}
</tr>
<tr>
<td><label>{ts}Payments Start Date{/ts}</label></td>
</tr>
<tr>
{include file="CRM/Core/DateRange.tpl" fieldName="pledge_start_date" from='_low' to='_high'}
{include file="CRM/Core/DateRange.tpl" fieldName="pledge_create_date" from='_low' to='_high' label="<label>Pledge Made</label>"}
</tr>
<tr>
<td><label>{ts}Payments Ended Date{/ts}</label></td>
{include file="CRM/Core/DateRange.tpl" fieldName="pledge_start_date" from='_low' to='_high' label="<label>Payments Start Date</label>"}
</tr>
<tr>
{include file="CRM/Core/DateRange.tpl" fieldName="pledge_end_date" from='_low' to='_high'}
{include file="CRM/Core/DateRange.tpl" fieldName="pledge_end_date" from='_low' to='_high' label="<label>Payments Ended Date</label>"}
</tr>
<tr>
<td>
Expand All @@ -90,15 +78,16 @@
</tr>
<tr>
<td colspan="2">
{ts}Number of Installments{/ts}
<label>{ts}Number of Installments{/ts}</label>
<br />
{$form.pledge_installments_low.label} {$form.pledge_installments_low.html}
&nbsp;&nbsp; {$form.pledge_installments_high.label} {$form.pledge_installments_high.html}
</td>
</tr>

<tr>
<td colspan="2">
<br /> {$form.pledge_acknowledge_date_is_not_null.label} &nbsp; {$form.pledge_acknowledge_date_is_not_null.html}
{$form.pledge_acknowledge_date_is_not_null.label} &nbsp; {$form.pledge_acknowledge_date_is_not_null.html}
&nbsp;
</td>
</tr>
Expand Down