Merge branch 'dev'

bin/backend/utils/openSettings.js

+/**
+ * @module package/quiqqer/ckeditor4/bin/backend/utils/openSettings
+ * @author www.pcsg.de (Henning Leutz)
+ */
+define('package/quiqqer/ckeditor4/bin/backend/utils/openSettings', function () {
+    "use strict";
+
+    return function (Panel) {
+        require([
+            'controls/editors/Settings',
+            'utils/Panels'
+        ], function (Editor, PanelUtils) {
+            PanelUtils.openPanelInTasks(new Editor());
+        });
+
+        Panel.getCategoryBar().getChildren()[0].click();
+    };
+});
\ No newline at end of file

locale.xml

@@ -10,6 +10,10 @@
             <de><![CDATA[Integration des CKEditor in QUIQQER.]]></de>
             <en><![CDATA[Integrate the CKEditor into QUIQQER.]]></en>
         </locale>
+        <locale name="editors.settings.title">
+            <de><![CDATA[Inhaltseditor (CKEditor)]]></de>
+            <en><![CDATA[Content editor (CKEditor)]]></en>
+        </locale>
         <locale name="exception.plugin.activate.plugin.not.found">
             <de><![CDATA[Das angegeben Plugin wurde nicht gefunden.]]></de>
             <en><![CDATA[The provided plugin was not found.]]></en>
@@ -118,6 +122,11 @@
             </en>
         </locale>
 
+        <locale name="editors.settings.toolbars">
+            <de><![CDATA[Toolbar Verwaltung]]></de>
+            <en><![CDATA[Toolbar Administration]]></en>
+        </locale>
+
         <!-- Permissions -->
         <locale name="permission.quiqqer.editors.ckeditor._header">
             <de><![CDATA[CKEditor]]></de>

plugins/activePlugins.json

 [
   "about",
   "ajax",
-  "autoembed",
   "autolink",
   "balloonpanel",
   "clipboard",
@@ -13,7 +12,6 @@
   "dialogadvtab",
   "div",
   "embed",
-  "embedbase",
   "find",
   "font",
   "html5audio",

settings.xml

@@ -13,7 +13,9 @@
 
 
         <window>
-            <title>CKEditor</title>
+            <title>
+                <locale group="quiqqer/ckeditor4" var="editors.settings.title"/>
+            </title>
             <params>
                 <icon>fa fa-file-text</icon>
             </params>
@@ -48,11 +50,19 @@
                                type="hidden"
                                data-qui="package/quiqqer/ckeditor4/bin/backend/controls/settings/Plugins"
                         />
-
                     </settings>
+                </category>
 
+                <category name="toolbars"
+                          require="package/quiqqer/ckeditor4/bin/backend/utils/openSettings"
+                >
+                    <text>
+                        <locale group="quiqqer/ckeditor4" var="editors.settings.toolbars"/>
+                    </text>
+                    <icon>fa fa-font</icon>
                 </category>
 
+
             </categories>
         </window>