Ticket #2984: 2984.patch

_source/plugins/toolbar/plugin.js

@@ -112 +112 @@
                                                                 toolbarId = 'cke_' + CKEDITOR.tools.getNextNumber(),
                                                                 toolbarObj = { id : toolbarId, items : [] };
 
+                                                        if ( row === '/' )
+                                                        {
+                                                                output.push( '<div class="cke_break"></div>' );
+                                                                continue;
+                                                        }
+
                                                         output.push( '<div id="', toolbarId, '" class="cke_toolbar">' );
 
                                                         // Add the toolbar to the "editor.toolbox.toolbars"
@@ -205 +211 @@
  */
 CKEDITOR.config.toolbar =
 [
-        [
-                'Source', '-',
-                'NewPage', 'Preview', 'Templates', 'Print', '-',
-                'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-',
-                'Undo', 'Redo', '-',
-                'Find', 'Replace', '-',
-                'Bold', 'Italic', 'Underline', 'Strike', '-',
-                'NumberedList', 'BulletedList', '-',
-                'Outdent', 'Indent', 'Blockquote', '-',
-                'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-',
-                'Subscript', 'Superscript', '-',
-                'SelectAll', 'RemoveFormat', '-',
-                'Link', 'Unlink', 'Anchor', '-',
-                'Image', 'Flash', '-',
-                'Table', 'Smiley', 'HorizontalRule', 'SpecialChar', 'PageBreak', '-',
-                'ShowBlocks', '-',
-                'Format'
-        ]
+        ['Source','-','NewPage','Preview','-','Templates'],
+        ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print'],
+        ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+        '/',
+        ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
+        ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
+        ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+        ['Link','Unlink','Anchor'],
+        ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
+        '/',
+        ['Format'],
+        ['ShowBlocks']
 ];

_source/skins/default/toolbar.css

@@ -13 +13 @@
 
 .cke_skin_default .cke_toolbar
 {
-        padding: 5px;
+        padding-top: 1px;
+        padding-bottom: 1px;
         display:inline-block;
+        float:left;
 }
 
 .cke_skin_default .cke_separator
@@ -31 +33 @@
         float:right;
 }
 
+.cke_skin_default .cke_break
+{
+        float:left;
+        clear:left;
+}
+
 .cke_skin_default a.cke_button
 {
         border: solid 1px #efefde;