diff --git a/front/appEvents.php b/front/appEvents.php index 4a894afcf..2c8271acb 100755 --- a/front/appEvents.php +++ b/front/appEvents.php @@ -6,7 +6,7 @@ -
+
+ \ No newline at end of file diff --git a/front/appEventsCore.php b/front/appEventsCore.php index 47febbbec..06ab52f79 100755 --- a/front/appEventsCore.php +++ b/front/appEventsCore.php @@ -1,21 +1,21 @@ + - -
+ + +
-
+
-
+
- - diff --git a/front/deviceDetailsEvents.php b/front/deviceDetailsEvents.php index 184e2d32a..1791d259a 100755 --- a/front/deviceDetailsEvents.php +++ b/front/deviceDetailsEvents.php @@ -203,7 +203,7 @@ function deviceEventsPageUpdater() { // ----------------------------------------------------------------------------- function hideEventsTabSkeleton() { - $('#skel-tab-events').fadeOut(250, function() { $(this).remove(); }); + $('#skel-tab-events').fadeOut(50, function() { $(this).remove(); }); } \ No newline at end of file diff --git a/front/deviceDetailsPresence.php b/front/deviceDetailsPresence.php index 70f0e1f89..e70966062 100755 --- a/front/deviceDetailsPresence.php +++ b/front/deviceDetailsPresence.php @@ -212,7 +212,7 @@ function devicePresencePageUpdater() { // ----------------------------------------------------------------------------- function hidePresenceTabSkeleton() { - $('#skel-tab-presence').fadeOut(250, function() { $(this).remove(); }); + $('#skel-tab-presence').fadeOut(50, function() { $(this).remove(); }); } diff --git a/front/deviceDetailsSessions.php b/front/deviceDetailsSessions.php index 856f6e9b3..450447dbc 100755 --- a/front/deviceDetailsSessions.php +++ b/front/deviceDetailsSessions.php @@ -179,7 +179,7 @@ function deviceSessionsPageUpdater() { // ----------------------------------------------------------------------------- function hideSessionsTabSkeleton() { - $('#skel-tab-sessions').fadeOut(250, function() { $(this).remove(); }); + $('#skel-tab-sessions').fadeOut(50, function() { $(this).remove(); }); } \ No newline at end of file diff --git a/front/devices.php b/front/devices.php index 784c781f3..79f5ff58e 100755 --- a/front/devices.php +++ b/front/devices.php @@ -185,7 +185,7 @@ // ----------------------------------------------------------------------------- function hideDevicesSkeleton() { - $('#devices-skeleton').fadeOut(250, function() { $(this).remove(); }); + $('#devices-skeleton').fadeOut(50, function() { $(this).remove(); }); } // Fallback: ensure skeleton is removed even if DataTable fails to initialize diff --git a/front/events.php b/front/events.php index 72eac8e2f..6a856bae7 100755 --- a/front/events.php +++ b/front/events.php @@ -6,7 +6,7 @@ showSpinner(); // Show initial page loading spinner -
+
@@ -59,7 +59,7 @@
- +
@@ -258,7 +258,7 @@ function getEvents(type) { } function hideEventsSkeleton() { - $('#events-skeleton').fadeOut(250, function () { $(this).remove(); }); + $('#events-skeleton').fadeOut(50, function () { $(this).remove(); }); } window.addEventListener('load', function () { diff --git a/front/js/common.js b/front/js/common.js index 7c0762d3e..c0df14b32 100755 --- a/front/js/common.js +++ b/front/js/common.js @@ -954,6 +954,21 @@ function getGuid() { let spinnerTimeout = null; let animationTime = 300 +// show spinner on all clicks +$(document).on('click', 'a', function (e) { + const href = this.href; + + if ( + href && + this.target !== '_blank' && + !this.hasAttribute('download') && + this.origin === location.origin && + this.pathname + this.search !== location.pathname + location.search + ) { + showSpinner(); + } +}); + function showSpinner(stringKey = 'Loading') { let text = isEmpty(stringKey) ? "Loading..." : getString(stringKey || "Loading"); diff --git a/front/maintenance.php b/front/maintenance.php index d401ecf8c..f99ea6fb1 100755 --- a/front/maintenance.php +++ b/front/maintenance.php @@ -878,10 +878,10 @@ function renderLogs(customData) { -
+
@@ -76,7 +76,7 @@
-
+
@@ -84,42 +84,42 @@
-
+
-
+
">
-
+
">
-
+
">
-
+
">
-
+
">
@@ -345,7 +345,7 @@ function initSettingsPage(settingsData, pluginsData){ index++; }); - $('#settingsOverview .panel-body').append(overviewSections_html); + $('#settingsOverview #settingsOverviewPanelBody').append(overviewSections_html); // Display warning if(schedulesAreSynchronized(enabledDeviceScanners, pluginsData) == false) @@ -545,7 +545,15 @@ function hideSettingsSkeleton() { var $skel = $('#settings-skeleton'); if (!$skel.length) return; $('#settingsPage').removeClass('settings-loading'); - $skel.fadeOut(250, function() { $(this).remove(); }); + $skel.fadeOut(10, function() { $(this).hide(); }); + } + + // ---------------------------------------------------------------- + function showSettingsSkeleton() { + var $skel = $('#settings-skeleton'); + if (!$skel.length) return; + $('#settingsPage').addClass('settings-loading'); + $skel.stop(true, true).fadeIn(10); } // display the name of the first person @@ -694,7 +702,7 @@ function handleLoadingDialog() if(appState["showSpinner"] || fileModificationTime > importedMiliseconds) { showSpinner("settings_old") - + showSettingsSkeleton() setTimeout("handleLoadingDialog()", 1000); } else @@ -705,9 +713,7 @@ function handleLoadingDialog() humanReadable = (new Date(importedMiliseconds)).toLocaleString("en-UK", { timeZone: "" }); document.getElementById('lastImportedTime').innerHTML = humanReadable; }) - } - } diff --git a/front/systeminfo.php b/front/systeminfo.php index b468a5bd4..abfdf2d42 100755 --- a/front/systeminfo.php +++ b/front/systeminfo.php @@ -67,7 +67,7 @@ -
+
diff --git a/front/systeminfoInitCheck.php b/front/systeminfoInitCheck.php index 1f0099c77..f4d1d7b37 100644 --- a/front/systeminfoInitCheck.php +++ b/front/systeminfoInitCheck.php @@ -18,19 +18,16 @@
+
+
+
- -
-
-
-
-
-
+

-
+
diff --git a/front/systeminfoNetwork.php b/front/systeminfoNetwork.php index 8692d0aca..377841b60 100755 --- a/front/systeminfoNetwork.php +++ b/front/systeminfoNetwork.php @@ -89,10 +89,10 @@ function getExternalIp() { // Network ---------------------------------------------------------- echo '
-
-

' . lang('Systeminfo_Network') . '

-
-
+
+

' . lang('Systeminfo_Network') . '

+
+
' . lang('Systeminfo_Network_IP') . '
' .$externalIp. '
diff --git a/front/userNotifications.php b/front/userNotifications.php index 1fa81314f..7a5e3cb6d 100755 --- a/front/userNotifications.php +++ b/front/userNotifications.php @@ -218,7 +218,7 @@ function fetchData(callback) { }); function hideNotificationsSkeleton() { - $('#notifications-skeleton').fadeOut(250, function () { $(this).remove(); }); + $('#notifications-skeleton').fadeOut(50, function () { $(this).remove(); }); } window.addEventListener('load', function () { diff --git a/front/workflowsCore.php b/front/workflowsCore.php index f19405918..3e726255a 100755 --- a/front/workflowsCore.php +++ b/front/workflowsCore.php @@ -1379,7 +1379,7 @@ function saveWorkflows() function hideWorkflowsSkeleton() { hideSpinner(); - $('#workflows-skeleton').fadeOut(250, function() { $(this).remove(); }); + $('#workflows-skeleton').fadeOut(50, function() { $(this).remove(); }); } window.addEventListener('load', function() {