CRM-21823: Fix structure and style glitches

diff --git a/templates/CRM/Admin/Form/Setting/Date.tpl b/templates/CRM/Admin/Form/Setting/Date.tpl
index 5e5c6000cab27657c4f0ff6e494c9ddaebd2080d..7eef5127cad11831a987e4abd05966eb9b46be06 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/Date.tpl
+++ b/templates/CRM/Admin/Form/Setting/Date.tpl
@@ -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">

diff --git a/templates/CRM/Admin/Form/Setting/Localization.tpl b/templates/CRM/Admin/Form/Setting/Localization.tpl
index 3a3e2564d9a7c3950b7574975ff8cba8f3c20859..7089c61f2460f40351d0b6b076c90564d1eec605 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/Localization.tpl
+++ b/templates/CRM/Admin/Form/Setting/Localization.tpl
@@ -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">
@@ -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>

diff --git a/templates/CRM/Member/Form/MembershipType.tpl b/templates/CRM/Member/Form/MembershipType.tpl
index 45c64d9a0b1ee5faf5f828fc1f8846b69ee65235..e33b6c8757cd8ba75a0ee102ff8da2746e68f5f8 100644 (file)
--- a/templates/CRM/Member/Form/MembershipType.tpl
+++ b/templates/CRM/Member/Form/MembershipType.tpl
@@ -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">