From f84eb6d149e3620deb5543c611cf27a39e716614 Mon Sep 17 00:00:00 2001 From: Meteo Date: Sun, 4 Jan 2026 20:58:11 +0100 Subject: [PATCH] mprovements into the server view --- pub/bin/locales/en.php | 2 + pub/bin/locales/nl.php | 6 +- .../pageServerOverview_server_view.php | 80 +++++++--- .../pages/servers/pageServerOverview_view.php | 26 +--- pub/bin/php/Functions/globalFunctions.php | 26 ++++ pub/bin/php/jsScripts.php | 11 ++ pub/src/css/kaiadmin.gruvbox.dark.css | 2 +- pub/src/css/kaiadmin.gruvbox.dark.min.css | 6 +- pub/src/css/prism.css | 141 ++++++++++++++++++ 9 files changed, 249 insertions(+), 51 deletions(-) create mode 100644 pub/src/css/prism.css diff --git a/pub/bin/locales/en.php b/pub/bin/locales/en.php index bbb4784..7ab3afe 100644 --- a/pub/bin/locales/en.php +++ b/pub/bin/locales/en.php @@ -277,7 +277,9 @@ return [ 'server_licenses' => 'Licenses', 'server_backup' => 'Backups', 'disk_space' => 'Disk space', + 'disk_reserved_space' => 'Provisioned size', 'disk_used' => 'Disk used', + 'disk_file_used' => 'Used size', 'disk_location' => 'Disk location', 'type' => 'Type', 'all_technical_information' => 'All technical information', diff --git a/pub/bin/locales/nl.php b/pub/bin/locales/nl.php index 3a05036..65cd44b 100644 --- a/pub/bin/locales/nl.php +++ b/pub/bin/locales/nl.php @@ -276,8 +276,10 @@ return [ 'server_vm_generation' => 'Gen', 'server_licenses' => 'Licenties', 'server_backup' => 'Backups', - 'disk_space' => 'Schijf grote', - 'disk_used' => 'Schijf gebruikt', + 'disk_space' => 'Schijf grootte', + 'disk_reserved_space' => 'Toegewezen grootte', + 'disk_used' => 'Schijf gebruik', + 'disk_file_used' => 'Gebruikte grootte', 'disk_location' => 'Schijf locatie', 'type' => 'Type', 'all_technical_information' => 'Alle technische informatie', diff --git a/pub/bin/pages/servers/pageServerOverview_server_view.php b/pub/bin/pages/servers/pageServerOverview_server_view.php index b45a5dc..6063635 100644 --- a/pub/bin/pages/servers/pageServerOverview_server_view.php +++ b/pub/bin/pages/servers/pageServerOverview_server_view.php @@ -24,6 +24,7 @@ if (!$API->checkPermissions('servers', 'RO', true)) { # JS Scripts to load for this page $jsScriptLoadData['delete_confirmation'] = true; $jsScriptLoadData['breadCrumbs'] = true; +$jsScriptLoadData['codeblocks'] = true; # PageClasses Setup $pageNavbar = new pageNavbar(true); @@ -84,6 +85,8 @@ if (is_array($disks) && count($disks) > 0) { $totalDiskSpace = array_sum($sizes); } +$server_state_color = returnServerStateColor($server_data['server_state']); + # Licences $licenses = json_decode($server_data['server_licenses'], true); @@ -131,6 +134,7 @@ $pageNavbar->outPutNavbar();

+

@@ -263,8 +267,7 @@ $pageNavbar->outPutNavbar(); - checkPermissions('servers', 'RW', true)) { ?> + checkPermissions('servers', 'RW', true)) { ?> @@ -280,25 +283,36 @@ $pageNavbar->outPutNavbar(); 0) { ?> -

- +

+

-

- +

+

- : -
: -
: + + + + + + + + + + + + + +
:GB
:GB
:
outPutNavbar(); if (is_array($licenses) && count($licenses) > 0) { ?>

- +

$licence) { ?>
-

- +

+

@@ -335,11 +349,11 @@ $pageNavbar->outPutNavbar();

-
- +
+
- + @@ -353,10 +367,22 @@ $pageNavbar->outPutNavbar(); + + + + + + + + + + + + @@ -379,23 +405,33 @@ $pageNavbar->outPutNavbar(); - + - + - + - + - + @@ -403,11 +439,11 @@ $pageNavbar->outPutNavbar(); - + - +
server_uuid:
company_uuid:server_vm_host_name:
server_vm_snapshot:
server_vm_generation:
server_power_state:
server_state:
server_hostname:
server_disks: +
+
server_ipv4: +
+
server_ipv6: +
+
server_licenses: +
+
server_backup: +
+
server_description:
server_create_timestamp: ()
server_modified_timestamp: ()
diff --git a/pub/bin/pages/servers/pageServerOverview_view.php b/pub/bin/pages/servers/pageServerOverview_view.php index df4c73a..2c40a05 100644 --- a/pub/bin/pages/servers/pageServerOverview_view.php +++ b/pub/bin/pages/servers/pageServerOverview_view.php @@ -386,33 +386,13 @@ array_push($GLOBALS['breadCrumbArray'], array('display' => __('view'), 'href' => $company_name = $server['company_name']; } - $server_state_color = 'secondary'; - if (strlen($server['server_state']) > 0) { - $server_state = ucfirst($server['server_state']); - switch ($server_state) { - case 'New': - $server_state_color = 'secondary'; - break; - case 'Deleted': - $server_state_color = 'danger'; - break; - case 'Trial': - $server_state_color = 'primary'; - break; - case 'Disabled': - $server_state_color = 'gray'; - break; - case 'Active': - $server_state_color = 'success'; - break; - } - } + $server_state_color = returnServerStateColor($server['server_state']); ?> - - + + diff --git a/pub/bin/php/Functions/globalFunctions.php b/pub/bin/php/Functions/globalFunctions.php index ebbd23b..9123e84 100644 --- a/pub/bin/php/Functions/globalFunctions.php +++ b/pub/bin/php/Functions/globalFunctions.php @@ -114,4 +114,30 @@ function getEnabledModules() } return $modules_enabled; +} + +function returnServerStateColor($serverState) +{ + $server_state_color = 'secondary'; + if (strlen($serverState) > 0) { + $server_state = ucfirst($serverState); + switch ($server_state) { + case 'New': + $server_state_color = 'secondary'; + break; + case 'Deleted': + $server_state_color = 'danger'; + break; + case 'Trial': + $server_state_color = 'primary'; + break; + case 'Disabled': + $server_state_color = 'gray'; + break; + case 'Active': + $server_state_color = 'success'; + break; + } + } + return $server_state_color; } \ No newline at end of file diff --git a/pub/bin/php/jsScripts.php b/pub/bin/php/jsScripts.php index f90e4d8..d2449bb 100644 --- a/pub/bin/php/jsScripts.php +++ b/pub/bin/php/jsScripts.php @@ -28,6 +28,17 @@ if (isset($this->jsScriptLoadData['datatables'])) { ?> jsScriptLoadData['codeblocks'])) { ?> + + + + + + + + + +jsScriptLoadData['multiFilterSelect'])) { ?>