Index: branches/5.2.x/core/admin_templates/categories/edit_content.tpl
===================================================================
diff -u -N -r14856 -r15042
--- branches/5.2.x/core/admin_templates/categories/edit_content.tpl	(.../edit_content.tpl)	(revision 14856)
+++ branches/5.2.x/core/admin_templates/categories/edit_content.tpl	(.../edit_content.tpl)	(revision 15042)
@@ -1,6 +1,7 @@
 <inp2:adm_SetPopupSize width="700" height="600"/>
 <inp2:m_include t="incs/header"/>
 
+<inp2:m_NoDebug/>
 <inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" title_preset="edit_content"/>
 
 <!-- ToolBar -->
@@ -44,40 +45,38 @@
 <inp2:content_SaveWarning name="grid_save_warning"/>
 <inp2:content_ErrorWarning name="form_error_warning"/>
 
-<div id="scroll_container">
-	<table class="edit-form" style="border-collapse: separate;">
-		<tr>
-			<td style="padding: 0px;">
-				<inp2:m_if check="adm_UsePopups">
-					<inp2:content_FCKEditor field="Content" width="100%" height="100" format="no_default" late_load="1"/>
-				<inp2:m_else/>
-					<inp2:content_FCKEditor field="Content" width="100%" height="500" format="no_default"/>
-				</inp2:m_if>
+<inp2:content_FCKEditor field="Content" width="99%" height="100" format="no_default"/>
 
-				<script type="text/javascript">
-					if (typeof(fields['content']) == 'undefined') {
-						fields['content'] = new Object();
-					}
-					fields['content']['Content'] = '<inp2:m_phrase label="la_fld_ContentBlock" js_escape="1"/>';
-
-					Form.addControl('<inp2:content_InputName field="Content"/>___Frame');
-				</script>
-
-				<inp2:m_RenderElement name="inp_edit_error" prefix="content" field="Content"/>
-			</td>
-		</tr>
-	</table>
-</div>
-
 <input type="hidden" name="c_id" value="<inp2:m_Get name='c_id'/>"/>
 
 <script type="text/javascript">
-	var $autosave_title = '<inp2:m_Phrase name="la_title_EditingContentAutosaved" no_editing="1" js_escape="1"/>';
+	var $field_id = '<inp2:content_InputName name="Content" js_escape="1"/>',
+		$autosave_title = '<inp2:m_Phrase name="la_title_EditingContentAutosaved" no_editing="1" js_escape="1"/>';
 
+	CKEDITOR.on(
+		'instanceReady',
+		function( ev ) {
+			var $editor_instance = CKEDITOR.instances[ ev.editor.name ];
+			$editor_instance.resize( '100%', $(window).height() - $('#cke_' + jq($field_id)).offset().top );
+		}
+	);
+
+	$(document).ready(
+		function () {
+			$(window).resize(
+				function ($e) {
+					for (var $index in CKEDITOR.instances) {
+						CKEDITOR.instances[$index].resize( '100%', $(window).height() - $('#cke_' + jq($field_id)).offset().top );
+					}
+				}
+			);
+		}
+	);
+
 	setInterval(
 		function () {
-			var $editor_instance = FCKeditorAPI.GetInstance('<inp2:content_InputName field="Content"/>');
-			$('#' + jq('<inp2:content_InputName field="Content"/>')).val( $editor_instance.GetHTML() );
+			var $editor_instance = CKEDITOR.instances[ '<inp2:content_InputName field="Content"/>' ];
+			$('#' + jq('<inp2:content_InputName field="Content"/>')).val( $editor_instance.getData() );
 
 			submit_event_ajax(
 				'content', 'OnAutoSave', undefined,