Merge pull request #12978 from mattwire/datepicker_manageevent_search

[civicrm-core.git] / settings / Core.setting.php

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 0e19719b0cfeaef7d6cb7f6ded215683fcc46fee..996b005c3aa861d6eaa6704af25bc1faef5744cf 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -29,8 +29,6 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2017
- * $Id$
- *
  */
 
 /**
@@ -105,8 +103,9 @@ return array(
     'title' => ts('Contact Dashboard'),
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
+    'description' => ts('Select the sections that should be included in the Contact Dashboard. EXAMPLE: If you don\'t want constituents to view their own contribution history, un-check that option.'),
     'help_text' => NULL,
+    'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
   ),
   'address_options' => array(
     'group_name' => 'CiviCRM Preferences',
@@ -158,28 +157,26 @@ return array(
     'group' => 'core',
     'name' => 'display_name_format',
     'type' => 'String',
-    'html_type' => 'Text',
+    'html_type' => 'textarea',
     'default' => '{contact.individual_prefix}{ }{contact.first_name}{ }{contact.last_name}{ }{contact.individual_suffix}',
     'add' => '4.1',
     'title' => ts('Individual Display Name Format'),
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
-    'help_text' => NULL,
+    'description' => ts('Display name format for individual contact display names.'),
   ),
   'sort_name_format' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'sort_name_format',
     'type' => 'String',
-    'html_type' => 'Text',
+    'html_type' => 'textarea',
     'default' => '{contact.last_name}{, }{contact.first_name}',
     'add' => '4.1',
     'title' => ts('Individual Sort Name Format'),
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
-    'help_text' => NULL,
+    'description' => ts('Sort name format for individual contact display names.'),
   ),
   'remote_profile_submissions' => array(
     'group_name' => 'CiviCRM Preferences',
@@ -244,7 +241,7 @@ return array(
     'group' => 'core',
     'name' => 'ajaxPopupsEnabled',
     'type' => 'Boolean',
-    'quick_form_type' => 'YesNo',
+    'html_type' => 'checkbox',
     'default' => 1,
     'add' => '4.5',
     'title' => ts('Enable Popup Forms'),
@@ -257,8 +254,8 @@ return array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'activity_assignee_notification',
-    'type' => 'String',
-    'html_type' => 'Text',
+    'type' => 'Boolean',
+    'html_type' => 'checkbox',
     'default' => '1',
     'add' => '4.1',
     'title' => ts('Notify Activity Assignees'),
@@ -271,8 +268,8 @@ return array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'activity_assignee_notification_ics',
-    'type' => 'String',
-    'html_type' => 'Text',
+    'type' => 'Boolean',
+    'html_type' => 'checkbox',
     'default' => '0',
     'add' => '4.3',
     'title' => ts('Include ICal Invite to Activity Assignees'),