Index: core/admin_templates/js/inp_ckconfig.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/js/inp_ckconfig.js	(revision 15892)
+++ core/admin_templates/js/inp_ckconfig.js	(revision )
@@ -20,8 +20,10 @@
 
 //CKEDITOR.config.PluginsPath = CKEDITOR.config.BasePath + 'plugins/' ;
 
-CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize,MediaEmbed';
+CKEDITOR.config.entities = false;
 
+CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize';
+
 //CKEDITOR.plugins.add('MySource');
 //CKEDITOR.plugins.add('MyPreview');
 //CKEDITOR.plugins.add('MyLink');
@@ -75,28 +77,28 @@
 CKEDITOR.config.enterMode = CKEDITOR.ENTER_BR ;		// p | div | br
 CKEDITOR.config.shiftEnterMode = CKEDITOR.ENTER_P ;	// p | div | br
 
-CKEDITOR.config.keystrokes = [
-	[ CKEDITOR.CTRL + 65 /*A*/, true ],
-	[ CKEDITOR.CTRL + 67 /*C*/, true ],
-	[ CKEDITOR.CTRL + 70 /*F*/, true ],
-	[ CKEDITOR.CTRL + 83 /*S*/, true ],
-	[ CKEDITOR.CTRL + 84 /*T*/, true ],
-	[ CKEDITOR.CTRL + 88 /*X*/, true ],
-	[ CKEDITOR.CTRL + 86 /*V*/, 'Paste' ],
-	[ CKEDITOR.CTRL + 45 /*INS*/, true ],
-	[ CKEDITOR.SHIFT + 45 /*INS*/, 'Paste' ],
-	[ CKEDITOR.CTRL + 88 /*X*/, 'Cut' ],
-	[ CKEDITOR.SHIFT + 46 /*DEL*/, 'Cut' ],
-	[ CKEDITOR.CTRL + 90 /*Z*/, 'Undo' ],
-	[ CKEDITOR.CTRL + 89 /*Y*/, 'Redo' ],
-	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 /*Z*/, 'Redo' ],
-	[ CKEDITOR.CTRL + 76 /*L*/, 'Link' ],
-	[ CKEDITOR.CTRL + 66 /*B*/, 'Bold' ],
-	[ CKEDITOR.CTRL + 73 /*I*/, 'Italic' ],
-	[ CKEDITOR.CTRL + 85 /*U*/, 'Underline' ],
-	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 /*S*/, 'Save' ],
-	[ CKEDITOR.CTRL + CKEDITOR.ALT + 13 /*ENTER*/, 'FitWindow' ]
-] ;
+/*CKEDITOR.config.keystrokes = [
+	[ CKEDITOR.CTRL + 65 *//*A*//*, true ],
+	[ CKEDITOR.CTRL + 67 *//*C*//*, true ],
+	[ CKEDITOR.CTRL + 70 *//*F*//*, true ],
+	[ CKEDITOR.CTRL + 83 *//*S*//*, true ],
+	[ CKEDITOR.CTRL + 84 *//*T*//*, true ],
+	[ CKEDITOR.CTRL + 88 *//*X*//*, true ],
+	[ CKEDITOR.CTRL + 86 *//*V*//*, 'Paste' ],
+	[ CKEDITOR.CTRL + 45 *//*INS*//*, true ],
+	[ CKEDITOR.SHIFT + 45 *//*INS*//*, 'Paste' ],
+	[ CKEDITOR.CTRL + 88 *//*X*//*, 'Cut' ],
+	[ CKEDITOR.SHIFT + 46 *//*DEL*//*, 'Cut' ],
+	[ CKEDITOR.CTRL + 90 *//*Z*//*, 'Undo' ],
+	[ CKEDITOR.CTRL + 89 *//*Y*//*, 'Redo' ],
+	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 *//*Z*//*, 'Redo' ],
+	[ CKEDITOR.CTRL + 76 *//*L*//*, 'Link' ],
+	[ CKEDITOR.CTRL + 66 *//*B*//*, 'Bold' ],
+	[ CKEDITOR.CTRL + 73 *//*I*//*, 'Italic' ],
+	[ CKEDITOR.CTRL + 85 *//*U*//*, 'Underline' ],
+	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 *//*S*//*, 'Save' ],
+	[ CKEDITOR.CTRL + CKEDITOR.ALT + 13 *//*ENTER*//*, 'FitWindow' ]
+] ;*/
 
 //CKEDITOR.config.menu_groups = 'generic,anchor,flash,select,textarea,checkbox,radio,textfield,hiddenfield,imagebutton,button,bulletedlist,numberedlist,table,form';
 
