Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-27-10-02-15

[civicrm-core.git] / CRM / Event / Form / ManageEvent / Registration.php

diff --git a/CRM/Event/Form/ManageEvent/Registration.php b/CRM/Event/Form/ManageEvent/Registration.php
index 3a24bb1d96838998bdafd0c0f1943523bcd73600..cac7a8fd047f438a03a9ac4a40058a74ca9712e2 100644 (file)
--- a/CRM/Event/Form/ManageEvent/Registration.php
+++ b/CRM/Event/Form/ManageEvent/Registration.php
@@ -314,17 +314,9 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
    *
    */
   public function buildRegistrationBlock(&$form) {
-    $attributes = CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event');
-    $attributes['intro_text']['click_wysiwyg'] = TRUE;
-    $form->addWysiwyg('intro_text', ts('Introductory Text'), $attributes['intro_text']);
-    // FIXME: This hack forces height of editor to 175px. Need to modify QF classes for editors to allow passing
-    // explicit height and width.
-    $footerAttribs = array(
-      'rows' => 2,
-      'cols' => 40,
-      'click_wysiwyg' => TRUE,
-    );
-    $form->addWysiwyg('footer_text', ts('Footer Text'), $footerAttribs);
+    $attributes = CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event', 'intro_text') + array('class' => 'collapsed');
+    $form->add('wysiwyg', 'intro_text', ts('Introductory Text'), $attributes);
+    $form->add('wysiwyg', 'footer_text', ts('Footer Text'), $attributes);
 
     extract(self::getProfileSelectorTypes());
     //CRM-15427
@@ -401,7 +393,6 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
    */
   public function buildConfirmationBlock(&$form) {
     $attributes = CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event');
-    $attributes['confirm_text']['click_wysiwyg'] = TRUE;
     // CRM-11182 - Optional confirmation page for free events
     $is_monetary = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event', $form->_id, 'is_monetary');
     $form->assign('is_monetary', $is_monetary);
@@ -409,15 +400,8 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
       $form->addYesNo('is_confirm_enabled', ts('Use a confirmation screen?'), NULL, NULL, array('onclick' => "return showHideByValue('is_confirm_enabled','','confirm_screen_settings','block','radio',false);"));
     }
     $form->add('text', 'confirm_title', ts('Title'), $attributes['confirm_title']);
-    $form->addWysiwyg('confirm_text', ts('Introductory Text'), $attributes['confirm_text']);
-    // FIXME: This hack forces height of editor to 175px. Need to modify QF classes for editors to allow passing
-    // explicit height and width.
-    $footerAttribs = array(
-      'rows' => 2,
-      'cols' => 40,
-      'click_wysiwyg' => TRUE,
-    );
-    $form->addWysiwyg('confirm_footer_text', ts('Footer Text'), $footerAttribs);
+    $form->add('wysiwyg', 'confirm_text', ts('Introductory Text'), $attributes['confirm_text'] + array('class' => 'collapsed'));
+    $form->add('wysiwyg', 'confirm_footer_text', ts('Footer Text'), $attributes['confirm_text'] + array('class' => 'collapsed'));
   }
 
   /**
@@ -445,17 +429,9 @@ class CRM_Event_Form_ManageEvent_Registration extends CRM_Event_Form_ManageEvent
    */
   public function buildThankYouBlock(&$form) {
     $attributes = CRM_Core_DAO::getAttribute('CRM_Event_DAO_Event');
-    $attributes['thankyou_text']['click_wysiwyg'] = TRUE;
     $form->add('text', 'thankyou_title', ts('Title'), $attributes['thankyou_title']);
-    $form->addWysiwyg('thankyou_text', ts('Introductory Text'), $attributes['thankyou_text']);
-    // FIXME: This hack forces height of editor to 175px. Need to modify QF classes for editors to allow passing
-    // explicit height and width.
-    $footerAttribs = array(
-      'rows' => 2,
-      'cols' => 40,
-      'click_wysiwyg' => TRUE,
-    );
-    $form->addWysiwyg('thankyou_footer_text', ts('Footer Text'), $footerAttribs);
+    $form->add('wysiwyg', 'thankyou_text', ts('Introductory Text'), $attributes['thankyou_text'] + array('class' => 'collapsed'));
+    $form->add('wysiwyg', 'thankyou_footer_text', ts('Footer Text'), $attributes['thankyou_text'] + array('class' => 'collapsed'));
   }
 
   /**