From b51b3dfb5980a94268158b98d590133295556d60 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Wed, 26 Nov 2014 10:52:32 +0100
Subject: [PATCH] simplify tb tweak in 77033ef

References #148
---
 htmlarea/s9y_cketoolbar.css           | 21 ++++++++++++---------
 templates/2k11/admin/wysiwyg_init.tpl |  2 ++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/htmlarea/s9y_cketoolbar.css b/htmlarea/s9y_cketoolbar.css
index fd13b7b6..9f1aff95 100644
--- a/htmlarea/s9y_cketoolbar.css
+++ b/htmlarea/s9y_cketoolbar.css
@@ -1,8 +1,13 @@
-/* CKEDITOR Toolbar tweaks */
-/* 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) */
-/* Sadly firefox and chrome engines count differently in textareas, DOM ID 65/146 in FF/IE is 67/150 in Chrome. */
-#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) {
+/*
+  CKEDITOR Toolbar tweak to hide the cke-image widget buttons.
+  Continues to support the internal image widget functionality needed for S9y-MediaLibrary inserts,
+  but disables these button to eyes, if USER is not using the CKE PRESET Toolbar!
+  Sadly firefox and chrome engines count node IDs differently in textareas,
+  which for the BASIC emptied image toolbar group is DOM ID 27/63 in FF/IE is 27/67 in Chrome.
+*/
+
+#cke_1_top .cke_toolgroup a.cke_button__image,
+#cke_2_top .cke_toolgroup a.cke_button__image {
     display: none !important;
     visibility: hidden;
     height: 0 !important;
@@ -10,14 +15,13 @@
     border-radius: 0 !important;
 }
 /* hide next sibling 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 {
+#cke_1_top .cke_toolgroup a.cke_button__image~.cke_toolbar_separator,
+#cke_2_top .cke_toolgroup a.cke_button__image~.cke_toolbar_separator {
     display: none;
     visibility: hidden;
     margin: 0px;
     height: 0px;
     width: 0px;
-    border-radius: 0 !important;
 }
 /* hide empty image toolgroup in toolbar BASIC (do not remove the span tag!) */
 #cke_1_top span#cke_27, #cke_2_top span#cke_63, #cke_2_top span#cke_67 {
@@ -25,4 +29,3 @@
     visibility: hidden;
     width: 0 !important;
 }
-/* end CKEDITOR fixes */
diff --git a/templates/2k11/admin/wysiwyg_init.tpl b/templates/2k11/admin/wysiwyg_init.tpl
index 9c478abe..129d8113 100644
--- a/templates/2k11/admin/wysiwyg_init.tpl
+++ b/templates/2k11/admin/wysiwyg_init.tpl
@@ -1,6 +1,8 @@
 {if $init == false}
 
+{if $wysiwygToolbar != 'CKE'}
 <link rel="stylesheet" href="{$serendipityHTTPPath}htmlarea/s9y_cketoolbar.css">
+{/if}
 <script src="{$serendipityHTTPPath}htmlarea/ckeditor/ckeditor/ckeditor.js"></script>
 <script src="{$wysiwyg_customPlugin}"></script>