mirror of
https://github.com/devcode-it/openstamanager.git
synced 2025-02-17 03:51:06 +01:00
Merge branch 'master' of https://github.com/devcode-it/openstamanager
This commit is contained in:
commit
4137630f08
@ -100,6 +100,8 @@ function initCKEditor(input) {
|
||||
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
|
||||
|
@ -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'));
|
||||
}
|
||||
|
@ -198,7 +198,7 @@ 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" ] },
|
||||
@ -289,11 +289,29 @@ if (Auth::check()) {
|
||||
echo '<script type="text/javascript" charset="utf-8" src="'.App::getPaths()['js'].'/hotkeys-js/hotkeys.min.js"></script>';
|
||||
echo '
|
||||
<script>
|
||||
hotkeys(\'f1\', \'save\', function(event, handler){
|
||||
event.preventDefault();
|
||||
$( "button[data-toggle]" ).first().trigger( "click" );
|
||||
|
||||
hotkeys("f1,f2,f3,f4", function(event, handler) {
|
||||
switch (handler.key) {
|
||||
case "f1":
|
||||
event.preventDefault();
|
||||
$("button[data-toggle]").first().trigger("click");
|
||||
break;
|
||||
case "f2":
|
||||
event.preventDefault();
|
||||
$("#save").first().trigger("click");
|
||||
break;
|
||||
case "f3":
|
||||
event.preventDefault();
|
||||
$("#print-button_p").first().trigger("click");
|
||||
break;
|
||||
case "f4":
|
||||
event.preventDefault();
|
||||
$("#email-button_p").first().trigger("click");
|
||||
break;
|
||||
default: alert(event);
|
||||
}
|
||||
});
|
||||
hotkeys.setScope(\'save\');
|
||||
|
||||
</script>';
|
||||
}
|
||||
}
|
||||
|
@ -246,15 +246,27 @@ echo '
|
||||
if (setting('Attiva scorciatoie da tastiera')) {
|
||||
echo '
|
||||
<script>
|
||||
hotkeys("f8", "carico", function() {
|
||||
$("#modals > div #direzione").val(1).change();
|
||||
});
|
||||
hotkeys.setScope("carico");
|
||||
|
||||
hotkeys("f9", "scarico", function() {
|
||||
$("#modals > div #direzione").val(2).change();
|
||||
hotkeys("f8,f9,f10", function(event, handler) {
|
||||
|
||||
switch (handler.key) {
|
||||
case "f8":
|
||||
event.preventDefault();
|
||||
input("causale").set("1");
|
||||
break;
|
||||
case "f9":
|
||||
event.preventDefault();
|
||||
input("causale").set("2");
|
||||
break;
|
||||
case "f10":
|
||||
event.preventDefault();
|
||||
input("causale").set("3");
|
||||
break;
|
||||
default: alert(event);
|
||||
}
|
||||
|
||||
});
|
||||
hotkeys.setScope("scarico");
|
||||
|
||||
</script>';
|
||||
}
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
"bootstrap-daterangepicker": "^2.1.25",
|
||||
"bootstrap-maxlength": "^1.10.0",
|
||||
"chart.js": "^2.7.0",
|
||||
"ckeditor4-dev": "^4.14.1",
|
||||
"ckeditor4": "^4.16.1",
|
||||
"components-jqueryui": "^1.12.1",
|
||||
"datatables.net-bs": "^1.10.15",
|
||||
"datatables.net-buttons-bs": "^1.3.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user