From 448a47b5a340cce8b73000fb22920104809f0702 Mon Sep 17 00:00:00 2001 From: loviuz Date: Fri, 17 May 2024 00:32:46 +0200 Subject: [PATCH] Avanzamento grafica AdminLTE3 --- assets/src/css/style.css | 93 +--- assets/src/js/base/custom.js | 10 - assets/src/js/functions/functions.js | 8 +- assets/src/js/functions/hooks.js | 19 +- assets/src/js/functions/init.js | 2 - editor.php | 5 - include/bottom.php | 4 +- include/init/update.php | 4 +- include/top.php | 547 +++++++++++----------- src/HTMLBuilder/Manager/WidgetManager.php | 10 +- 10 files changed, 299 insertions(+), 403 deletions(-) diff --git a/assets/src/css/style.css b/assets/src/css/style.css index d4cbd0f55..1b72cee67 100755 --- a/assets/src/css/style.css +++ b/assets/src/css/style.css @@ -143,8 +143,8 @@ input[type=file] { margin: auto; } -.content { - padding: 20px 15px; +.content-wrapper { + padding-top: 10px; } .navbar a:hover, @@ -193,31 +193,6 @@ a:focus { cursor: pointer; } -#main_loading { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: #555; - z-index: 9999; - text-align: center; - opacity: 0.9; - -moz-opacity: 0.9; - filter: alpha(opacity=90); -} - -#main_loading>div { - position: relative; - top: 50%; - color: #333; -} - -#main_loading>div>i { - font-size: 300px; - margin-top: -150px; - color: #e24e1e; -} #mini-loader { position: fixed; @@ -231,8 +206,8 @@ a:focus { #mini-loader>div { position: absolute; - bottom: 50%; - left: 50%; + bottom: 10%; + right: 10%; width: 100px; height: 100px; margin-top: -50px; @@ -331,49 +306,6 @@ span.form-control { } -/* Aggiustamenti per i widget */ - -.widget li { - margin-left: 0; - padding-top:10px; - list-style-type: none; - height: 106px; -} - -.widget { - padding: 0; - margin-bottom: 0; -} - -.widget.bordered { - border: 6px dashed #aaa; - margin: 10px; - min-height: 200px; - padding: 4px; -} - -.close { - padding-right: 5px; - position: relative; - z-index: 1; - opacity: 0.4; -} - -.close:focus, -.close:hover { - opacity: 0.8; -} - -.li-widget button.close:hover, -.li-widget button.close:focus { - opacity: 0.3; -} - -.li-widget button.close { - padding-right: 5px; - opacity: 0.1; -} - /* Tooltip dark */ @@ -900,11 +832,6 @@ input.small-width { max-height: 20px; } -.brand-link { - max-width: 150px; - max-height: 100px; -} - .has-feedback .form-control { padding-right: 6px; } @@ -1100,11 +1027,6 @@ table.dataTable { margin: 2px 0px; } -.widget-user .widget-user-image>img { - -webkit-box-shadow: -10px 0px 13px -7px #000000, 10px 0px 13px -7px #000000, 5px 5px 15px 5px rgba(0, 0, 0, 0); - box-shadow: -10px 0px 13px -7px #000000, 10px 0px 13px -7px #000000, 5px 5px 15px 5px rgba(0, 0, 0, 0); -} - /* * Colore eventi fullcalendar */ @@ -1161,13 +1083,6 @@ kbd{ box-shadow: 0px 0px 1px black; } -@media (max-width: 480px) { - #main_loading>div>i { - font-size: 160px; - margin-top: -80px; - } -} - @media screen and (max-width: 767px) { .navbar-left { display: inline-block; diff --git a/assets/src/js/base/custom.js b/assets/src/js/base/custom.js index 70ffc38e2..7e8ac7518 100644 --- a/assets/src/js/base/custom.js +++ b/assets/src/js/base/custom.js @@ -16,16 +16,6 @@ * along with this program. If not, see . */ -// Aggiunta dell'ingranaggio all'unload della pagina -$(window).on("beforeunload", function () { - $("#main_loading").show(); -}); - -// Rimozione dell'ingranaggio al caricamento completo della pagina -$(window).on("load", function () { - $("#main_loading").fadeOut(); -}); - // Fix multi-modal $(document).on('hidden.bs.modal', '.modal', function () { $(this).remove(); diff --git a/assets/src/js/functions/functions.js b/assets/src/js/functions/functions.js index 3059b7be7..717aa9e22 100755 --- a/assets/src/js/functions/functions.js +++ b/assets/src/js/functions/functions.js @@ -58,13 +58,13 @@ function openModal(title, href) { const content = '
\
\ -
\ - \ +
\

\ ' + title + '\

\ + \
\
|data|
\
\ diff --git a/assets/src/js/functions/hooks.js b/assets/src/js/functions/hooks.js index ef532adee..996280164 100755 --- a/assets/src/js/functions/hooks.js +++ b/assets/src/js/functions/hooks.js @@ -228,7 +228,7 @@ function renderHook(hook, result) { // Inizializzazione var element = $("#" + element_id); if (element.length == 0) { - $("#hooks").append('
  • '); + $("#hooks").append(''); element = $("#" + element_id); } @@ -241,7 +241,16 @@ function renderHook(hook, result) { } // Contenuto - var content = ' ' + result.message + ''; + var content = ''; + + if (result.link) { + content += ''; + } else { + content += '
    '; + } + + + content += ' ' + result.message + ''; if (result.progress) { var current = result.progress.current; @@ -254,7 +263,11 @@ function renderHook(hook, result) { content += '
    ' + percentage + '% (' + current + '/' + total + ')
    '; } - content += '    '; + if (result.link) { + content += ''; + } else { + content += '
    '; + } element.html(content); } diff --git a/assets/src/js/functions/init.js b/assets/src/js/functions/init.js index e40f0b4fa..72bab91a1 100755 --- a/assets/src/js/functions/init.js +++ b/assets/src/js/functions/init.js @@ -17,8 +17,6 @@ */ function init() { - // Inizializzazzione dei box AdminLTE - $('.box').boxWidget(); // Modal di default $('[data-href]').not('.ask, .bound').click(function () { launch_modal($(this).data('title'), $(this).data('href'), 1); diff --git a/editor.php b/editor.php index ad3849cb1..866d9749b 100755 --- a/editor.php +++ b/editor.php @@ -491,15 +491,10 @@ if ($read_only || !empty($block_edit)) { if(content_was_modified) { var dialogText = "Uscire senza salvare?"; e.returnValue = dialogText; - $("#main_loading").fadeOut(); return dialogText; } }); - window.addEventListener("unload", function(e) { - $("#main_loading").show(); - }); - -
    - +