diff --git a/docs/DEVICE_FILTERS.md b/docs/DEVICE_FILTERS.md index 4316cf22..83d5df86 100644 --- a/docs/DEVICE_FILTERS.md +++ b/docs/DEVICE_FILTERS.md @@ -14,9 +14,9 @@ If a device is missing from the **My Devices** list, work through these checks. The most common cause is that a filter is hiding the device. -![Image](https://docs.netalertx.com/img/ADVISORIES/filters.png) +![Image](./img/ADVISORIES/filters.png) -![Image](https://docs.netalertx.com/img/DEVICE_MANAGEMENT/DeviceDetails_DisplaySettings.png) +![Image](./img/DEVICE_MANAGEMENT/DeviceDetails_DisplaySettings.png) Review any active: @@ -32,6 +32,8 @@ Clear filters first, then reload the page and check again. You can select devices of what statuses should be displayed in the My Devices view. This can be adjusted in the _Settings_ section - search for the `UI_MY_DEVICES` setting and verify that the statuses you want to show are selected. +![Image](./img/DEVICE_MANAGEMENT/device_filter_settings.png) + --- ### Check Whether the Device Is Hidden diff --git a/docs/img/DEVICE_MANAGEMENT/device_filter_settings.png b/docs/img/DEVICE_MANAGEMENT/device_filter_settings.png new file mode 100644 index 00000000..0ea36307 Binary files /dev/null and b/docs/img/DEVICE_MANAGEMENT/device_filter_settings.png differ diff --git a/front/css/app.css b/front/css/app.css index 4940cee6..ea87e2c2 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -2647,11 +2647,11 @@ table.dataTable tbody > tr.selected .skel-tab-pane { z-index: 10; min-height: 400px; } #settings-skeleton { padding-top: 50px; padding-left: 20px; padding-right: 20px; min-height: 500px; } #devices-skeleton { top: 50px; min-height: 500px; } -#device-details-skeleton { min-height: 600px; } +#device-details-skeleton { top: 45px; min-height: 100px; } #events-skeleton { top: 50px; min-height: 500px; } #presence-skeleton { top: 50px; min-height: 500px; } #report-skeleton { min-height: 400px; } -#notifications-skeleton { min-height: 400px; } +#notifications-skeleton { top: 50px; min-height: 400px; } #workflows-skeleton { top: 50px; width: 770px; margin: 0 auto; min-height: 300px; } #plugins-skeleton { padding: 0; min-height: 400px; } @@ -2728,6 +2728,7 @@ table.dataTable tbody > tr.selected /* ----- Devices ---------------------------------------------------------- */ .skel-tile { display: flex; height: 80px; } +#device-details-skeleton .skel-tile { display: flex; height: 45px; } .skel-tile-inner { display: flex; flex-direction: column; padding: 12px 15px; justify-content: center; gap: 10px; } .skel-tile-num { height: 26px; width: 55%; } .skel-tile-label { height: 13px; width: 75%; } @@ -2740,8 +2741,8 @@ table.dataTable tbody > tr.selected .skel-td { height: 13px; } /* ----- Device Details --------------------------------------------------- */ -.skel-detail-header { margin-bottom: 15px; } -.skel-detail-title { height: 26px; width: 42%; margin-bottom: 14px; } +.skel-detail-header { margin-bottom: 0px; } +.skel-detail-title { height: 26px; width: 42%; margin-bottom: 0px; } .skel-detail-info-panel { display: flex; gap: 0; padding: 14px; border-radius: 4px; margin-bottom: 15px; max-width: 400px; } .skel-tabs-bar { display: flex; gap: 4px; padding: 8px 10px 0; border-radius: 4px 4px 0 0; border-bottom: none; } .skel-tab { height: 34px; width: 100px; border-radius: 4px 4px 0 0; flex-shrink: 0; } diff --git a/front/css/system-dark-patch.css b/front/css/system-dark-patch.css index 74171a1e..f6cf4e15 100755 --- a/front/css/system-dark-patch.css +++ b/front/css/system-dark-patch.css @@ -743,5 +743,5 @@ --skel-section: #252c38; --skel-panel-bg: #1e242e; --skel-border: #2a323e; - --skel-bg: #353c42; + --skel-bg: #292e33; } \ No newline at end of file diff --git a/front/php/templates/skel_device_details.php b/front/php/templates/skel_device_details.php index 9dfd5f6b..0bdd0a20 100644 --- a/front/php/templates/skel_device_details.php +++ b/front/php/templates/skel_device_details.php @@ -4,56 +4,43 @@
-
-
-
- - - -
-
-
+
-
-
+
-
-
+
-
-
-
+
-
diff --git a/front/php/templates/skel_events.php b/front/php/templates/skel_events.php index a5f90ef4..3b9a9bf2 100644 --- a/front/php/templates/skel_events.php +++ b/front/php/templates/skel_events.php @@ -30,7 +30,7 @@
- +
diff --git a/front/php/templates/skel_notifications.php b/front/php/templates/skel_notifications.php index 8315ebf2..d10d48c4 100644 --- a/front/php/templates/skel_notifications.php +++ b/front/php/templates/skel_notifications.php @@ -8,7 +8,7 @@
- +
@@ -16,4 +16,8 @@
+
+ + +
diff --git a/front/php/templates/skel_tab_details.php b/front/php/templates/skel_tab_details.php index 0067c7e4..dcccaf93 100644 --- a/front/php/templates/skel_tab_details.php +++ b/front/php/templates/skel_tab_details.php @@ -1,37 +1,155 @@
-
-
- - +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
- - +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
- - +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
- - +
+
+ + +
-
- - -
-
- - -
-
- - -
-
- - +
+
+ + +
diff --git a/front/php/templates/skel_tab_sysinfo_network.php b/front/php/templates/skel_tab_sysinfo_network.php index 06ee49f4..1598d59c 100644 --- a/front/php/templates/skel_tab_sysinfo_network.php +++ b/front/php/templates/skel_tab_sysinfo_network.php @@ -1,5 +1,5 @@
- +
diff --git a/front/php/templates/skel_tab_sysinfo_server.php b/front/php/templates/skel_tab_sysinfo_server.php index 9422a79f..1598d59c 100644 --- a/front/php/templates/skel_tab_sysinfo_server.php +++ b/front/php/templates/skel_tab_sysinfo_server.php @@ -1,5 +1,5 @@
- +
diff --git a/front/php/templates/skel_tab_sysinfo_storage.php b/front/php/templates/skel_tab_sysinfo_storage.php index 8f0f1a24..bca96202 100644 --- a/front/php/templates/skel_tab_sysinfo_storage.php +++ b/front/php/templates/skel_tab_sysinfo_storage.php @@ -4,7 +4,7 @@
- +
diff --git a/front/systeminfoNetwork.php b/front/systeminfoNetwork.php index d9ac320e..abb4cfaa 100755 --- a/front/systeminfoNetwork.php +++ b/front/systeminfoNetwork.php @@ -335,6 +335,18 @@ function loadInterfaces() { `); }); + + if ($.fn.DataTable.isDataTable('#networkTable')) { + $('#networkTable').DataTable().destroy(); + } + + $('#networkTable').DataTable({ + searching: true, + order: [[0, "desc"]], + initComplete: function() { + hideSpinner(); + } + }); }, error: function(xhr) { const tbody = $("#networkTable tbody"); @@ -356,16 +368,16 @@ $(document).ready(function() { loadInterfaces(); - setTimeout(() => { - // Available IPs datatable - $('#networkTable').DataTable({ - searching: true, - order: [[0, "desc"]], - initComplete: function(settings, json) { - hideSpinner(); // Called after the DataTable is fully initialized - } - }); - }, 200); + // setTimeout(() => { + // // Available IPs datatable + // $('#networkTable').DataTable({ + // searching: true, + // order: [[0, "desc"]], + // initComplete: function(settings, json) { + // hideSpinner(); // Called after the DataTable is fully initialized + // } + // }); + // }, 200); });