CKEditor - popravljen toolbar, zamenjano ozadje, popravki izgleda

admin/survey/script/vprasanjeInline.js

@@ -948,7 +948,7 @@ function inline_load_editor (_this) {
             var def_pogoj = 'default="'+def_text+'"';
 
 		el.replaceWith('<textarea name="naslov_'+spr_id+'" id="naslov_'+spr_id+'" style="width:99%" '+def_pogoj+'>'+el.html()+'</textarea>'+
-		'<div class="button_holder top8 bottom0"><button class="small blue" onclick="inline_save_editor(\''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
+		'<div class="button_holder editor_button_holder"><button class="small blue" onclick="inline_save_editor(\''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
 		
 		editor_display(spr_id);
 	}
@@ -967,7 +967,7 @@ function inline_load_editor_hotspot (_this, vre_id) {
         var def_pogoj = 'default="'+def_text+'"';
     
     el.replaceWith('<textarea name="hotspot_image_'+vre_id+'" id="hotspot_image_'+vre_id+'" style="width:99%" '+def_pogoj+'>'+el.html()+'</textarea>'+
-    '<div class="button_holder top8 bottom0"><button class="medium blue" onclick="inline_save_editor_hotspot(\''+vre_id+'\', \''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
+    '<div class="button_holder editor_button_holder"><button class="medium blue" onclick="inline_save_editor_hotspot(\''+vre_id+'\', \''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
     
     editor_display_hotspot(vre_id);	
 }

editors/ckeditor_4_4/config.js

@@ -13,12 +13,33 @@ var site_url = $('#srv_site_url').val();
 var lang_code = 'sl';
 
 CKEDITOR.editorConfig = function (config) {
-    //config.language = 'sl';
+    
-    config.skin = 'moonocolor';
+    //config.skin = 'moonocolor';
+    config.skin = 'moono-lisa';
+    config.uiColor = '#FFFFFF';
+
+    config.removePlugins = 'elementspath, resize';
 
     lang_code = config.language;
 
+
     config.toolbar = [
+        {name: 'source', items: ['Source']},
+        {name: 'clipboard', items: ['Undo', 'Redo', 'PasteText','RemoveFormat']},
+        {name: 'font-type', items: ['Font']},
+        {name: 'font-size', items: ['FontSize']},
+        {name: 'basicstyles', items: ['Bold', 'Italic', 'Underline']},
+        {name: 'colors', items: ['TextColor', 'BGColor']},
+        {name: 'align', items: ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock']},
+        {name: 'list', items: ['NumberedList', 'BulletedList']},
+        {name: 'links', items: ['Link', 'Unlink', 'Image']},
+        '/',
+        {name: 'other', items: ['Scayt', 'Strike', 'SpecialChar']},
+        {name: 'vec', items:['Styles', 'Format', 'Outdent', 'Indent', 'HorizontalRule']},
+        {name: 'insert', items: ['CreateDiv', 'Flash', 'Table', 'IFrame', 'Youtube', 'Abbr']},
+    ];
+
+    /*config.toolbar = [
         {name: 'document', items: ['Source', '-']},
         {name: 'clipboard', items: ['PasteText','RemoveFormat', 'Undo', 'Redo', 'Scayt']},
         {name: 'basicstyles', items: ['Bold', 'Underline', 'Italic', 'Strike', '-']},
@@ -27,7 +48,7 @@ CKEDITOR.editorConfig = function (config) {
         {name: 'paragraph', items: ['NumberedList', 'BulletedList', '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock','-']},
         {name: 'insert', items: ['CreateDiv', 'Flash', 'Table', 'IFrame', 'Youtube', 'Abbr']},
         {name: 'vec', items:['-', 'Styles', 'Format',  'FontSize', 'Font',  'Outdent', 'Indent', 'HorizontalRule']}
-    ];
+    ];*/
 
     config.toolbar_Full = [
         {name: 'document', items: ['Source', '-']},

editors/ckeditor_4_4/skins/moono-lisa/dev/locations.json

@@ -0,0 +1,144 @@
+{
+	"0": [
+		[
+			"plugins/sourcearea/icons/source.png",
+			"plugins/sourcedialog/icons/sourcedialog.png"
+		],
+		[
+			"plugins/sourcearea/icons/source-rtl.png",
+			"plugins/sourcedialog/icons/sourcedialog-rtl.png"
+		],
+		"plugins/save/icons/save.png",
+		"plugins/newpage/icons/newpage.png",
+		"plugins/newpage/icons/newpage-rtl.png",
+		"plugins/preview/icons/preview.png",
+		"plugins/preview/icons/preview-rtl.png",
+		"plugins/print/icons/print.png",
+		[
+			"plugins/templates/icons/templates.png",
+			"plugins/templates/icons/templates-rtl.png"
+		],
+		"plugins/docprops/icons/docprops.png",
+		"plugins/docprops/icons/docprops-rtl.png"
+	],
+	"1": [
+		[
+			"plugins/clipboard/icons/cut-rtl.png",
+			"plugins/clipboard/icons/cut.png"
+		],
+		[
+			"plugins/clipboard/icons/copy.png",
+			"plugins/clipboard/icons/copy-rtl.png"
+		],
+		[
+			"plugins/clipboard/icons/paste.png",
+			"plugins/clipboard/icons/paste-rtl.png"
+		],
+		"plugins/pastetext/icons/pastetext.png",
+		"plugins/pastetext/icons/pastetext-rtl.png",
+		"plugins/pastefromword/icons/pastefromword.png",
+		"plugins/pastefromword/icons/pastefromword-rtl.png",
+		"plugins/undo/icons/undo.png",
+		"plugins/undo/icons/undo-rtl.png",
+		"plugins/undo/icons/redo.png",
+		"plugins/undo/icons/redo-rtl.png"
+	],
+	"2": [
+		[
+			"plugins/find/icons/find-rtl.png",
+			"plugins/find/icons/find.png"
+		],
+		"plugins/find/icons/replace.png",
+		"plugins/selectall/icons/selectall.png",
+		[
+			"plugins/wsc/icons/spellchecker.png",
+			"plugins/scayt/icons/scayt.png"
+		]
+	],
+	"3": [
+		"plugins/forms/icons/form.png",
+		"plugins/forms/icons/checkbox.png",
+		"plugins/forms/icons/radio.png",
+		[
+			"plugins/forms/icons/textfield-rtl.png",
+			"plugins/forms/icons/textfield.png"
+		],
+		"plugins/forms/icons/textarea.png",
+		"plugins/forms/icons/textarea-rtl.png",
+		"plugins/forms/icons/select.png",
+		"plugins/forms/icons/select-rtl.png",
+		"plugins/forms/icons/button.png",
+		"plugins/forms/icons/imagebutton.png",
+		"plugins/forms/icons/hiddenfield.png"
+	],
+	"4": [
+		"plugins/basicstyles/icons/bold.png",
+		"plugins/basicstyles/icons/italic.png",
+		"plugins/basicstyles/icons/underline.png",
+		"plugins/basicstyles/icons/strike.png",
+		"plugins/basicstyles/icons/superscript.png",
+		"plugins/basicstyles/icons/subscript.png",
+		"plugins/removeformat/icons/removeformat.png"
+	],
+	"5": [
+		"plugins/list/icons/numberedlist.png",
+		"plugins/list/icons/numberedlist-rtl.png",
+		"plugins/list/icons/bulletedlist.png",
+		"plugins/list/icons/bulletedlist-rtl.png",
+		"plugins/indent/icons/outdent.png",
+		"plugins/indent/icons/indent.png",
+		"plugins/indent/icons/indent-rtl.png",
+		"plugins/indent/icons/outdent-rtl.png",
+		"plugins/blockquote/icons/blockquote.png",
+		"plugins/div/icons/creatediv.png",
+		"plugins/justify/icons/justifyleft.png",
+		"plugins/justify/icons/justifycenter.png",
+		"plugins/justify/icons/justifyright.png",
+		"plugins/justify/icons/justifyblock.png",
+		"plugins/bidi/icons/bidiltr.png",
+		"plugins/bidi/icons/bidirtl.png"
+	],
+	"6": [
+		"plugins/link/icons/link.png",
+		"plugins/link/icons/unlink.png",
+		"plugins/link/icons/anchor.png",
+		"plugins/link/icons/anchor-rtl.png",
+		"plugins/copyformatting/icons/copyformatting.png"
+	],
+	"7": [
+		[
+			"plugins/image/icons/image.png",
+			"plugins/image2/icons/image.png"
+		],
+		"plugins/table/icons/table.png",
+		"plugins/horizontalrule/icons/horizontalrule.png",
+		"plugins/smiley/icons/smiley.png",
+		"plugins/specialchar/icons/specialchar.png",
+		"plugins/pagebreak/icons/pagebreak.png",
+		"plugins/pagebreak/icons/pagebreak-rtl.png",
+		"plugins/iframe/icons/iframe.png"
+	],
+	"8": [
+		"plugins/colorbutton/icons/textcolor.png",
+		"plugins/colorbutton/icons/bgcolor.png"
+	],
+	"9": [
+		"plugins/maximize/icons/maximize.png",
+		"plugins/showblocks/icons/showblocks.png",
+		"plugins/showblocks/icons/showblocks-rtl.png"
+	],
+	"10": [
+		"plugins/about/icons/about.png",
+		"plugins/uicolor/icons/uicolor.png",
+		"plugins/placeholder/icons/placeholder.png",
+		"plugins/language/icons/language.png",
+		"plugins/codesnippet/icons/codesnippet.png"
+	],
+	"11": [
+		"plugins/link/images/anchor.png",
+		"skins/moono-lisa/images/close.png",
+		"skins/moono-lisa/images/lock.png",
+		"skins/moono-lisa/images/lock-open.png",
+		"skins/moono-lisa/images/refresh.png"
+	]
+}

editors/ckeditor_4_4/skins/moono-lisa/readme.md

@@ -0,0 +1,46 @@
+"Moono-lisa" Skin
+=================
+
+This skin has been made a **default skin** starting from CKEditor 4.6.0 and is maintained by the core developers.
+
+For more information about skins, please check the [CKEditor Skin SDK](https://ckeditor.com/docs/ckeditor4/latest/guide/skin_sdk_intro.html)
+documentation.
+
+Features
+-------------------
+"Moono-lisa" is a monochromatic skin, which offers a modern, flat and minimalistic look which blends very well in modern design.
+It comes with the following features:
+
+- Chameleon feature with brightness.
+- High-contrast compatibility.
+- Graphics source provided in SVG.
+
+Directory Structure
+-------------------
+
+CSS parts:
+- **editor.css**: the main CSS file. It's simply loading several other files, for easier maintenance,
+- **mainui.css**: the file contains styles of entire editor outline structures,
+- **toolbar.css**: the file contains styles of the editor toolbar space (top),
+- **richcombo.css**: the file contains styles of the rich combo ui elements on toolbar,
+- **panel.css**: the file contains styles of the rich combo drop-down, it's not loaded
+until the first panel open up,
+- **elementspath.css**: the file contains styles of the editor elements path bar (bottom),
+- **menu.css**: the file contains styles of all editor menus including context menu and button drop-down,
+it's not loaded until the first menu open up,
+- **dialog.css**: the CSS files for the dialog UI, it's not loaded until the first dialog open,
+- **reset.css**: the file defines the basis of style resets among all editor UI spaces,
+- **preset.css**: the file defines the default styles of some UI elements reflecting the skin preference,
+- **editor_XYZ.css** and **dialog_XYZ.css**: browser specific CSS hacks.
+
+Other parts:
+- **skin.js**: the only JavaScript part of the skin that registers the skin, its browser specific files and its icons and defines the Chameleon feature,
+- **images/**: contains a fill general used images,
+- **dev/**: contains SVG and PNG source of the skin icons.
+
+License
+-------
+
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+
+For licensing, see LICENSE.md or [https://ckeditor.com/legal/ckeditor-oss-license](https://ckeditor.com/legal/ckeditor-oss-license)

editors/ckeditor_4_4/skins/moono-lisa/skin.js

@@ -0,0 +1,7 @@
+/*
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+CKEDITOR.skin.name="moono-lisa";CKEDITOR.skin.ua_editor="ie,iequirks,ie8,gecko";CKEDITOR.skin.ua_dialog="ie,iequirks,ie8";
+CKEDITOR.skin.chameleon=function(){var b=function(){return function(b,d){for(var a=b.match(/[^#]./g),e=0;3>e;e++){var f=e,c;c=parseInt(a[e],16);c=("0"+(0>d?0|c*(1+d):0|c+(255-c)*d).toString(16)).slice(-2);a[f]=c}return"#"+a.join("")}}(),f={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_bottom [background-color:{defaultBackground};border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [background-color:{defaultBackground};outline-color:{defaultBorder};] {id} .cke_dialog_tab [background-color:{dialogTab};border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [background-color:{lightBackground};] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} a.cke_button_off:hover,{id} a.cke_button_off:focus,{id} a.cke_button_off:active [background-color:{darkBackground};border-color:{toolbarElementsBorder};] {id} .cke_button_on [background-color:{ckeButtonOn};border-color:{toolbarElementsBorder};] {id} .cke_toolbar_separator,{id} .cke_toolgroup a.cke_button:last-child:after,{id} .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after [background-color: {toolbarElementsBorder};border-color: {toolbarElementsBorder};] {id} a.cke_combo_button:hover,{id} a.cke_combo_button:focus,{id} .cke_combo_on a.cke_combo_button [border-color:{toolbarElementsBorder};background-color:{darkBackground};] {id} .cke_combo:after [border-color:{toolbarElementsBorder};] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover,{id} a.cke_path_item:focus,{id} a.cke_path_item:active [background-color:{darkBackground};] {id}.cke_panel [border-color:{defaultBorder};] "),panel:new CKEDITOR.template(".cke_panel_grouptitle [background-color:{lightBackground};border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active [background-color:{menubuttonHover};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
+return function(g,d){var a=b(g.uiColor,.4),a={id:"."+g.id,defaultBorder:b(a,-.2),toolbarElementsBorder:b(a,-.25),defaultBackground:a,lightBackground:b(a,.8),darkBackground:b(a,-.15),ckeButtonOn:b(a,.4),ckeResizer:b(a,-.4),ckeColorauto:b(a,.8),dialogBody:b(a,.7),dialogTab:b(a,.65),dialogTabSelected:"#FFF",dialogTabSelectedBorder:"#FFF",elementsPathColor:b(a,-.6),menubuttonHover:b(a,.1),menubuttonIcon:b(a,.5),menubuttonIconHover:b(a,.3)};return f[d].output(a).replace(/\[/g,"{").replace(/\]/g,"}")}}();

resources/sass/admin_new/components/form/button.scss

@@ -234,4 +234,13 @@ div.button_holder {
             margin-right: 0;
         }
     }
+
+    &.editor_button_holder{
+        margin: 0;
+        padding: 8px 16px; 
+
+        border-bottom: 1px rgb(204, 204, 204) solid;
+        border-left: 1px rgb(204, 204, 204) solid;
+        border-right: 1px rgb(204, 204, 204) solid;
+    }
 }