Date preferences form cleanup

diff --git a/CRM/Admin/Page/PreferencesDate.php b/CRM/Admin/Page/PreferencesDate.php
index 698773a5e0438cfdf4c040a94b830b10384d5a85..933265a7c8cf5790cb99f54876f247ebd228a6e9 100644 (file)
--- a/CRM/Admin/Page/PreferencesDate.php
+++ b/CRM/Admin/Page/PreferencesDate.php
@@ -43,6 +43,8 @@ class CRM_Admin_Page_PreferencesDate extends CRM_Core_Page_Basic {
    */
   static $_links = NULL;
 
+  public $useLivePageJS = TRUE;
+
   /**
    * Get BAO Name.
    *

diff --git a/templates/CRM/Admin/Form/PreferencesDate.tpl b/templates/CRM/Admin/Form/PreferencesDate.tpl
index 8c122a1d680fe3c8d061eac76f6068a55ff199d2..67fbff4c9cf986ad280c88d39fb4042aec33a4f8 100644 (file)
--- a/templates/CRM/Admin/Form/PreferencesDate.tpl
+++ b/templates/CRM/Admin/Form/PreferencesDate.tpl
@@ -25,7 +25,6 @@
 *}
 {* this template is used for adding/editing location type  *}
 <div class="crm-block crm-form-block crm-preferences-date-form-block">
-    <fieldset><legend>{ts}Edit Date Settings{/ts}</legend>
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
         <table class='form-layout-compressed'>
             <tr class="crm-preferences-date-form-block-name">
@@ -50,5 +49,4 @@
             </tr>
         </table>
         <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-    </fieldset>
 </div>

diff --git a/templates/CRM/Admin/Page/PreferencesDate.tpl b/templates/CRM/Admin/Page/PreferencesDate.tpl
index 5c64d3ba525fb74172a247e28ac2b450f814ff53..0c6d319d8162ea4650141b02bef3ddb303ee678e 100644 (file)
--- a/templates/CRM/Admin/Page/PreferencesDate.tpl
+++ b/templates/CRM/Admin/Page/PreferencesDate.tpl
@@ -23,14 +23,13 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-<div class="help">
-  {capture assign=crmURL}{crmURL p='civicrm/admin/setting/date' q='action=reset=1'}{/capture}
-    {ts 1=$crmURL}Changing the parameters here affects the input and display for specific fields types. Setting the default date format for the entire site is a Localisation setting. See <a href="%1">Administer > Localization > Date Formats</a>{/ts}
-</div>
-
 {if $action eq 1 or $action eq 2 or $action eq 8}
     {include file="CRM/Admin/Form/PreferencesDate.tpl"}
 {else}
+    <div class="help">
+      {capture assign=crmURL}{crmURL p='civicrm/admin/setting/date' q='action=reset=1'}{/capture}
+        {ts 1=$crmURL}Changing the parameters here affects the input and display for specific fields types. Setting the default date format for the entire site is a Localisation setting. See <a href="%1">Administer > Localization > Date Formats</a>{/ts}
+    </div>
     <div class="form-item">
         <table cellpadding="0" cellspacing="0" border="0">
             <tr class="columnheader">