Index: core/admin_templates/incs/custom_blocks.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/incs/custom_blocks.tpl	(revision 15892)
+++ core/admin_templates/incs/custom_blocks.tpl	(revision )
@@ -116,7 +116,7 @@
 			<inp2:m_if check="FieldEquals" field="ElementType" value="textarea">
 				<br/>
 				<inp2:{$SourcePrefix}_InputName field="$virtual_field" result_to_var="input_name"/>
-				<a href="<inp2:m_Link template='popups/editor' TargetField='$input_name' pass_through='TargetField' pass='m,$SourcePrefix'/>" onclick="openSelector('<inp2:m_Param name='SourcePrefix' js_escape='1'/>', this.href, '', '800x575'); return false;">
+				<a href="<inp2:m_Link template='popups/editor' TargetField='$input_name' pass_through='TargetField' pass='m,$SourcePrefix'/>" onclick="openSelector('<inp2:m_Param name='SourcePrefix' js_escape='1'/>', this.href, '', '950x600'); return false;">
 					<img src="img/icons/icon24_link_editor.gif" border="0">
 				</a>
 			</inp2:m_if>
Index: core/kernel/db/db_tag_processor.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/kernel/db/db_tag_processor.php	(revision 15892)
+++ core/kernel/db/db_tag_processor.php	(revision )
@@ -2642,7 +2642,7 @@
 		$oCKeditor->returnOutput = true;
 
 		$events = Array (
-			'configLoaded' => 'function(ev) { ev.editor.addCss(ev.editor.config.extraCss); }',
+			'configLoaded' => 'function(ev) { CKEDITOR.addCss(ev.editor.config.extraCss); }',
 		);
 
 		return $oCKeditor->editor($name, $value, Array (), $events);
\ No newline at end of file
Index: core/admin_templates/categories/edit_content.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/categories/edit_content.tpl	(revision 15892)
+++ core/admin_templates/categories/edit_content.tpl	(revision )
@@ -1,4 +1,4 @@
-<inp2:adm_SetPopupSize width="700" height="600"/>
+<inp2:adm_SetPopupSize width="950" height="600"/>
 <inp2:m_include t="incs/header"/>
 
 <inp2:m_NoDebug/>
\ No newline at end of file
Index: admin/system_presets/simple/inp_ckconfig.js
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- admin/system_presets/simple/inp_ckconfig.js	(revision 15892)
+++ admin/system_presets/simple/inp_ckconfig.js	(revision )
@@ -20,8 +20,10 @@
 
 //CKEDITOR.config.PluginsPath = CKEDITOR.config.BasePath + 'plugins/' ;
 
-CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize,MediaEmbed';
+CKEDITOR.config.entities = false;
 
+CKEDITOR.config.extraPlugins = 'my_link,my_document,my_maximize';
+
 //CKEDITOR.plugins.add('MySource');
 //CKEDITOR.plugins.add('MyPreview');
 //CKEDITOR.plugins.add('MyLink');
@@ -36,7 +38,7 @@
 	['Styles'],
 	['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat'],
 	['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
-	['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo'],
+	['Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Image', 'Document', 'MediaEmbed', 'Link', '-', 'Undo', 'Redo'],
 	['Find', 'Replace', 'Scayt']
 ];
 
@@ -67,28 +69,28 @@
 CKEDITOR.config.enterMode = CKEDITOR.ENTER_BR ;		// p | div | br
 CKEDITOR.config.shiftEnterMode = CKEDITOR.ENTER_P ;	// p | div | br
 
