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

CRM-21518: Added missing containers to template #11369

Merged
merged 3 commits into from
Dec 6, 2017
Merged

CRM-21518: Added missing containers to template #11369

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a517510
NDI-30: Added missing containers to template
mukeshcompucorp Dec 5, 2017
e52d8c1
NDI-30: Added more templates to repair structure
mukeshcompucorp Dec 5, 2017
71d7100
CRM-21518: Fixed spacing
mukeshcompucorp Dec 6, 2017
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
5 changes: 4 additions & 1 deletion templates/CRM/Admin/Page/ContactType.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
<div class="help">
{ts}CiviCRM comes with 3 basic (built-in) contact types: Individual, Household, and Organization. You can create additional contact types based on these types to further differentiate contacts (for example you might create Student, Parent, Staff, and /or Volunteer types from the basic Individual type...).{/ts} {help id="id-contactSubtype-intro"}
</div>

<div class="crm-content-block crm-block">
{if $rows}
<div>
<div>
{strip}
{* handle enable/disable actions*}
{include file="CRM/common/enableDisableApi.tpl"}
Expand Down Expand Up @@ -66,4 +68,5 @@
{crmButton q="action=add&reset=1" icon="plus-circle"}{ts}Add Contact Type{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
</div>
{/if}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks to me like the opening of the div tag is outside the {if} clause but the closing tag is inside the {/if}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was looking like it due to malformed spacing. I fixed it. Now it should look good.

3 changes: 2 additions & 1 deletion templates/CRM/Admin/Page/LabelFormats.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{if $action eq 1 or $action eq 2 or $action eq 8 or $action eq 16384}
{include file="CRM/Admin/Form/LabelFormats.tpl"}
{else}

<div class="crm-content-block crm-block">
{if $rows}
<div id="ltype">
{strip}
Expand Down Expand Up @@ -74,4 +74,5 @@
{ts 1=$crmURL}There are no Label Formats configured. You can<a href='%1'>add one</a>.{/ts}
</div>
{/if}
</div>
{/if}
4 changes: 2 additions & 2 deletions templates/CRM/Admin/Page/MessageTemplates.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
{/if}

{if $rows and $action ne 2 and $action ne 4}

<div class="crm-content-block crm-block">
<div id='mainTabContainer'>
<ul>
<li id='tab_user'> <a href='#user' title='{ts}User-driven Messages{/ts}'> {ts}User-driven Messages{/ts} </a></li>
Expand Down Expand Up @@ -162,7 +162,7 @@
</div>
{/foreach}
</div>

</div>
<script type='text/javascript'>
var selectedTab = 'user';
{if $selectedChild}selectedTab = '{$selectedChild}';{/if}
Expand Down
2 changes: 2 additions & 0 deletions templates/CRM/Admin/Page/PdfFormats.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
{capture assign="messageTemplatesURL"}{crmURL p="civicrm/admin/messageTemplates" q="reset=1"}{/capture}
{ts 1=$messageTemplatesURL}You can configure one or more PDF Page Formats for your CiviCRM installation. PDF Page Formats may be assigned to <strong><a href="%1">Message Templates</a></strong> to use when creating PDF letters.{/ts}
</div>
<div class="crm-content-block crm-block">
{if $rows}
<div id="ltype">
{strip}
Expand Down Expand Up @@ -69,3 +70,4 @@
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
</div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need a newline at the end of this file

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@colemanw added

3 changes: 3 additions & 0 deletions templates/CRM/Admin/Page/RelationshipType.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
<p>{ts}Relationship types describe relationships between people, households and organizations. Relationship types labels describe the relationship from the perspective of each of the two entities (e.g. Parent &gt;-&lt; Child, Employer &gt;-&lt; Employee). For some types of relationships, the labels may be the same in both directions (e.g. Spouse &gt;-&lt; Spouse).{/ts} {$docLink}</p>
<p>{ts 1=$customURL}You can define as many additional relationships types as needed to cover the types of relationships you want to track. Once a relationship type is created, you may also define custom fields to extend relationship information for that type from <a href='%1'>Administer CiviCRM &raquo; Custom Data</a>.{/ts}{help id='id-relationship-types'} </p>
</div>

<div class="crm-content-block crm-block">
{if $rows}
{if !($action eq 1 and $action eq 2)}
<div class="action-link">
Expand Down Expand Up @@ -86,3 +88,4 @@
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
</div>
2 changes: 2 additions & 0 deletions templates/CRM/Admin/Page/ScheduleReminders.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
{ts}Scheduled reminders allow you to automatically send messages to contacts regarding their memberships, participation in events, or other activities.{/ts} {$schedRemindersDocLink}
</div>
{/if}
<div class="crm-content-block crm-block">
{if $rows}
<div id="reminder">
{include file="CRM/Admin/Page/Reminders.tpl"}
Expand All @@ -57,5 +58,6 @@
{/if}
{crmButton p=$link q=$urlParams id="newScheduleReminder" icon="plus-circle"}{ts}Add Reminder{/ts}{/crmButton}
</div>
</div>
{/if}
{/if}
2 changes: 2 additions & 0 deletions templates/CRM/UF/Page/Group.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
{ts}CiviCRM Profile(s) allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features. They provide a powerful set of tools for you to collect information from constituents and selectively share contact information.{/ts} {help id='profile_overview'}
</div>

<div class="crm-content-block crm-block">
{if NOT ($action eq 1 or $action eq 2)}
<div class="crm-submit-buttons">
<a href="{crmURL p='civicrm/admin/uf/group/add' q="action=add&reset=1"}" id="newCiviCRMProfile-top" class="button"><span><i class="crm-i fa-plus-circle"></i> {ts}Add Profile{/ts}</span></a>
Expand Down Expand Up @@ -173,3 +174,4 @@
{/if}
{/if}
{/if}
</div>