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

CRM-21823: Fix structure and style glitches #11750

Merged
merged 1 commit into from
Mar 2, 2018
Merged

CRM-21823: Fix structure and style glitches #11750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 templates/CRM/Admin/Form/Setting/Date.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
<div class="crm-block crm-form-block crm-date-form-block">
<div class="help">
{capture assign=crmURL}{crmURL p='civicrm/admin/setting/preferences/date' q='action=reset=1'}{/capture}
{ts 1=$crmURL}Use this screen to configure default formats for date display and date input fields throughout your site. Settings use standard POSIX specifiers. New installations are preconfigured with standard United States formats. You can override this default setting and define the range of allowed dates for specific field types at <a href="%1">Administer > Customize Data and Screens > Date Preferences</a>{/ts} {help id='date-format'}
</div>
<div class="crm-block crm-form-block crm-date-form-block">
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<fieldset><legend>{ts}Date Display{/ts}</legend>
<table class="form-layout-compressed">
Expand Down
14 changes: 7 additions & 7 deletions templates/CRM/Admin/Form/Setting/Localization.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
| see the CiviCRM license FAQ at http://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
<div class="help">
{ts}Configure CiviCRM for your country and language.{/ts}
{docURL page="i18n Administrator's Guide: Using CiviCRM in your own language" resource="wiki"}
</div>
<div class="crm-block crm-form-block crm-localization-form-block">
<div class="help">
{ts}Configure CiviCRM for your country and language.{/ts}
{docURL page="i18n Administrator's Guide: Using CiviCRM in your own language" resource="wiki"}
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"} </div>
<h3>{ts}Language and Currency{/ts}</h3>
<table class="form-layout-compressed">
Expand Down Expand Up @@ -123,19 +123,19 @@
<td class="label">{$form.makeSinglelingual.label}</td>
<td>{$form.makeSinglelingual.html}<br />
<span class="description">{ts}Check this box and click 'Save' to switch this installation from multi- to single-language.{/ts}</span><br /><br />
<span class="description" style="color:red">{$warning}</span></td>
<span class="description font-red">{$warning}</span></td>
</tr>
{elseif $form.makeMultilingual}
<tr class="crm-localization-form-block-makeMultilingual">
<td class="label">{$form.makeMultilingual.label}</td>
<td>{$form.makeMultilingual.html}<br />
<span class="description">{ts}Check this box and click 'Save' to switch this installation from single- to multi-language, then add further languages.{/ts}</span><br /><br />
<span class="description" style="color:red">{$warning}</span></td>
<span class="description font-red">{$warning}</span></td>
{else}
<tr class="crm-localization-form-block-description">
<td>
<span class="description">{ts}In order to use this functionality, the installation's database user must have privileges to create triggers and views (in MySQL 5.0 – and in MySQL 5.1 if binary logging is enabled – this means the SUPER privilege). This install either does not seem to have the required privilege enabled.{/ts} {ts}(Multilingual support currently cannot be enabled on installations with enabled logging.){/ts}</span><br /><br />
<span class="description" style="color:red">{$warning}</span></td>
<span class="description font-red">{$warning}</span></td>
</tr>
{/if}
</table>
Expand Down
2 changes: 1 addition & 1 deletion templates/CRM/Member/Form/MembershipType.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div class="messages status no-popup">
{ts}WARNING: Deleting this option will result in the loss of all membership records of this type.{/ts} {ts}This may mean the loss of a substantial amount of data, and the action cannot be undone.{/ts} {ts}Do you want to continue?{/ts}
</div>
<div> {include file="CRM/common/formButtons.tpl"}</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
{else}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
Expand Down