Migration vers version 4 : restauration des outils. Prise en charge de 'allowedConten...

diff --git a/skins/ckeditor/config.js b/skins/ckeditor/config.js
index ea4ff0d..8fbf6ae 100644 (file)
--- a/skins/ckeditor/config.js
+++ b/skins/ckeditor/config.js
@@ -1,10 +1,39 @@
-/**
- * @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.html or http://ckeditor.com/license
- */
+/*
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/

 
 

-CKEDITOR.editorConfig = function( config ) {
+CKEDITOR.editorConfig = function( config )
+{

        // Define changes to default configuration here. For example:
        // config.language = 'fr';
        // config.uiColor = '#AADC6E';
        // 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' ] },
+               { name: 'document',             items : [ 'Maximize', 'ShowBlocks', 'Source'] },
+               { name: 'editing',              items : [ 'Find','Replace', '-', 'SelectAll'] },
+               { name: 'clipboard',    items : [ 'PasteFromWord', '-', 'Undo', 'Redo' ] },
+               '/',
+               { 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 : [ '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_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.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

diff --git a/skins/ckeditor/plugins/plinn_image/plugin.js b/skins/ckeditor/plugins/plinn_image/plugin.js
index ffb96fe..7e343ce 100644 (file)
--- a/skins/ckeditor/plugins/plinn_image/plugin.js
+++ b/skins/ckeditor/plugins/plinn_image/plugin.js
@@ -59,10 +59,15 @@ CKEDITOR.plugins.add( 'plinn_image',
                        );
                });
                var pluginPath = this.path;
                        );
                });
                var pluginPath = this.path;

+               var allowed = 'img[alt,!src]{border-style,border-width,float,height,margin,margin-bottom,margin-left,margin-right,margin-top,width}';
+               var required = 'img[alt,src]';

                var command = editor.addCommand('plinn_image',
                        {
                var command = editor.addCommand('plinn_image',
                        {

-                               exec : function(editor){openPlinnImageDialog(pluginPath, editor);}
-                       });
+                               exec : function(editor){openPlinnImageDialog(pluginPath, editor);},
+                               allowedContent: allowed,
+                               requiredContent: required
+                       }
+               );

                
                editor.ui.addButton('PlinnImage',
                        {
                
                editor.ui.addButton('PlinnImage',
                        {


@@ -71,6 +76,7 @@ CKEDITOR.plugins.add( 'plinn_image',
                                command : 'plinn_image'
                        });
        }
                                command : 'plinn_image'
                        });
        }

+       

 });
 
 })();
 });
 
 })();