From b939ff36adb10f4c2f19a87cb4132d8402a9f7ad Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 13 Nov 2015 13:07:14 -0500
Subject: [PATCH] Fix wysiwyg help

---
 .../CRM/Admin/Form/Preferences/Display.hlp    | 19 ++++++++++---------
 .../CRM/Admin/Form/Preferences/Display.tpl    |  8 +-------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/templates/CRM/Admin/Form/Preferences/Display.hlp b/templates/CRM/Admin/Form/Preferences/Display.hlp
index 34d735d7b1..c4f63f80f9 100644
--- 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        |
  +--------------------------------------------------------------------+
 *}
-{htxt id="id-editor_id-title"}
+{htxt id="editor_id-title"}
   {ts}WYSIWYG Editor{/ts}
 {/htxt}
-{htxt id="id-editor_id"}
-  <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>
-  <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}
-  <p>{ts}To enable auto spell check, in packages/ckeditor/config.js - change this value to true:{/ts}<br />
-  config.scayt_autoStartup = false;
-  <p>{ts}To remove the Spell Check button, in packages/ckeditor/config.js - remove this item in the config.toolbar_Full list:{/ts}<br />
-  'SpellChecker'
-  <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>
+{htxt id="editor_id"}
+  <p>
+    {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}
+  </p>
+  <ul>
+    <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>
+    <li>{ts}Select 'Textarea' if you want users to type text and/or HTML code into plain text fields.{/ts}</li>
+    <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>
+  </ul>
 {/htxt}
 
 {htxt id="id-invoices_id-title"}
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index c006e896d3..962187ddf9 100644
--- 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>
-- 
2.25.1