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-21599: Added missing structure in templates #11457

Merged
merged 2 commits into from
Dec 28, 2017
Merged

CRM-21599: Added missing structure in templates #11457

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
5118009
CRM-21599-add-missing-structure-in-templates
mukeshcompucorp Dec 26, 2017
92164de
CRM-21599: Fix title label
mukeshcompucorp Dec 26, 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
2 changes: 1 addition & 1 deletion CRM/Event/Form/SearchEvent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function setDefaultValues() {
* @return void
*/
public function buildQuickForm() {
$this->add('text', 'title', ts('Find'),
$this->add('text', 'title', ts('Event Name'),
array(CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event', 'title'))
);

Expand Down
20 changes: 11 additions & 9 deletions templates/CRM/Admin/Page/LocationType.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
{ts}Location types provide convenient labels to differentiate contacts' location(s). Administrators may define as many additional types as appropriate for your constituents (examples might be Main Office, School, Vacation Home...).{/ts}
</div>

<div class="crm-block crm-content-block">
{if $rows}
<div id="ltype">
{strip}
Expand All @@ -38,15 +39,15 @@
{include file="CRM/common/jsortable.tpl"}
<table id="options" class="display">
<thead>
<tr>
<th id="sortable">{ts}Name{/ts}</th>
<th>{ts}Display Name{/ts}</th>
<th>{ts}vCard{/ts}</th>
<th id="nosort">{ts}Description{/ts}</th>
<th>{ts}Enabled?{/ts}</th>
<th>{ts}Default?{/ts}</th>
<th></th>
</tr>
<tr>
<th id="sortable">{ts}Name{/ts}</th>
<th>{ts}Display Name{/ts}</th>
<th>{ts}vCard{/ts}</th>
<th id="nosort">{ts}Description{/ts}</th>
<th>{ts}Enabled?{/ts}</th>
<th>{ts}Default?{/ts}</th>
<th></th>
</tr>
</thead>
{foreach from=$rows item=row}
<tr id="location_type-{$row.id}" data-action="setvalue" class="{cycle values="odd-row,even-row"} {$row.class} crm-entity {if NOT $row.is_active} disabled{/if}">
Expand All @@ -72,4 +73,5 @@
{crmButton q="action=add&reset=1" id="newLocationType" icon="plus-circle"}{ts}Add Option{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
</div>
Copy link
Contributor

Choose a reason for hiding this comment

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

How is this file related to field name change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@pradpnayak This is not just for adding label. PR is to make the structure proper and this file adds missing wrapper around the content like other files.

Copy link
Contributor

Choose a reason for hiding this comment

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

:)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I understand :) as approved then?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes APPROVED.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@pradpnayak can you do that from above Review changes then? for others to know the status

{/if}
12 changes: 7 additions & 5 deletions templates/CRM/Event/Form/SearchEvent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@
<h3>{ts}Find Events{/ts}</h3>
<table class="form-layout">
<tr class="crm-event-searchevent-form-block-title">
<td>{$form.title.html|crmAddClass:twenty}
<div class="description font-italic">
{ts}Complete OR partial Event name.{/ts}
</div>
<div style="height: auto; vertical-align: bottom">{$form.eventsByDates.html}</div>
<td>
<label>{$form.title.label}</label>
{$form.title.html|crmAddClass:twenty}
<div class="description font-italic">
{ts}Complete OR partial Event name.{/ts}
</div>
<div style="height: auto; vertical-align: bottom">{$form.eventsByDates.html}</div>
</td>
<td rowspan="2"><label>{ts}Event Type{/ts}</label>
{$form.event_type_id.html}
Expand Down