CRM-15603 - Standardize spacing of 'Rich Text Editor'

diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php
index d01d6f51ed7c0c52d6ec765d1ee5da6b3b539041..aba9fa9a00518950c238ed51e5855735db071bfe 100644 (file)
--- a/CRM/Custom/Form/Field.php
+++ b/CRM/Custom/Form/Field.php
@@ -150,7 +150,7 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
         array('Text' => ts('Text'), 'Select' => ts('Select'),
           'Radio' => ts('Radio'),
         ),
-        array('TextArea' => ts('TextArea'), 'RichTextEditor' => ts('RichTextEditor')),
+        array('TextArea' => ts('TextArea'), 'RichTextEditor' => ts('Rich Text Editor')),
         array('Date' => ts('Select Date')),
         array('Radio' => ts('Radio')),
         array('StateProvince' => ts('Select State/Province'), 'Multi-Select' => ts('Multi-Select State/Province')),

diff --git a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
index c2838f9f83e7305f07dd03e54832098864c86f61..846da534583ad853ca36d05c6de13f60f5558fc2 100644 (file)
--- a/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
+++ b/tests/phpunit/WebTest/Profile/BatchUpdateTest.php
@@ -722,7 +722,7 @@ class WebTest_Profile_BatchUpdateTest extends CiviSeleniumTestCase {
     $this->type('label', $richTextField);
     $this->click('data_type[0]');
     $this->select('data_type[0]', "label=Note");
-    $this->select('data_type[1]', "label=RichTextEditor");
+    $this->select('data_type[1]', "value=RichTextEditor");
 
     //clicking save
     $this->clickLink('_qf_Field_next_new-top', '_qf_Field_done-bottom', FALSE);