From 9666e482e8e9b7fa212f060a25df93ac26ab4c7e Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 22 Mar 2020 15:29:15 +0100 Subject: [PATCH 1/2] [9.2.26] Tinymce : menu sticky --- core/vendor/tinymce/init.js | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/core/vendor/tinymce/init.js b/core/vendor/tinymce/init.js index 136522cd..5c2d8412 100755 --- a/core/vendor/tinymce/init.js +++ b/core/vendor/tinymce/init.js @@ -20,7 +20,7 @@ tinymce.init({ // Plugins plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor codesample", // Contenu de la barre d'outils - toolbar: "restoredraft | undo redo | bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | template code | image media link | fullscreen", + toolbar: "restoredraft | undo redo | formatselect bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | table template code | image media link | fullscreen", // CodeMirror codemirror: { indentOnInit: true, // Whether or not to indent code on init. @@ -66,7 +66,7 @@ tinymce.init({ // Pages internes link_list: baseUrl + "core/vendor/tinymce/links.php", // Contenu du menu contextuel - contextmenu: "selectall searchreplace | hr | media image link anchor | inserttable cell row column deletetable", + contextmenu: "selectall searchreplace | hr | media image link anchor | insertable cell row column deletetable", // Fichiers CSS à intégrer à l'éditeur content_css: [ baseUrl + "core/layout/common.css", @@ -204,10 +204,11 @@ tinymce.PluginManager.add('stickytoolbar', function(editor, url) { var container = editor.editorContainer; var toolbars = $(container).find('.mce-toolbar-grp'); var statusbar = $(container).find('.mce-statusbar'); + var menubar = $(container).find('.mce-menubar'); if (isSticky()) { $(container).css({ - paddingTop: toolbars.outerHeight() + paddingTop: menubar.outerHeight() }); if (isAtBottom()) { @@ -219,13 +220,21 @@ tinymce.PluginManager.add('stickytoolbar', function(editor, url) { borderBottom: 'none' }); } else { - toolbars.css({ - top: 45, - bottom: 'auto', - position: 'fixed', - width: $(container).width(), - borderBottom: '1px solid rgba(0,0,0,0.2)' - }); + menubar.css({ + top: 45, + bottom: 'auto', + position: 'fixed', + width: $(container).width(), + borderBottom: '1px solid rgba(0,0,0,0.2)', + background: '#fff' + }); + toolbars.css({ + top: 78, + bottom: 'auto', + position: 'fixed', + width: $(container).width(), + borderBottom: '1px solid rgba(0,0,0,0.2)' + }); } } else { $(container).css({ @@ -238,6 +247,12 @@ tinymce.PluginManager.add('stickytoolbar', function(editor, url) { width: 'auto', borderBottom: 'none' }); + menubar.css({ + top:0, + position: 'relative', + width: 'auto', + borderBottom: 'none' + }); } } From eeacf5494d9d1db142f2997934af84164a2ebb61 Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 22 Mar 2020 15:30:45 +0100 Subject: [PATCH 2/2] [9.2.26] changes --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 67ccebad..f5bb2ae9 100755 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,8 @@ ## version 9.2.26 - Corrections : - Amélioration de la gestion du thème administration. - - Arrière-plan TinymCE n'affiche plus l'arrière-plan du site mais la couleur du fond de la page. + - TinymCE : n'affiche plus l'arrière-plan du site mais la couleur du fond de la page. + - TinymCE : Menu sticky + options de barre d'outils ## version 9.2.25 - Corrections :