From 77033efcf4da977f85e7f287ca084c0ded0a3459 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Wed, 26 Nov 2014 10:14:23 +0100
Subject: [PATCH] move cke toolbar css tweaks to a better place

which also makes it independent from cke plugin file usage.

References #148
---
 htmlarea/s9y_cketoolbar.css           | 28 ++++++++++++++++++++++++++
 templates/2k11/admin/style.css        | 29 ---------------------------
 templates/2k11/admin/wysiwyg_init.tpl |  7 +++++--
 3 files changed, 33 insertions(+), 31 deletions(-)
 create mode 100644 htmlarea/s9y_cketoolbar.css

diff --git a/htmlarea/s9y_cketoolbar.css b/htmlarea/s9y_cketoolbar.css
new file mode 100644
index 00000000..fd13b7b6
--- /dev/null
+++ b/htmlarea/s9y_cketoolbar.css
@@ -0,0 +1,28 @@
+/* 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) {
+    display: none !important;
+    visibility: hidden;
+    height: 0 !important;
+    padding: 0 !important;
+    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 {
+    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 {
+    display: none;
+    visibility: hidden;
+    width: 0 !important;
+}
+/* end CKEDITOR fixes */
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index d5d8cc1c..9840e34a 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -2344,35 +2344,6 @@ input[name="serendipity[filter][fileCategory]"] {
 }
 /* end TEMP fixes */
 
-/* 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) */
-/* 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) {
-    display: none !important;
-    visibility: hidden;
-    height: 0 !important;
-    padding: 0 !important;
-    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 {
-    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 {
-    display: none;
-    visibility: hidden;
-    width: 0 !important;
-}
-/* end CKEDITOR fixes */
-
 /* MAGNIFIC POPUP  */
 .mfp-bg {
   top: 0;
diff --git a/templates/2k11/admin/wysiwyg_init.tpl b/templates/2k11/admin/wysiwyg_init.tpl
index 167aaef7..9c478abe 100644
--- a/templates/2k11/admin/wysiwyg_init.tpl
+++ b/templates/2k11/admin/wysiwyg_init.tpl
@@ -1,6 +1,9 @@
 {if $init == false}
-    <script src="{$serendipityHTTPPath}htmlarea/ckeditor/ckeditor/ckeditor.js"></script>
-    <script src="{$wysiwyg_customPlugin}"></script>
+
+<link rel="stylesheet" href="{$serendipityHTTPPath}htmlarea/s9y_cketoolbar.css">
+<script src="{$serendipityHTTPPath}htmlarea/ckeditor/ckeditor/ckeditor.js"></script>
+<script src="{$wysiwyg_customPlugin}"></script>
+
 {/if}
 <script>
     $('document').ready(function() {