Fix minori

This commit is contained in:
Luca 2021-10-25 16:39:37 +02:00
parent 38c649f2dc
commit 4b649cd020
4 changed files with 9 additions and 8 deletions

View File

@ -213,21 +213,22 @@ 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" ], ["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: [ ckeditorToolbar_Full: [
{ name: "document", items : [ "Source", "ExportPdf", "Preview", "Print" ] }, { name: "document", items : [ "Source", "ExportPdf", "Preview", "Print", "-", "Templates" ] },
{ name: "clipboard", items : [ "Cut","Copy","Paste","PasteText","PasteFromWord","-","Undo","Redo" ] }, { name: "clipboard", items : [ "Cut","Copy","Paste","PasteText","PasteFromWord","-","Undo","Redo" ] },
{ name: "editing", items : [ "Find","Replace","-","SelectAll","-","SpellChecker", "Scayt" ] }, { name: "editing", items : [ "Find","Replace","-","SelectAll","-","SpellChecker", "Scayt" ] },
{ name: "forms", items : [ "Form", "Checkbox", "Radio", "TextField", "Textarea", "Select", "Button", "ImageButton", { name: "forms", items : [ "Form", "Checkbox", "Radio", "TextField", "Textarea", "Select", "Button", "ImageButton",
"HiddenField" ] }, "HiddenField" ] },
"/", "/",
{ name: "basicstyles", items : [ "Bold","Italic","Underline","Strike","Subscript","Superscript","-","RemoveFormat" ] }, { name: "basicstyles", items : [ "Bold","Italic","Underline","Strike","Subscript","Superscript","-","CopyFormatting","RemoveFormat" ] },
{ name: "paragraph", items : [ "NumberedList","BulletedList","-","Outdent","Indent","-","Blockquote","CreateDiv", { name: "paragraph", items : [ "NumberedList","BulletedList","-","Outdent","Indent","-","Blockquote","CreateDiv",
"-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","BidiLtr","BidiRtl" ] }, "-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","BidiLtr","BidiRtl","Language" ] },
{ name: "links", items : [ "Link","Unlink","Anchor" ] }, { name: "links", items : [ "Link","Unlink","Anchor" ] },
{ name: "insert", items : [ "Image","Flash","Table","HorizontalRule","Smiley","SpecialChar","PageBreak","Iframe" ] }, { name: "insert", items : [ "Image","Flash","Table","HorizontalRule","Smiley","SpecialChar","PageBreak","Iframe" ] },
"/", "/",
{ name: "styles", items : [ "Styles","Format","Font","FontSize" ] }, { name: "styles", items : [ "Styles","Format","Font","FontSize" ] },
{ name: "colors", items : [ "TextColor","BGColor" ] }, { name: "colors", items : [ "TextColor","BGColor" ] },
{ name: "tools", items : [ "Maximize", "ShowBlocks","-","About" ] } { name: "tools", items : [ "Maximize", "ShowBlocks" ] },
{ name: "about", items: [ "About" ] }
], ],
order_manager_id: "'.($dbo->isInstalled() ? Modules::get('Stato dei servizi')['id'] : '').'", order_manager_id: "'.($dbo->isInstalled() ? Modules::get('Stato dei servizi')['id'] : '').'",
dataload_page_buffer: '.setting('Lunghezza in pagine del buffer Datatables').', dataload_page_buffer: '.setting('Lunghezza in pagine del buffer Datatables').',

View File

@ -36,7 +36,7 @@ switch (post('op')) {
$dbo->update('do_documenti', [ $dbo->update('do_documenti', [
'idcategoria' => post('idcategoria'), 'idcategoria' => post('idcategoria'),
'nome' => post('nome'), 'nome' => post('nome'),
'descrizione' => post('descrizione') ?: null, 'descrizione' => post('descrizione', true) ?: null,
'data' => post('data') ?: null, 'data' => post('data') ?: null,
], ['id' => $id_record]); ], ['id' => $id_record]);

View File

@ -46,7 +46,7 @@ switch (filter('op')) {
$newsletter->completed_at = filter('completed_at'); $newsletter->completed_at = filter('completed_at');
$newsletter->subject = filter('subject'); $newsletter->subject = filter('subject');
$newsletter->content = $_POST['content']; //filter('content'); $newsletter->content = post('content', true); //filter('content');
$newsletter->save(); $newsletter->save();

View File

@ -100,7 +100,7 @@ if (Services::isEnabled()) {
if (!$risorse_in_scadenza->isEmpty()){ if (!$risorse_in_scadenza->isEmpty()){
echo ' echo '
<div class="alert alert-warning" role="alert"> <i class="fa fa-clock-o"></i> '.tr('Attenzione, _NUM_ risorse sono in scadenza o stanno per esaurire i crediti:', [ <div class="alert alert-warning" role="alert"> <i class="fa fa-clock-o"></i> '.tr('Attenzione, alcune risorse sono in scadenza o stanno per esaurire i crediti:', [
'_NUM_' => $risorse_in_scadenza->count(), '_NUM_' => $risorse_in_scadenza->count(),
]).'</div>'; ]).'</div>';
@ -108,7 +108,7 @@ if (Services::isEnabled()) {
if (!$risorse_scadute->isEmpty()){ if (!$risorse_scadute->isEmpty()){
echo ' echo '
<div class="alert alert-danger" role="alert"> <i class="fa fa-exclamation-triangle"></i> '.tr('Attenzione, _NUM_ risorse sono scadute o hanno esaurito i crediti:', [ <div class="alert alert-danger" role="alert"> <i class="fa fa-exclamation-triangle"></i> '.tr('Attenzione, alcune risorse sono scadute o hanno esaurito i crediti:', [
'_NUM_' => $risorse_scadute->count(), '_NUM_' => $risorse_scadute->count(),
]).'</div>'; ]).'</div>';
} }