From b53239024638373224eae4a26f1bf96a77b12153 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 12 Nov 2015 19:36:09 -0500
Subject: [PATCH] Date preferences form cleanup

---
 CRM/Admin/Page/PreferencesDate.php           | 2 ++
 templates/CRM/Admin/Form/PreferencesDate.tpl | 2 --
 templates/CRM/Admin/Page/PreferencesDate.tpl | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CRM/Admin/Page/PreferencesDate.php b/CRM/Admin/Page/PreferencesDate.php
index 698773a5e0..933265a7c8 100644
--- 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 8c122a1d68..67fbff4c9c 100644
--- 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 5c64d3ba52..0c6d319d81 100644
--- 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">
-- 
2.25.1