Fix wysiwyg help

diff --git a/templates/CRM/Admin/Form/Preferences/Display.hlp b/templates/CRM/Admin/Form/Preferences/Display.hlp
index 34d735d7b11b53363afd1de0c167543604dd4d64..c4f63f80f9f9484b33cc7fb91c51e7e2ec43f4b4 100644 (file)
--- a/templates/CRM/Admin/Form/Preferences/Display.hlp
+++ b/templates/CRM/Admin/Form/Preferences/Display.hlp
@@ -23,17 +23,18 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |\r
  +--------------------------------------------------------------------+\r
 *}\r
-{htxt id="id-editor_id-title"}\r
+{htxt id="editor_id-title"}\r
   {ts}WYSIWYG Editor{/ts}\r
 {/htxt}\r
-{htxt id="id-editor_id"}\r
-  <p>{ts}Select the HTML WYSIWYG Editor provided for fields that allow HTML formatting. Select 'Textarea' if you don't want to provide a WYSIWYG Editor (users will type text and / or HTML code into plain text fields).{/ts}</p>\r
-  <p>{ts}<strong>Spell-checking:</strong> ckEditor includes a Spell-check button by default. There is also an optional plugin which does spell-checking automatically (as you type). However, this plugin is not enabled by default since it sends user input to a 3rd party service (spellchecker.net) without informing the user - and this may pose privacy issues for some sites.{/ts}\r
-  <p>{ts}To enable auto spell check, in packages/ckeditor/config.js - change this value to true:{/ts}<br />\r
-  config.scayt_autoStartup = false;\r
-  <p>{ts}To remove the Spell Check button, in packages/ckeditor/config.js - remove this item in the config.toolbar_Full list:{/ts}<br />\r
-  'SpellChecker'\r
-  <p>{ts}<strong>NOTE:</strong> If you are modifying config.js you should first have configured a Custom PHP Path under Administer > System Settings > Directories, and place your modified version in the custom path.{/ts}</p>\r
+{htxt id="editor_id"}\r
+  <p>\r
+    {ts}A "WYSIWYG" (What You See Is What You Get) is a rich-text editor, like a mini word-processor, for editing HTML content in CiviCRM.{/ts}\r
+  </p>\r
+  <ul>\r
+    <li>{ts}Select 'CKEditor' for the built-in WYSIWYG option. You can customize the toolbar buttons and other settings by clicking "Configure CKEditor."{/ts}</li>\r
+    <li>{ts}Select 'Textarea' if you want users to type text and/or HTML code into plain text fields.{/ts}</li>\r
+    <li>{ts 1='target="_blank" href="https://civicrm.org/extensions/home?body_value=wysiwyg&field_extension_cms_tid=127"'}Other WYSIWYG editors are available for download from the <a %1>CiviCRM Extension Directory</a>.{/ts}</li>\r
+  </ul>\r
 {/htxt}\r
 \r
 {htxt id="id-invoices_id-title"}\r

diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index c006e896d3d6a51003225a3000938697cc57cb16..962187ddf9326ce7e7ea93374ed519499b9e87cb 100644 (file)
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -154,7 +154,7 @@
       </td>
     </tr>
     <tr class="crm-preferences-display-form-block-editor_id">
-      <td class="label">{$form.editor_id.label}</td>
+      <td class="label">{$form.editor_id.label} {help id="editor_id"}</td>
       <td>
         {$form.editor_id.html}
         &nbsp;
@@ -164,12 +164,6 @@
         </span>
       </td>
     </tr>
-    <tr class="crm-preferences-display-form-block-description">
-      <td>&nbsp;</td>
-      <td class="description">
-        {ts}Select the HTML WYSIWYG Editor provided for fields that allow HTML formatting. Select 'Textarea' if you don't want to provide a WYSIWYG Editor (users will type text and / or HTML code into plain text fields).{/ts} {help id="id-editor_id"}
-      </td>
-    </tr>
     <tr class="crm-preferences-display-form-block-ajaxPopupsEnabled">
       <td class="label">{$form.ajaxPopupsEnabled.label}</td>
       <td>{$form.ajaxPopupsEnabled.html}</td>