X-Git-Url: https://scm.cri.ensmp.fr/git/ckeditor.git/blobdiff_plain/d4f7e17cf14c164b1da36fbfe44533aa0a90b7ab..refs/heads/master:/skins/ckeditor/config.js?ds=inline

diff --git a/skins/ckeditor/config.js b/skins/ckeditor/config.js
index 057a4e0..d0194a7 100644
--- a/skins/ckeditor/config.js
+++ b/skins/ckeditor/config.js
@@ -8,6 +8,8 @@ CKEDITOR.editorConfig = function( config )
 	// Define changes to default configuration here. For example:
 	// config.language = 'fr';
 	// config.uiColor = '#AADC6E';
+	
+	// toolbar
 	config.toolbar = [
 		{ name: 'styles',		items : [ 'Styles', 'Format', 'Font', 'FontSize' ] },
 		{ name: 'colors',		items : [ 'TextColor', 'BGColor' ] },
@@ -18,17 +20,20 @@ CKEDITOR.editorConfig = function( config )
 		{ name: 'basicstyles',	items : [ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
 		{ name: 'paragraph',	items : [ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'] },
 		{ name: 'links',		items : [ 'Link', 'Unlink', 'Anchor' ] },
-		{ name: 'insert',		items : [ 'Image', 'Flash', 'Table', 'HorizontalRule', 'SpecialChar', 'PageBreak'] },
+		{ name: 'insert',		items : [ 'PlinnImage', 'Flash', 'Table', 'HorizontalRule', 'SpecialChar', 'PageBreak'] },
 	];
 	
+	// context menu
 	config.menu_groups = 'tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash'
 	
 	config.height = '500px';
-	config.contentsCss = CKEDITOR.basePath + 'global_plinn_style.css';
+	config.contentsCss = CKEDITOR.basePath + 'global_plinn_style_editor.css';
 	
 	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';
 	config.filebrowserWindowHeight = 600;
 	config.filebrowserWindowWidth = 801;
-	
-	config.extraPlugins = 'selection,plinn_image';
+	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';
 };
\ No newline at end of file