Merge branch 'master' of https://github.com/devcode-it/openstamanager
This commit is contained in:
commit
22bbe607ff
|
@ -90,14 +90,16 @@ 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,
|
||||
});
|
||||
|
||||
// Gestione di eventi noti
|
||||
|
|
|
@ -200,7 +200,23 @@ if (Auth::check()) {
|
|||
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" ],
|
||||
],
|
||||
|
||||
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').',
|
||||
|
|
|
@ -78,7 +78,7 @@ echo '
|
|||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
{[ "type": "ckeditor", "label": "'.tr('Contenuto').'", "name": "content", "value": "$content$" ]}
|
||||
{[ "type": "ckeditor", "use_full_ckeditor": 1, "label": "'.tr('Contenuto').'", "name": "content", "value": "$content$" ]}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Reference in New Issue