In-Portal Issue Tracker

Index: admin/system_presets/simple/inp_ckconfig.js
===================================================================
--- admin/system_presets/simple/inp_ckconfig.js	(revision 15165)
+++ admin/system_presets/simple/inp_ckconfig.js	(working copy)
@@ -1,3 +1,17 @@
+/*
+* Append here extra CSS rules that should be applied into the editing area.
+* Example:
+* config.extraCss = "body {color:#FF0000;}";
+*/
+CKEDITOR.config.extraCss = "";
+
+/**
+* CKEditor's editing area body ID & class.
+* This setting can be used if CKEditor does not work well with your theme by default.
+*/
+CKEDITOR.config.bodyClass = '';
+CKEDITOR.config.bodyId = '';
+
 // Preview
 //CKEDITOR.config.PreviewUrl = '';
 //CKEDITOR.config.ContentId = '';
Index: core/admin_templates/incs/form_blocks.tpl
===================================================================
--- core/admin_templates/incs/form_blocks.tpl	(revision 15267)
+++ core/admin_templates/incs/form_blocks.tpl	(working copy)
@@ -517,10 +517,10 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_fck" class="" maxlength="" bgcolor="" onblur="" format="" size="" onkeyup="" style="" has_caption="0" control_options="false">
+<inp2:m_DefineElement name="inp_edit_fck" class="" maxlength="" bgcolor="" body_class="" body_id="" onblur="" format="" size="" onkeyup="" style="" has_caption="0" control_options="false">
 	<inp2:m_RenderElement design="form_row" pass_params="1">
 		<td class="control-cell" style="padding: 0px;" colspan="3" onmouseover="show_form_error('<inp2:m_Param name='prefix' js_escape='1'/>', '<inp2:m_Param name='field' js_escape='1'/>')" onmouseout="hide_form_error('<inp2:m_Param name='prefix' js_escape='1'/>')">
-			<inp2:FCKEditor field="$field" width="100%" height="200" bgcolor="$bgcolor" format="$format" late_load="1"/>
+			<inp2:FCKEditor field="$field" width="100%" height="200" bgcolor="$bgcolor" body_class="$body_class" body_id="$body_id" format="$format" late_load="1"/>
 			<script type="text/javascript">
 				if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
 					fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
Index: core/admin_templates/js/inp_ckconfig.js
===================================================================
--- core/admin_templates/js/inp_ckconfig.js	(revision 15165)
+++ core/admin_templates/js/inp_ckconfig.js	(working copy)
@@ -1,3 +1,17 @@
+/*
+* Append here extra CSS rules that should be applied into the editing area.
+* Example:
+* config.extraCss = "body {color:#FF0000;}";
+*/
+CKEDITOR.config.extraCss = "";
+
+/**
+* CKEditor's editing area body ID & class.
+* This setting can be used if CKEditor does not work well with your theme by default.
+*/
+CKEDITOR.config.bodyClass = '';
+CKEDITOR.config.bodyId = '';
+
 // Preview
 //CKEDITOR.config.PreviewUrl = '';
 //CKEDITOR.config.ContentId = '';
Index: core/admin_templates/popups/editor.tpl
===================================================================
--- core/admin_templates/popups/editor.tpl	(revision 15165)
+++ core/admin_templates/popups/editor.tpl	(working copy)
@@ -51,7 +51,7 @@
 	</tbody>
 </table>
 
-<inp2:adm_FCKEditor name="Content" width="99%" height="100" bgcolor="red"/>
+<inp2:adm_FCKEditor name="Content" width="99%" height="100"/>
 
 <script type="text/javascript">
 	CKEDITOR.on(
Index: core/kernel/db/db_tag_processor.php
===================================================================
--- core/kernel/db/db_tag_processor.php	(revision 15291)
+++ core/kernel/db/db_tag_processor.php	(working copy)
@@ -2564,16 +2564,11 @@
 		}
 
 		$styles_js = $this->Application->BaseURL($theme_path) . 'styles.js';
-		$bgcolor = isset($params['bgcolor']) ? $params['bgcolor'] : $this->Application->GetVar('bgcolor');
 
