diff --git a/assets/src/js/functions/textarea.js b/assets/src/js/functions/textarea.js index 4ae460943..1681e0fb2 100644 --- a/assets/src/js/functions/textarea.js +++ b/assets/src/js/functions/textarea.js @@ -90,14 +90,18 @@ function initCKEditor(input) { if (instance) { instance.destroy(); } - + // Avvio di CKEditor CKEDITOR.replace(name, { - toolbar: globals.ckeditorToolbar, + toolbar: (input.hasAttribute('use_full_ckeditor')) ? globals.ckeditorToolbar_Full : globals.ckeditorToolbar, language: globals.locale, scayt_autoStartup: true, scayt_sLang: globals.full_locale, disableNativeSpellChecker: false, + fullPage: (input.hasAttribute('use_full_ckeditor')) ? true : false, + allowedContent: (input.hasAttribute('use_full_ckeditor')) ? true : false, + extraPlugins: 'scayt', + skin: 'moono-lisa', }); // Gestione di eventi noti diff --git a/gulpfile.js b/gulpfile.js index 9d4780587..a4518f700 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -275,8 +275,8 @@ function srcFonts() { function ckeditor() { return gulp.src([ - config.nodeDirectory + '/ckeditor4-dev/{adapters,lang,skins,plugins,core}/**/*.{js,json,css,png}', - config.nodeDirectory + '/ckeditor4-dev/*.{js,css}', + config.nodeDirectory + '/ckeditor4/{adapters,lang,skins,plugins,core}/**/*.{js,json,css,png}', + config.nodeDirectory + '/ckeditor4/*.{js,css}', ]) .pipe(gulp.dest(config.production + '/' + config.paths.js + '/ckeditor')); } @@ -346,7 +346,7 @@ function i18n() { config.nodeDirectory + '/**/{i18n,lang,locale,locales}/*.{js,json}', config.development + '/' + config.paths.js + '/i18n/**/*.{js,json}', '!' + config.nodeDirectory + '/**/{src,plugins}/**', - '!' + config.nodeDirectory + '/ckeditor4-dev/**', + '!' + config.nodeDirectory + '/ckeditor4/**', '!' + config.nodeDirectory + '/summernote/**', '!' + config.nodeDirectory + '/jquery-ui/**', ]) diff --git a/include/top.php b/include/top.php index 23171f2df..05721121c 100755 --- a/include/top.php +++ b/include/top.php @@ -198,9 +198,25 @@ if (Auth::check()) { end_date_formatted: "'.Translator::dateToLocale($_SESSION['period_end']).'", ckeditorToolbar: [ - ["Undo","Redo","-","Cut","Copy","Paste","PasteText","PasteFromWord","-","Scayt", "-","Link","Unlink","-","Bold","Italic","Underline","Superscript","SpecialChar","HorizontalRule","-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","NumberedList","BulletedList","Outdent","Indent","Blockquote","-","Styles","Format","Image","Table", "TextColor", "BGColor" ], + ["Undo","Redo","-","Cut","Copy","Paste","PasteText","PasteFromWord","-","SpellChecker", "Scayt", "-","Link","Unlink","-","Bold","Italic","Underline","Superscript","SpecialChar","HorizontalRule","-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","NumberedList","BulletedList","Outdent","Indent","Blockquote","-","Styles","Format","Image","Table", "TextColor", "BGColor" ], ], - + ckeditorToolbar_Full: [ + { name: "document", items : [ "Source" ] }, + { name: "clipboard", items : [ "Cut","Copy","Paste","PasteText","PasteFromWord","-","Undo","Redo" ] }, + { name: "editing", items : [ "Find","Replace","-","SelectAll","-","SpellChecker", "Scayt" ] }, + { name: "forms", items : [ "Form", "Checkbox", "Radio", "TextField", "Textarea", "Select", "Button", "ImageButton", + "HiddenField" ] }, + "/", + { name: "basicstyles", items : [ "Bold","Italic","Underline","Strike","Subscript","Superscript","-","RemoveFormat" ] }, + { name: "paragraph", items : [ "NumberedList","BulletedList","-","Outdent","Indent","-","Blockquote","CreateDiv", + "-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","BidiLtr","BidiRtl" ] }, + { name: "links", items : [ "Link","Unlink","Anchor" ] }, + { name: "insert", items : [ "Image","Flash","Table","HorizontalRule","Smiley","SpecialChar","PageBreak","Iframe" ] }, + "/", + { name: "styles", items : [ "Styles","Format","Font","FontSize" ] }, + { name: "colors", items : [ "TextColor","BGColor" ] }, + { name: "tools", items : [ "Maximize", "ShowBlocks","-","About" ] } + ], order_manager_id: "'.($dbo->isInstalled() ? Modules::get('Stato dei servizi')['id'] : '').'", dataload_page_buffer: '.setting('Lunghezza in pagine del buffer Datatables').', tempo_attesa_ricerche: '.setting('Tempo di attesa ricerche in secondi').', @@ -273,11 +289,29 @@ if (Auth::check()) { echo ''; echo ' '; } } diff --git a/modules/interventi/edit.php b/modules/interventi/edit.php index 8c22fa82f..d77320404 100755 --- a/modules/interventi/edit.php +++ b/modules/interventi/edit.php @@ -385,12 +385,17 @@ echo '
-
- - -
-
-
+ + + +
+
+
"; + } + ?>
diff --git a/modules/movimenti/add.php b/modules/movimenti/add.php index b7473a09e..539ae8dc9 100755 --- a/modules/movimenti/add.php +++ b/modules/movimenti/add.php @@ -94,9 +94,14 @@ echo ' '; -if (setting('Attiva scorciatoie da tastiera')) { - echo ' -'; -} echo '