X-Git-Url: https://svn.cri.ensmp.fr/git/ckeditor.git/blobdiff_plain/5f250f06a1725b57cdefa30f58b139b6d059ccc2..refs/heads/ckeditor4:/skins/ckeditor/config.js

diff --git a/skins/ckeditor/config.js b/skins/ckeditor/config.js
index 8fbf6ae..9aeb8f7 100644
--- a/skins/ckeditor/config.js
+++ b/skins/ckeditor/config.js
@@ -11,7 +11,7 @@ CKEDITOR.editorConfig = function( config )
 	
 	// toolbar
 	config.toolbar = [
-		{ name: 'styles',		items : [ 'Styles', 'Format', 'Font', 'FontSize' ] },
+		{ name: 'styles',		items : [ 'PlinnStyles','Format', 'Font', 'FontSize' ] },
 		{ name: 'colors',		items : [ 'TextColor', 'BGColor' ] },
 		{ name: 'document',		items : [ 'Maximize', 'ShowBlocks', 'Source'] },
 		{ name: 'editing',		items : [ 'Find','Replace', '-', 'SelectAll'] },
@@ -28,6 +28,7 @@ CKEDITOR.editorConfig = function( config )
 	
 	config.height = '500px';
 	config.contentsCss = CKEDITOR.basePath + 'global_plinn_style_editor.css';
+	config.allowedContent = true;
 	
 	config.filebrowserBrowseUrl = CKEDITOR.basePath + 'filemanager/browser/mac_finder/browser.html?Connector=connectors/plinn/connector';
 	CKEDITOR.config.filebrowserImageBrowseUrl = CKEDITOR.basePath + 'filemanager/browser/mac_finder/browser.html?Type=Image&Connector=connectors/plinn/connector';
@@ -35,5 +36,7 @@ CKEDITOR.editorConfig = function( config )
 	config.filebrowserWindowWidth = 801;
 	config.attachmentBrowserConnectorUrl = CKEDITOR.basePath + 'plugins/plinn_image/connectors/plinn/connector';
 	config.imageMaxDefaultDimension = 500 ; // image inserted will be cropped at this size.
-	config.extraPlugins = 'plinn_image';
+	config.extraPlugins = 'plinn_image,plinn_styles,codemirror';
+
+	config.stylesSet = 'plinn_styles:' + CKEDITOR.basePath + 'plinn_ckeditor_styles.js'; 
 };
\ No newline at end of file