-CKEDITOR.config.keystrokes = [
-	[ CKEDITOR.CTRL + 65 /*A*/, true ],
-	[ CKEDITOR.CTRL + 67 /*C*/, true ],
-	[ CKEDITOR.CTRL + 70 /*F*/, true ],
-	[ CKEDITOR.CTRL + 83 /*S*/, true ],
-	[ CKEDITOR.CTRL + 84 /*T*/, true ],
-	[ CKEDITOR.CTRL + 88 /*X*/, true ],
-	[ CKEDITOR.CTRL + 86 /*V*/, 'Paste' ],
-	[ CKEDITOR.CTRL + 45 /*INS*/, true ],
-	[ CKEDITOR.SHIFT + 45 /*INS*/, 'Paste' ],
-	[ CKEDITOR.CTRL + 88 /*X*/, 'Cut' ],
-	[ CKEDITOR.SHIFT + 46 /*DEL*/, 'Cut' ],
-	[ CKEDITOR.CTRL + 90 /*Z*/, 'Undo' ],
-	[ CKEDITOR.CTRL + 89 /*Y*/, 'Redo' ],
-	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 /*Z*/, 'Redo' ],
-	[ CKEDITOR.CTRL + 76 /*L*/, 'Link' ],
-	[ CKEDITOR.CTRL + 66 /*B*/, 'Bold' ],
-	[ CKEDITOR.CTRL + 73 /*I*/, 'Italic' ],
-	[ CKEDITOR.CTRL + 85 /*U*/, 'Underline' ],
-	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 /*S*/, 'Save' ],
-	[ CKEDITOR.CTRL + CKEDITOR.ALT + 13 /*ENTER*/, 'FitWindow' ]
-] ;
+/*CKEDITOR.config.keystrokes = [
+	[ CKEDITOR.CTRL + 65 *//*A*//*, true ],
+	[ CKEDITOR.CTRL + 67 *//*C*//*, true ],
+	[ CKEDITOR.CTRL + 70 *//*F*//*, true ],
+	[ CKEDITOR.CTRL + 83 *//*S*//*, true ],
+	[ CKEDITOR.CTRL + 84 *//*T*//*, true ],
+	[ CKEDITOR.CTRL + 88 *//*X*//*, true ],
+	[ CKEDITOR.CTRL + 86 *//*V*//*, 'Paste' ],
+	[ CKEDITOR.CTRL + 45 *//*INS*//*, true ],
+	[ CKEDITOR.SHIFT + 45 *//*INS*//*, 'Paste' ],
+	[ CKEDITOR.CTRL + 88 *//*X*//*, 'Cut' ],
+	[ CKEDITOR.SHIFT + 46 *//*DEL*//*, 'Cut' ],
+	[ CKEDITOR.CTRL + 90 *//*Z*//*, 'Undo' ],
+	[ CKEDITOR.CTRL + 89 *//*Y*//*, 'Redo' ],
+	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 90 *//*Z*//*, 'Redo' ],
+	[ CKEDITOR.CTRL + 76 *//*L*//*, 'Link' ],
+	[ CKEDITOR.CTRL + 66 *//*B*//*, 'Bold' ],
+	[ CKEDITOR.CTRL + 73 *//*I*//*, 'Italic' ],
+	[ CKEDITOR.CTRL + 85 *//*U*//*, 'Underline' ],
+	[ CKEDITOR.CTRL + CKEDITOR.SHIFT + 83 *//*S*//*, 'Save' ],
+	[ CKEDITOR.CTRL + CKEDITOR.ALT + 13 *//*ENTER*//*, 'FitWindow' ]
+] ;*/
 
 //CKEDITOR.config.menu_groups = 'generic,anchor,flash,select,textarea,checkbox,radio,textfield,hiddenfield,imagebutton,button,bulletedlist,numberedlist,table,form';
 
Index: core/admin_templates/incs/form_blocks.tpl
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- core/admin_templates/incs/form_blocks.tpl	(revision 15892)
+++ core/admin_templates/incs/form_blocks.tpl	(revision )
@@ -502,7 +502,7 @@
 	<inp2:m_if check="m_Param" name="allow_html">
 		<br>
 		<inp2:{$prefix}_InputName field="$field" result_to_var="input_name"/>
-		<a href="<inp2:m_Link template='$edit_template' TargetField='$input_name' pass_through='TargetField' pass='m,$prefix'/>" onclick="openSelector('<inp2:m_Param name='prefix' js_escape='1'/>', this.href, '', '800x575'); return false;">
+		<a href="<inp2:m_Link template='$edit_template' TargetField='$input_name' pass_through='TargetField' pass='m,$prefix'/>" onclick="openSelector('<inp2:m_Param name='prefix' js_escape='1'/>', this.href, '', '950x600'); return false;">
 			<img src="img/icons/icon24_link_editor.gif" border="0">
 		</a>
 	</inp2:m_if>