diff --git a/gulpfile.js b/gulpfile.js index 57ea3f20c..4716fd428 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -277,7 +277,7 @@ function srcFonts() { function ckeditor() { return gulp.src([ - config.nodeDirectory + '/ckeditor4/{adapters,lang,skins,plugins,core}/**/*.{js,json,css,png}', + config.nodeDirectory + '/ckeditor4/{adapters,lang,skins,plugins,core}/**/*.{js,json,css,png,gif,html}', config.nodeDirectory + '/ckeditor4/*.{js,css}', ]) .pipe(gulp.dest(config.production + '/' + config.paths.js + '/ckeditor')); diff --git a/include/top.php b/include/top.php index 9d7835e1c..c6e3843fa 100755 --- a/include/top.php +++ b/include/top.php @@ -213,7 +213,7 @@ if (Auth::check()) { ["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: "document", items : [ "Source", "ExportPdf", "Preview", "Print" ] }, { 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", diff --git a/modules/gestione_documentale/actions.php b/modules/gestione_documentale/actions.php index 77979cfca..dce348512 100755 --- a/modules/gestione_documentale/actions.php +++ b/modules/gestione_documentale/actions.php @@ -36,6 +36,7 @@ switch (post('op')) { $dbo->update('do_documenti', [ 'idcategoria' => post('idcategoria'), 'nome' => post('nome'), + 'descrizione' => post('descrizione') ?: null, 'data' => post('data') ?: null, ], ['id' => $id_record]); diff --git a/modules/gestione_documentale/edit.php b/modules/gestione_documentale/edit.php index dc6162850..b98efd5bf 100755 --- a/modules/gestione_documentale/edit.php +++ b/modules/gestione_documentale/edit.php @@ -37,8 +37,6 @@ include_once __DIR__.'/../../core.php'; {[ "type": "text", "label": "Nome", "name": "nome", "required": 1, "value": "$nome$", "extra": "" ]} - -