-		if ( !$bgcolor ) {
-			$bgcolor = '#ffffff';
-		}
-
-		$page_id = $this->Application->GetVar('c_id');
+		/*$page_id = $this->Application->GetVar('c_id');
 		$content_id = $this->Application->GetVar('content_id');
+		$preview_url = '';
 
-		/*$preview_url = '';
 		if ($page_id && $content_id) {
 			// editing content block from Front-End, not category in admin
 			$sql = 'SELECT NamedParentPath
@@ -2621,6 +2616,11 @@
 			$config_js = $this->Application->BaseURL() . 'core/admin_templates/js/inp_ckconfig.js';
 		}
 
+		$fck_helper = $this->Application->recallObject('FCKHelper');
+		/* @var $fck_helper fckFCKHelper */
+
+		$transit_params = $fck_helper->getTransitParams($params);
+
 		$oCKeditor->config = Array (
 			'toolbar' => $this->Application->isDebugMode() ? 'DebugMode' : 'Default', //  $page_id && $content_id ? 'Advanced' : 'Default',
 
@@ -2634,19 +2634,34 @@
 //			'DefaultStyleLabel' => $this->Application->Phrase('la_editor_default_style'), // not ported to ckeditor
 			'Admin' => 1, // for custom file browser to work
 			'K4' => 1, // for custom file browser to work
-			'newBgColor' => $bgcolor,
 //			'PreviewUrl' => $preview_url,
 //			'BaseUrl' => BASE_PATH . '/', // used by custom document plugin & by file browser
 			'language' => $this->_getFCKLanguage(),
-
-//			'EditorAreaStyles' => 'body { background-color: '.$bgcolor.' }', // TODO
-
 			'height' => $height, // editor area height
 		);
 
+		if ( isset($transit_params['bgcolor']) && $transit_params['bgcolor'] ) {
+			$oCKeditor->config['extraCss'] = 'body { background-color: ' . $transit_params['bgcolor'] . '; }';
+		}
+
+		foreach ($transit_params as $param_name => $param_value) {
+			if ( !$param_value ) {
+				continue;
+			}
+
+			$param_key = str_replace(' ', '', ucwords(str_replace('_', ' ', $param_name)));
+			$param_key[0] = strtolower($param_key[0]);
+
+			$oCKeditor->config[$param_key] = $param_value;
+		}
+
 		$oCKeditor->returnOutput = true;
 
-		return $oCKeditor->editor($name, $value);
+		$events = Array (
+			'configLoaded' => 'function(ev) { ev.editor.addCss(ev.editor.config.extraCss); }',
+		);
+
+		return $oCKeditor->editor($name, $value, Array (), $events);
 	}
 
 	function IsNewItem($params)
Index: core/units/content/content_eh.php
===================================================================
--- core/units/content/content_eh.php	(revision 15258)
+++ core/units/content/content_eh.php	(working copy)
@@ -57,6 +57,28 @@
 		}
 
 		/**
+		 * Prepare temp tables and populate it
+		 * with items selected in the grid
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnEdit(kEvent $event)
+		{
+			parent::OnEdit($event);
+
+			$fck_helper = $this->Application->recallObject('FCKHelper');
+			/* @var $fck_helper fckFCKHelper */
+
+			$transit_params = $fck_helper->getTransitParams();
+
+			foreach ($transit_params as $param_name => $param_value) {
+				$event->SetRedirectParam($param_name, urlencode($param_value));
+			}
+		}
+
+		/**
 		 * Saves changes & changes language
 		 *
 		 * @param kEvent $event
Index: core/units/helpers/fck_helper.php
===================================================================
--- core/units/helpers/fck_helper.php	(revision 15165)
+++ core/units/helpers/fck_helper.php	(working copy)
@@ -386,4 +386,26 @@
 	{
 		return substr( $fileName, 0, strrpos( $fileName, '.' ) ) ;
 	}
+
+	/**
+	 * Returns transit parameters, that should be passed to every used CKEditor instance
+	 *
+	 * @param Array $tag_params
+	 * @return Array
+	 */
+	public function getTransitParams($tag_params = Array ())
+	{
+		$ret = Array ();
+		$transit_params = Array ('bgcolor' => '', 'body_class' => '', 'body_id' => '');
+
+		foreach ($transit_params as $param_name => $default_value) {
+			$param_value = isset($tag_params[$param_name]) ? $tag_params[$param_name] : $this->Application->GetVar($param_name);
+
+			if ( $param_value || $default_value ) {
+				$ret[$param_name] = $param_value ? $param_value : $default_value;
+			}
+		}
+
+		return $ret;
+	}
 }
\ No newline at end of file