From: Tim Otten <totten@civicrm.org>
Date: Sun, 23 Aug 2015 17:01:38 +0000 (-0700)
Subject: (Directory,Url).setting.php - Tweaks
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2937fb4af1786152c7f4c2447878f9d303ffb731;p=civicrm-core.git

(Directory,Url).setting.php - Tweaks
---

diff --git a/settings/Directory.setting.php b/settings/Directory.setting.php
index 76ca1e9233..d7efcda29a 100644
--- a/settings/Directory.setting.php
+++ b/settings/Directory.setting.php
@@ -41,90 +41,90 @@ return array(
     'group_name' => 'Directory Preferences',
     'group' => 'directory',
     'name' => 'uploadDir',
-    'type' => 'Url',
+    'type' => 'String',
     'html_type' => 'Text',
+    'quick_form_type' => 'Element',
     'default' => NULL,
     'add' => '4.1',
-    'prefetch' => 1,
-    'title' => 'Upload Directory',
+    'title' => 'Temporary Files Directory',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => NULL,
-    'help_text' => '',
+    'help_text' => 'File system path where temporary CiviCRM files - such as import data files - are uploaded.',
   ),
   'imageUploadDir' => array(
     'group_name' => 'Directory Preferences',
     'group' => 'directory',
     'name' => 'imageUploadDir',
-    'type' => 'Url',
+    'type' => 'String',
     'html_type' => 'Text',
+    'quick_form_type' => 'Element',
     'default' => NULL,
     'add' => '4.1',
-    'prefetch' => 1,
     'title' => 'Image Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
+    'description' => 'File system path where image files are uploaded. Currently, this path is used for images associated with premiums (CiviContribute thank-you gifts).',
     'help_text' => NULL,
   ),
   'customFileUploadDir' => array(
     'group_name' => 'Directory Preferences',
     'group' => 'directory',
     'name' => 'customFileUploadDir',
-    'type' => 'Url',
+    'type' => 'String',
     'html_type' => 'Text',
+    'quick_form_type' => 'Element',
     'default' => NULL,
     'add' => '4.1',
-    'prefetch' => 1,
-    'title' => 'Custom Files Upload Directory',
+    'title' => 'Custom Files Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
+    'description' => 'Path where documents and images which are attachments to contact records are stored (e.g. contact photos, resumes, contracts, etc.). These attachments are defined using \'file\' type custom fields.',
     'help_text' => NULL,
   ),
   'customTemplateDir' => array(
     'group_name' => 'Directory Preferences',
     'group' => 'directory',
     'name' => 'customTemplateDir',
-    'type' => 'Url',
+    'type' => 'String',
     'html_type' => 'Text',
+    'quick_form_type' => 'Element',
     'default' => NULL,
     'add' => '4.1',
-    'prefetch' => 1,
     'title' => 'Custom Template Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
+    'description' => 'Path where site specific templates are stored if any. This directory is searched first if set. Custom JavaScript code can be added to templates by creating files named templateFile.extra.tpl. (learn more...)',
     'help_text' => NULL,
   ),
   'customPHPPathDir' => array(
     'group_name' => 'Directory Preferences',
     'group' => 'directory',
     'name' => 'customPHPPathDir',
-    'type' => 'Url',
+    'type' => 'String',
     'html_type' => 'Text',
+    'quick_form_type' => 'Element',
     'default' => NULL,
     'add' => '4.1',
-    'prefetch' => 1,
-    'title' => 'Custom PHP Path',
+    'title' => 'Custom PHP Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
+    'description' => 'Path where site specific PHP code files are stored if any. This directory is searched first if set.',
     'help_text' => NULL,
   ),
   'extensionsDir' => array(
     'group_name' => 'Directory Preferences',
     'group' => 'directory',
     'name' => 'extensionsDir',
-    'type' => 'Url',
+    'type' => 'String',
     'html_type' => 'Text',
+    'quick_form_type' => 'Element',
     'default' => NULL,
     'add' => '4.1',
-    'prefetch' => 1,
     'title' => 'Extensions Directory',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => NULL,
+    'description' => 'Path where CiviCRM extensions are stored.',
     'help_text' => NULL,
   ),
 
diff --git a/settings/Url.setting.php b/settings/Url.setting.php
index 8fd2c1a973..aacaa11440 100644
--- a/settings/Url.setting.php
+++ b/settings/Url.setting.php
@@ -40,29 +40,31 @@ return array(
     'group' => 'url',
     'group_name' => 'URL Preferences',
     'name' => 'userFrameworkResourceURL',
-    'title' => 'Script and CSS Resources URL',
+    'title' => 'CiviCRM Resource URL',
     'type' => 'String',
+    'html_type' => 'Text',
+    'quick_form_type' => 'Element',
     'default' => NULL,
     'add' => '4.1',
-    'prefetch' => 1,
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => 'CiviCRM Resource URL',
+    'description' => 'Absolute URL of the location where the civicrm module or component has been installed.',
     'help_text' => NULL,
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),
   'imageUploadURL' => array(
     'group' => 'url',
     'group_name' => 'URL Preferences',
-    'title' => 'Image URL Prefix',
+    'title' => 'Image Upload URL',
     'name' => 'imageUploadURL',
     'type' => 'String',
+    'html_type' => 'Text',
+    'quick_form_type' => 'Element',
     'default' => NULL,
     'add' => '4.1',
-    'prefetch' => 1,
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => 'Image Upload URL',
+    'description' => 'URL of the location for uploaded image files.',
     'help_text' => NULL,
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),
@@ -70,16 +72,32 @@ return array(
     'group' => 'url',
     'group_name' => 'URL Preferences',
     'name' => 'customCSSURL',
-    'title' => 'Custom CSS',
+    'title' => 'Custom CSS URL',
     'type' => 'String',
+    'html_type' => 'Text',
+    'quick_form_type' => 'Element',
     'default' => NULL,
     'add' => '4.1',
-    'prefetch' => 1,
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => 'Custom CiviCRM CSS URL',
+    'description' => 'You can modify the look and feel of CiviCRM by adding your own stylesheet. For small to medium sized modifications, use your css file to override some of the styles in civicrm.css. Or if you need to make drastic changes, you can choose to disable civicrm.css completely.',
+    'help_text' => NULL,
+    'validate_callback' => 'CRM_Utils_Rule::url',
+  ),
+  'extensionsURL' => array(
+    'group' => 'url',
+    'group_name' => 'URL Preferences',
+    'title' => 'Extension Resource URL',
+    'name' => 'extensionsURL',
+    'type' => 'String',
+    'html_type' => 'Text',
+    'quick_form_type' => 'Element',
+    'default' => NULL,
+    'add' => '4.1',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'Base URL for extension resources (images, stylesheets, etc). This should match extensionsDir.',
     'help_text' => NULL,
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),
-
 );