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 template structure issues #11839

Merged
merged 3 commits into from
Mar 20, 2018
Merged

Fix template structure issues #11839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e06c650
Fix template structures
mukeshcompucorp Mar 19, 2018
fe4dade
Move help section outside of block
mukeshcompucorp Mar 19, 2018
94d4ec0
Fix table for Contribute
mukeshcompucorp Mar 20, 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/Activity/Selector/Selector.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
<td class="crm-contact-form-block-activity_type_exclude_filter_id crm-inline-edit-field">
{$form.activity_type_exclude_filter_id.label}<br /> {$form.activity_type_exclude_filter_id.html|crmAddClass:medium}
</td>
{include file="CRM/Core/DateRange.tpl" fieldName="activity_date" from='_low' to='_high' label='Date'}
{include file="CRM/Core/DateRange.tpl" fieldName="activity_date" from='_low' to='_high' label='<label>Date</label>'}
<td class="crm-contact-form-block-activity_status_filter_id crm-inline-edit-field">
{ts}Status{/ts}<br /> {$form.status_id.html|crmAddClass:medium}
<label>{ts}Status{/ts}</label><br /> {$form.status_id.html|crmAddClass:medium}
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<td>
{if $groupElementType eq 'select'}
<div class="crm-section group-section">
{if $title}{$form.group.label}{/if}
{if $title}{$form.group.label}<br>{/if}
{$form.group.html}
</div>
{else}
Expand Down
3 changes: 2 additions & 1 deletion templates/CRM/Contribute/Form/ContributionPage/Settings.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
+--------------------------------------------------------------------+
*}
{crmRegion name="contribute-form-contributionpage-settings-main"}
<div class="crm-block crm-form-block crm-contribution-contributionpage-settings-form-block">
<div class="help">
{if $action eq 0}
<p>{ts}This is the first step in creating a new online Contribution Page. You can create one or more different Contribution Pages for different purposes, audiences, campaigns, etc. Each page can have it's own introductory message, pre-configured contribution amounts, custom data collection fields, etc.{/ts}</p>
Expand All @@ -34,6 +33,8 @@
{ts}Use this form to edit the page title, financial type (e.g. donation, campaign contribution, etc.), goal amount, introduction, and status (active/inactive) for this online contribution page.{/ts}
{/if}
</div>
<div class="crm-block crm-form-block crm-contribution-contributionpage-settings-form-block">

<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-contribution-contributionpage-settings-form-block-title"><td class="label">{$form.title.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contribution_page' field='title' id=$contributionPageID}{/if}</td><td>{$form.title.html}<br/>
Expand Down
6 changes: 5 additions & 1 deletion templates/CRM/Contribute/Form/Selector.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
{if !$single and $context eq 'Search' }
<th scope="col" title="Select Rows">{$form.toggleSelect.html}</th>
{/if}
{if !$single}
<th scope="col"></th>
{/if}
{foreach from=$columnHeaders item=header}
<th scope="col">
{if $header.sort}
Expand All @@ -56,7 +59,8 @@
{assign var=cbName value=$row.checkbox}
<td>{$form.$cbName.html}</td>
{/if}
<td>{$row.contact_type} &nbsp; <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.contact_id`"}">{$row.sort_name}</a></td>
<td>{$row.contact_type}</td>
<td><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.contact_id`"}">{$row.sort_name}</a></td>
{/if}
<td class="crm-contribution-amount">
{if !$row.contribution_soft_credit_amount}
Expand Down