From 8eaffe46fe960f30cd4f86abd0c4cea1153ea489 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Tue, 25 Nov 2014 16:40:18 +0100
Subject: [PATCH] better fb9414b

---
 htmlarea/ckeditor_s9y_config.js | 8 +++++---
 templates/2k11/admin/style.css  | 9 ++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/htmlarea/ckeditor_s9y_config.js b/htmlarea/ckeditor_s9y_config.js
index 5ddb7d0c..2fa03090 100644
--- a/htmlarea/ckeditor_s9y_config.js
+++ b/htmlarea/ckeditor_s9y_config.js
@@ -157,7 +157,7 @@ CKEDITOR.editorConfig = function( config ) {
 //    console.log(JSON.stringify(config.toolbar_Standard));
 
     // in case of toolbar : Full (moved 'Source' and removed 'Font' buttons. 'Styles' and 'Preview' disabled overall. )
-    // With the css hidden fix for cke image button, it is not possible to move the s9ymediabuttons in this toolbar up. Leave it in others!
+    // With the css hidden fix for cke image button, it is not possible to move the s9ymediabuttons in this toolbar up. Leave it in others! (fixed with break apart paragraph, which sets needed CSS IDs to CKE FULL Toolbar only! )
     config.toolbar_Full = [
         { name: 'styles',      items : [ 'Styles','Format',/*'Font',*/'FontSize' ] },
         { name: 'basicstyles', items : [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ] },
@@ -165,12 +165,14 @@ CKEDITOR.editorConfig = function( config ) {
         { name: 'document',    items : [ /*'Source','-',*/'Save','NewPage','DocProps','Preview','Print','-','Templates' ] },
         { name: 'editing',     items : [ 'Find','Replace','-','SelectAll','-','SpellChecker', 'Scayt' ] },
         { name: 'forms',       items : [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
-        { name: 'paragraph',   items : [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ] },
+        { name: 'paragraph1',  items : [ 'NumberedList','BulletedList','-','Outdent','Indent','-','Blockquote','CreateDiv' ] },
+        { name: 'paragraph2',  items : [ 'JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ] },
         { name: 'links',       items : [ 'Link','Unlink','Anchor' ] },
+        { name: 's9yml', items : s9ymediabuttons },
         { name: 'insert',      items : [ 'Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak' ] },
         { name: 'colors',      items : [ 'TextColor','BGColor' ] },
         { name: 'mediaembed',  items : [ 'MediaEmbed' ] },
-        { name: 'others',      items : s9ypluginbuttonsAll },
+        { name: 'others',      items : s9ypluginbuttons },
         { name: 'tools',       items : [ 'Maximize', 'ShowBlocks','-','About' ] },
         { name: 'document', groups : [ 'mode', 'document', 'doctools' ], items : [ 'Source' ] },
         { name: 'cheatsheet',  items : ['CheatSheet'] }
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 1fb3d060..0ec4a247 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -2346,7 +2346,9 @@ input[name="serendipity[filter][fileCategory]"] {
 
 /* CKEDITOR Toolbar */
 /* hide cke-image button to support the internal functionality needed for MediaLibrary inserts, but disables the button to eyes, if not in CKE PRESET Toolbar (#65) */
-.cke_toolgroup a.cke_button__image:not(#cke_65) {
+/* Sadly firefox and chrome engines count differently in second textarea, DOM ID 65/146 in FF is 67/150 in Chrome. There is a need to put this into engines only media device */
+#cke_1_top .cke_toolgroup a.cke_button__image:not(#cke_65),
+#cke_2_top .cke_toolgroup a.cke_button__image:not(#cke_146):not(#cke_150) {
     display: none !important;
     visibility: hidden;
     height: 0 !important;
@@ -2354,7 +2356,8 @@ input[name="serendipity[filter][fileCategory]"] {
     border-radius: 0 !important;
 }
 /* hide next sibling separator */
-.cke_toolgroup a.cke_button__image:not(#cke_65)~.cke_toolbar_separator {
+#cke_1_top .cke_toolgroup a.cke_button__image:not(#cke_65)~.cke_toolbar_separator,
+#cke_2_top .cke_toolgroup a.cke_button__image:not(#cke_67)~.cke_toolbar_separator {
     display: none;
     visibility: hidden;
     margin: 0px;
@@ -2363,7 +2366,7 @@ input[name="serendipity[filter][fileCategory]"] {
     border-radius: 0 !important;
 }
 /* hide empty image toolgroup in toolbar BASIC (do not remove the span tag!) */
-span#cke_27 {
+#cke_1_top span#cke_27, #cke_2_top span#cke_63, #cke_2_top span#cke_67 {
     display: none;
     visibility: hidden;
     width: 0 !important;