From dfb5734d9be3f7f76afc21ebbccb8df651cb4ada Mon Sep 17 00:00:00 2001 From: Dasc3er Date: Tue, 27 Jul 2021 11:37:04 +0200 Subject: [PATCH] Correzioni JS e stile del codice Correzioni JS sulla visualizzazione della barra laterale dei plugin e sulla stampa automatica delle tabelle. --- assets/src/css/style.css | 6 +-- assets/src/js/base/sidebar.js | 59 +++++++++++++++++++------ assets/src/js/functions/datatables.js | 1 + editor.php | 21 +-------- include/bottom.php | 2 +- include/top.php | 20 +++++---- mail.php | 2 +- modules/fatture/edit.php | 2 +- src/HTMLBuilder/Manager/FileManager.php | 2 +- src/Util/Query.php | 2 +- templates/contratti/init.php | 1 - templates/ordini/header.php | 8 ++-- 12 files changed, 71 insertions(+), 55 deletions(-) diff --git a/assets/src/css/style.css b/assets/src/css/style.css index 0f3c87898..09ed1aead 100755 --- a/assets/src/css/style.css +++ b/assets/src/css/style.css @@ -1033,13 +1033,13 @@ div.tip { margin-right: 230px; } - .control-sidebar-shown { + .control-sidebar-open { right: 0; display: block !important; } - .control-sidebar.control-sidebar-shown, - .control-sidebar.control-sidebar-shown + .control-sidebar-bg { + .control-sidebar.control-sidebar-open, + .control-sidebar.control-sidebar-open + .control-sidebar-bg { right: 0; } diff --git a/assets/src/js/base/sidebar.js b/assets/src/js/base/sidebar.js index c0c292e88..3307b87ff 100644 --- a/assets/src/js/base/sidebar.js +++ b/assets/src/js/base/sidebar.js @@ -32,11 +32,11 @@ $(document).ready(function () { $(this).find('ul').stop().slideUp(); }); - $menulist = $('.treeview-menu > li.active'); - for (i = 0; i < $menulist.length; i++) { - $list = $($menulist[i]); - $list.parent().show().parent().addClass('active'); - $list.parent().parent().find('i.fa-angle-left').removeClass('fa-angle-left').addClass('fa-angle-down'); + const elenco_menu = $('.treeview-menu > li.active'); + for (i = 0; i < elenco_menu.length; i++) { + const elemento = $(elenco_menu[i]); + elemento.parent().show().parent().addClass('active'); + elemento.parent().parent().find('i.fa-angle-left').removeClass('fa-angle-left').addClass('fa-angle-down'); } // Menu ordinabile @@ -46,7 +46,7 @@ $(document).ready(function () { cursor: "move", dropOnEmpty: true, scroll: true, - })[0].addEventListener("sortupdate", function(e) { + })[0].addEventListener("sortupdate", function (e) { let order = $(".sidebar-menu > .treeview[data-id]").toArray().map(a => $(a).data("id")) $.post(globals.rootdir + "/actions.php", { @@ -57,19 +57,52 @@ $(document).ready(function () { }); } - $(".sidebar-toggle").click(function () { - setTimeout(function () { - window.dispatchEvent(new Event('resize')); - }, 350); - }); - - // Mostra/nasconde sidebar sx + // Mostra/nasconde sidebar del menu principale $(".sidebar-toggle").on("click", function () { if ($("body").hasClass("sidebar-collapse")) { session_set("settings,sidebar-collapse", 0, 1, 0); } else { session_set("settings,sidebar-collapse", 1, 0, 0); } + + setTimeout(function () { + window.dispatchEvent(new Event('resize')); + }, 350); }); + // Barra plugin laterale + const pluginToggle = $(".control-sidebar-toggle"); + const largeScreen = screen.width > 1200; + + // Gestione click sul pulsante per il toggle + pluginToggle.on("click", function () { + $("aside.content-wrapper, .main-footer").toggleClass("with-control-sidebar"); + + toggleControlSidebar(); + }); + + // Gestione click sulla sidebar per evitare chiusura + $(".control-sidebar").on("click", function (e) { + if (largeScreen && e.target.tagName !== 'H4' && $(".main-footer").hasClass("with-control-sidebar")) { + toggleControlSidebar(); + } + }); + + // Barra plugin laterale disabilitata per schermi piccoli + if (largeScreen && !globals.collapse_plugin_sidebar) { + pluginToggle.click(); + } }); + +/** + * Funzione dedicata alla gestione del toggle della sidebar. + */ +function toggleControlSidebar() { + const sidebar = $(".control-sidebar"); + + sidebar.toggleClass("control-sidebar-open"); + + if (sidebar.hasClass("control-sidebar-open")) { + sidebar.show(); + } +} diff --git a/assets/src/js/functions/datatables.js b/assets/src/js/functions/datatables.js index bc7c9ce11..09258abfb 100755 --- a/assets/src/js/functions/datatables.js +++ b/assets/src/js/functions/datatables.js @@ -126,6 +126,7 @@ function start_datatables() { { extend: 'print', autoPrint: true, + footer: true, customize: function (win) { $(win.document.body) .css('font-size', '10pt') diff --git a/editor.php b/editor.php index bb2708334..def190fab 100755 --- a/editor.php +++ b/editor.php @@ -119,30 +119,11 @@ if (empty($record) || !$has_access) { '; - $hide_left_sidebar = Auth::check() && (setting('Nascondere la barra dei plugin di default')); - echo '
  • - '.tr('Plugin').' + '.tr('Plugin').'
    • - -
    diff --git a/include/bottom.php b/include/bottom.php index 17d019628..009a38507 100755 --- a/include/bottom.php +++ b/include/bottom.php @@ -26,7 +26,7 @@ if (Auth::check()) { -