Merge pull request #13039 from colemanw/quicksearchSetting

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index e21fb003a9ed8bd7eef1af322d0f98421331222c..a7a46101b7d5000986e37e0d57a9ef50faff8c97 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$
- *
  */
 
 /**
@@ -114,27 +112,28 @@ return array(
     'group' => 'core',
     'name' => 'address_options',
     'type' => 'String',
-    'html_type' => 'Text',
+    'html_type' => 'checkboxes',
     'pseudoconstant' => array(
       'optionGroupName' => 'address_options',
     ),
     'default' => '\ 11\ 12\ 13\ 14\ 15\ 16\ 18\ 19\ 110\ 111\ 1',
     'add' => '4.1',
-    'title' => 'Addressing Options',
+    'title' => ts('Address Fields'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
     'help_text' => NULL,
+    'serialize' => CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND,
   ),
   'address_format' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'address_format',
     'type' => 'String',
-    'html_type' => 'TextArea',
+    'html_type' => 'textarea',
     'default' => "{contact.address_name}\n{contact.street_address}\n{contact.supplemental_address_1}\n{contact.supplemental_address_2}\n{contact.supplemental_address_3}\n{contact.city}{, }{contact.state_province}{ }{contact.postal_code}\n{contact.country}",
     'add' => '4.1',
-    'title' => 'Address Format',
+    'title' => ts('Address Display Format'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -145,10 +144,10 @@ return array(
     'group' => 'core',
     'name' => 'mailing_format',
     'type' => 'String',
-    'html_type' => 'Text',
+    'html_type' => 'textarea',
     'default' => "{contact.addressee}\n{contact.street_address}\n{contact.supplemental_address_1}\n{contact.supplemental_address_2}\n{contact.supplemental_address_3}\n{contact.city}{, }{contact.state_province}{ }{contact.postal_code}\n{contact.country}",
     'add' => '4.1',
-    'title' => 'Mailing Format',
+    'title' => ts('Mailing Label Format'),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -215,10 +214,13 @@ return array(
     'group' => 'core',
     'name' => 'editor_id',
     'type' => 'String',
-    'html_type' => 'Select',
+    'html_type' => 'select',
     'default' => 'CKEditor',
     'add' => '4.1',
     'title' => ts('Wysiwig Editor'),
+    'pseudoconstant' => array(
+      'optionGroupName' => 'wysiwyg_editor',
+    ),
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
@@ -237,13 +239,14 @@ return array(
     'is_contact' => 0,
     'description' => NULL,
     'help_text' => NULL,
+    'options' => ['1' => ts('While Typing'), '0' => ts('When Saving'), '2' => ts('Never')],
   ),
   'ajaxPopupsEnabled' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'ajaxPopupsEnabled',
     'type' => 'Boolean',
-    'quick_form_type' => 'YesNo',
+    'html_type' => 'checkbox',
     'default' => 1,
     'add' => '4.5',
     'title' => ts('Enable Popup Forms'),
@@ -256,8 +259,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'),
@@ -270,8 +273,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'),
@@ -489,7 +492,7 @@ return array(
       'size' => 64,
       'maxlength' => 256,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Path to wkhtmltopdf executable'),
@@ -508,7 +511,7 @@ return array(
       'size' => 64,
       'maxlength' => 64,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Recaptcha Options'),
@@ -527,7 +530,7 @@ return array(
       'size' => 64,
       'maxlength' => 64,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Recaptcha Site Key'),
@@ -561,7 +564,7 @@ return array(
       'size' => 64,
       'maxlength' => 64,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => NULL,
     'add' => '4.3',
     'title' => ts('Recaptcha Secret Key'),
@@ -580,7 +583,7 @@ return array(
       'size' => 2,
       'maxlength' => 8,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => 7,
     'add' => '4.3',
     'title' => ts('Checksum Lifespan'),
@@ -599,7 +602,7 @@ return array(
       'size' => 64,
       'maxlength' => 128,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => '*default*',
     'add' => '4.3',
     'title' => ts('Blog Feed URL'),
@@ -618,7 +621,7 @@ return array(
       'size' => 64,
       'maxlength' => 128,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => '*default*',
     'add' => '4.3',
     'title' => ts('Community Messages URL'),
@@ -637,7 +640,7 @@ return array(
       'size' => 64,
       'maxlength' => 128,
     ),
-    'html_type' => 'Text',
+    'html_type' => 'text',
     'default' => '*default*',
     'add' => '4.3',
     'title' => ts('Getting Started URL'),
@@ -997,9 +1000,9 @@ return array(
     'is_domain' => 1,
     'is_contact' => 0,
     'default' => array(),
-    'title' => 'Do not notify assignees for',
-    'help_text' => 'These activity types will be excluded from automated email notifications to assignees.',
-    'html_type' => 'Select',
+    'title' => ts('Do not notify assignees for'),
+    'description' => ts('These activity types will be excluded from automated email notifications to assignees.'),
+    'html_type' => 'select',
     'html_attributes' => array(
       'multiple' => 1,
       'class' => 'huge crm-select2',