From 553039d9e6e8e9b86235e749f6a7c98dfcbb0b74 Mon Sep 17 00:00:00 2001
From: Ludovic <54670129+lbr38@users.noreply.github.com>
Date: Sat, 4 Jan 2025 11:11:30 +0100
Subject: [PATCH] patch

---
 www/public/assets/icons/docker.svg            | 73 -------------------
 www/public/assets/icons/tux.svg               | 38 ----------
 www/public/resources/styles/stats-hosts.css   |  8 +-
 .../includes/containers/hosts/list.inc.php    | 58 ++++++++-------
 4 files changed, 37 insertions(+), 140 deletions(-)
 delete mode 100644 www/public/assets/icons/docker.svg
 delete mode 100644 www/public/assets/icons/tux.svg

diff --git a/www/public/assets/icons/docker.svg b/www/public/assets/icons/docker.svg
deleted file mode 100644
index b41942aa..00000000
--- a/www/public/assets/icons/docker.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   id="Layer_1"
-   data-name="Layer 1"
-   viewBox="0 0 512 512"
-   version="1.1"
-   sodipodi:docname="logo-docker.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs25" />
-  <sodipodi:namedview
-     id="namedview23"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="1.4199219"
-     inkscape:cx="255.64787"
-     inkscape:cy="256"
-     inkscape:window-width="1920"
-     inkscape:window-height="977"
-     inkscape:window-x="598"
-     inkscape:window-y="1111"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" />
-  <path
-     d="M507,211.16c-1.42-1.19-14.25-10.94-41.79-10.94a132.55,132.55,0,0,0-21.61,1.9c-5.22-36.4-35.38-54-36.57-55l-7.36-4.28-4.75,6.9a101.65,101.65,0,0,0-13.06,30.45c-5,20.7-1.9,40.2,8.55,56.85-12.59,7.14-33,8.8-37.28,9H15.94A15.93,15.93,0,0,0,0,262.07,241.25,241.25,0,0,0,14.75,348.9C26.39,379.35,43.72,402,66,415.74,91.22,431.2,132.3,440,178.6,440a344.23,344.23,0,0,0,62.45-5.71,257.44,257.44,0,0,0,81.69-29.73,223.55,223.55,0,0,0,55.57-45.67c26.83-30.21,42.74-64,54.38-94h4.75c29.21,0,47.26-11.66,57.23-21.65a63.31,63.31,0,0,0,15.2-22.36l2.14-6.18Z"
-     id="path2"
-     style="fill:#ffffff;fill-opacity:1" />
-  <path
-     d="M47.29,236.37H92.4a4,4,0,0,0,4-4h0V191.89a4,4,0,0,0-4-4H47.29a4,4,0,0,0-4,4h0v40.44a4.16,4.16,0,0,0,4,4h0"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:1" />
-  <path
-     d="M109.5,236.37h45.12a4,4,0,0,0,4-4h0V191.89a4,4,0,0,0-4-4H109.5a4,4,0,0,0-4,4v40.44a4.16,4.16,0,0,0,4,4"
-     id="path6"
-     style="fill:#ffffff;fill-opacity:1" />
-  <path
-     d="M172.9,236.37H218a4,4,0,0,0,4-4h0V191.89a4,4,0,0,0-4-4H172.9a4,4,0,0,0-4,4h0v40.44a3.87,3.87,0,0,0,4,4h0"
-     id="path8"
-     style="fill:#ffffff;fill-opacity:1" />
-  <path
-     d="M235.36,236.37h45.12a4,4,0,0,0,4-4V191.89a4,4,0,0,0-4-4H235.36a4,4,0,0,0-4,4h0v40.44a4,4,0,0,0,4,4h0"
-     id="path10"
-     style="fill:#ffffff;fill-opacity:1" />
-  <path
-     d="M109.5,178.57h45.12a4.16,4.16,0,0,0,4-4V134.09a4,4,0,0,0-4-4H109.5a4,4,0,0,0-4,4v40.44a4.34,4.34,0,0,0,4,4"
-     id="path12"
-     style="fill:#ffffff;fill-opacity:1" />
-  <path
-     d="M172.9,178.57H218a4.16,4.16,0,0,0,4-4V134.09a4,4,0,0,0-4-4H172.9a4,4,0,0,0-4,4h0v40.44a4,4,0,0,0,4,4"
-     id="path14"
-     style="fill:#ffffff;fill-opacity:1" />
-  <path
-     d="M235.36,178.57h45.12a4.16,4.16,0,0,0,4-4V134.09a4.16,4.16,0,0,0-4-4H235.36a4,4,0,0,0-4,4h0v40.44a4.16,4.16,0,0,0,4,4"
-     id="path16"
-     style="fill:#ffffff;fill-opacity:1" />
-  <path
-     d="M235.36,120.53h45.12a4,4,0,0,0,4-4V76a4.16,4.16,0,0,0-4-4H235.36a4,4,0,0,0-4,4h0v40.44a4.17,4.17,0,0,0,4,4"
-     id="path18"
-     style="fill:#ffffff;fill-opacity:1" />
-  <path
-     d="M298.28,236.37H343.4a4,4,0,0,0,4-4V191.89a4,4,0,0,0-4-4H298.28a4,4,0,0,0-4,4h0v40.44a4.16,4.16,0,0,0,4,4"
-     id="path20"
-     style="fill:#ffffff;fill-opacity:1" />
-</svg>
diff --git a/www/public/assets/icons/tux.svg b/www/public/assets/icons/tux.svg
deleted file mode 100644
index c952ff36..00000000
--- a/www/public/assets/icons/tux.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="512"
-   height="512"
-   viewBox="0 0 512 512"
-   version="1.1"
-   id="svg4"
-   sodipodi:docname="logo-tux.svg"
-   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     id="namedview6"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="1.4199219"
-     inkscape:cx="255.64787"
-     inkscape:cy="256"
-     inkscape:window-width="1920"
-     inkscape:window-height="977"
-     inkscape:window-x="598"
-     inkscape:window-y="1111"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
-  <path
-     d="M443.66,405.05c-1.46-.79-2.85-1.54-4-2.2-6.47-3.83-13-10.52-11.85-17.83,2.42-15.94,2.89-23.47-.49-28.79a15.61,15.61,0,0,0-7.67-6.2l0-.06c1.41-2.56,2.26-5.66,2.83-10.12,1.44-11-5-44-13.7-70.7-8.08-24.68-29.24-50-44.7-68.56l-3.61-4.34c-23.88-28.93-24.34-38.19-26.55-82.67-.32-6.47-.69-13.8-1.17-22C329.87,41.43,304,16,256,16c-25.2,0-44.62,7.15-57.72,21.26C187.79,48.55,182,64,182,80.78c0,29.52,2,53,2.15,54.29,1.4,35.7,1,41.22-8.31,57.55-2.23,3.93-8.38,10.87-14.89,18.21-8.48,9.57-18.09,20.41-23.36,29.22-3.77,6.31-5.88,12.63-8.11,19.33-3.4,10.21-7.26,21.78-18.15,36.57-12.57,17.07-15.52,29.61-11,47.45v0c-4.94,6.45-4.83,14.37-4.75,20.23a25.84,25.84,0,0,1-.3,6.09c-2.29,7.59-12.42,9.4-22,10.18-1.58.12-3.1.21-4.55.29-7.26.39-13.53.74-17.13,6.3-3.47,5.36-1.12,13.8,2.14,25.48.72,2.58,1.46,5.25,2.19,8.06,1.83,7-.16,10.48-2.68,14.84-2.44,4.21-5.21,9-5.21,17.55,0,14.67,20,18,43.05,21.94,7.36,1.24,15,2.53,22.63,4.24a225.58,225.58,0,0,1,34.08,10.68c9.72,3.73,17.4,6.68,26.43,6.68,16.18,0,28.25-9.77,39.92-19.21L216.3,475c5.53-4.49,21.5-4,34.34-3.64,3.46.1,6.73.2,9.65.2l6.22,0c13.48-.08,31.94-.18,42.23,2.5,3.75,1,6.2,3.72,9.29,7.19C323.9,487.81,331.2,496,351.42,496c19.39,0,29.55-8.71,41.32-18.8,7.16-6.13,14.56-12.48,25.07-17.86,3.92-2,7.62-3.87,11.08-5.61C451.53,442.35,464,436.08,464,425.91,464,416,451.76,409.41,443.66,405.05ZM211.11,88.38a13.91,13.91,0,0,1,12.47,9c1.95,5.55,1.81,10.42.21,12.94,0,0-.22-1-.36-1.44a14.85,14.85,0,0,0-6.44-8.59,11.35,11.35,0,0,0-8.94-1.47c-4.26,1.13-8.41,5-8.91,18.79-5.16-10.47-2.31-18,.92-23C202.37,90.88,207.53,88.28,211.11,88.38Zm-17.5,375C192,479.24,175.2,479,170.09,478.59c-9.81-.82-21.66-4.69-33.13-8.43-4.52-1.47-9.19-3-13.73-4.34-13.2-3.89-30.12-6.74-43.72-9-3.22-.55-6.27-1.06-9.05-1.55s-4.61-1.27-5.2-2.3c-1-1.65.38-5.25,1.93-9.41C69.27,438,72.11,430.34,72,421c0-3.91-1.47-8.3-2.84-12.56-1.62-5-3.28-10.17-1.93-12.62,1.23-2.23,6.75-2.49,11.6-2.49h2.26c3.55,0,6.62.06,8.75-.53,6.51-1.81,14.86-6.92,17.81-13.88.9-2.17,1.37-6.94,2-14,.37-4.12.74-8.37,1.22-10.58a3.55,3.55,0,0,1,2.11-2.55c1.65-.77,6.78-1.91,18.63,4.08,11.18,5.65,22.88,25.84,34.2,45.37,3.56,6.14,6.92,11.94,10.3,17.36C190.15,441.14,194.94,450.2,193.61,463.4Zm128.84-31.56a68.74,68.74,0,0,1-4.55,10.9.58.58,0,0,1-1.08-.42,56.61,56.61,0,0,0,2.11-18.43c-.25-4.73-.4-7.59-2.66-8.51s-4.26.83-9.45,5.54c-1.1,1-2.36,2.14-3.78,3.4-10.8,9.47-26.88,20.68-55.61,23.37-16.84,1.59-27.59-4.63-30.92-8.14a2.16,2.16,0,0,0-3.07-.08,2.23,2.23,0,0,0-.51,2.29c2.12,6.84,1.2,12.26-.49,16.19-.95,2.2-1.85,2.05-2-.34-.25-4.64-1-9.88-3-14.19-3.11-6.94-7-14.34-8.89-17.88v-.05c3.24-1.49,8.86-4.83,11.37-10.88s4.48-18-9.82-31.74c-6.28-6.05-22.1-17.16-36.06-27-10.9-7.65-22.17-15.56-23.65-17.51-4.49-5.89-6.37-9.3-6.94-19.65.07-2.3.13-4.59.19-6.89l.27-2.49a.58.58,0,0,1,1.15,0,63.07,63.07,0,0,0,2,9.72c1.08,3.73,2.4,7.58,3.62,9.18,3.19,4.22,7.56,7.39,11.67,8.49a5.48,5.48,0,0,0,5-.72c2.93-2.33,2.65-7.6,2.19-16.34-.47-9-1.11-21.34,1.85-34.55,5.62-25,10.91-32.51,17.61-42,.86-1.22,1.75-2.47,2.65-3.79,1.44-2.08,3-4.1,4.67-6.23,7.47-9.61,15.93-20.49,13.92-40.95-.51-5.19-.76-8.83-.86-11.39a1,1,0,0,1,1.88-.59l.49.77,1.21,2c4.86,8,13.64,22.57,25.1,22.57a13.62,13.62,0,0,0,2.36-.21c23.39-3.93,51.9-30.25,52.17-30.51,3.12-3,2.84-6.14,1.64-7.91a5.18,5.18,0,0,0-6.45-1.72c-3.29,1.4-7.14,3.15-11.22,5-13.82,6.27-37,16.75-42.25,14.34a23.11,23.11,0,0,1-6.32-5.13,1,1,0,0,1,1.14-1.65c5.59,2.29,9.55,1.45,14.2-.08l1-.34c9.37-3.09,14.2-4.77,30.76-12.08a97.55,97.55,0,0,1,16.26-5.93c4-1,6.42-1.63,7.71-4.34a6.65,6.65,0,0,0-.5-7.13c-1.53-1.87-4.07-2.57-7-1.9-3.22.75-4.7,3-6.41,4.49-2.4,2.05-5,4.16-17.19,8.65-27,10-34.58,10.61-45.21,3.43-9.84-6.69-15.15-13.23-15.15-16,0-2.13,5.45-5.7,8.71-7.84,1.33-.87,2.59-1.69,3.62-2.46,4.34-3.22,13-11.39,13.38-11.73,5.4-5.41,17.91-2.18,25,2.58a2.23,2.23,0,0,0,1.72.41,2.14,2.14,0,0,0,1.68-2.58c-4.2-17.46-.13-27.34,4-32.55a22.58,22.58,0,0,1,17.48-8.48c12.81,0,21.76,10,21.76,24.42,0,11-2.82,16.79-5.48,20.3a1.73,1.73,0,0,1-2.58.18,1.78,1.78,0,0,1-.24-2.2A24.61,24.61,0,0,0,290,114a16.58,16.58,0,0,0-16.84-16.67c-3.94,0-13.48,1.5-16.77,15.44a29.81,29.81,0,0,0-.34,11.07l.08.71c.9,7.38,15.3,12.51,27.23,15.51,11.36,2.85,13,6.22,8.84,19.63s3.11,26.23,5.7,29.57a78.3,78.3,0,0,1,8.31,12.47,93.8,93.8,0,0,1,6.62,16.48c2.17,6.79,4.05,12.65,10.63,21.22,11.07,14.4,17.66,48.64,15,78-.21,2.41-.53,4.29-.77,5.67-.43,2.53-.72,4.2.66,5.38s3.16.7,7.26-.63l3.43-1.09a109.33,109.33,0,0,1,12.58-2.8,2.15,2.15,0,0,0,1.59-1.16c3.43-6.91,3.85-15.22,4-22.47q0-1.31.06-2.79c.19-7.77.45-18.93-2.95-32a1,1,0,0,1,1.93-.64,93,93,0,0,1,6.66,25.55c2.55,22.58-1.9,32.09-1.94,32.17a1.61,1.61,0,0,0,.95,2.25,17.12,17.12,0,0,1,6.95,4.67c1.46,1.66.93,2.4-1.14,1.62a36.26,36.26,0,0,0-12.77-2.29c-10.4,0-18.09,4.95-21.51,9.19-3.19,3.94-3.7,7.67-3.83,11.27l-.06.05c-7.48-.75-12.94,1.21-17.47,6.21l-.08.09c-6.26,7.75-4,24.63-1.29,38.48h0C322,400.61,326.31,419.68,322.45,431.84Zm96.1,10.07c-15.71,6.71-25.43,14.51-34,21.39-5.65,4.53-11,8.81-17.28,12.14-10.12,5.34-24.91,6.53-33.27-7.7-2.37-4-.71-9.86,1.58-17.95,3.05-10.75,7.23-25.46,3.71-44.65-.94-5.12-1.77-9.51-2.49-13.31C334,377,332.9,371.43,334,367c.63-2.45,3.43-3,5.87-3a20.83,20.83,0,0,1,2.63.19l0,0a29.51,29.51,0,0,0,7,12.1c5.7,5.86,13.63,8.83,23.56,8.85,2.1.17,25.94,1.55,36.54-22.4l0,0c1.46.18,3.65.7,4.3,2.3,1.28,3.19-.27,8.91-1.52,13.5-.9,3.31-1.68,6.16-1.63,8.37.31,16,11,22.78,25.83,32.16,1.79,1.13,3.66,2.31,5.55,3.54S445,425,445,426C444.48,430.79,425,439.16,418.55,441.91Z"
-     id="path2"
-     style="fill:#ffffff;fill-opacity:1" />
-</svg>
diff --git a/www/public/resources/styles/stats-hosts.css b/www/public/resources/styles/stats-hosts.css
index 8ea1badb..4f7203b5 100644
--- a/www/public/resources/styles/stats-hosts.css
+++ b/www/public/resources/styles/stats-hosts.css
@@ -20,7 +20,13 @@
 }
 
 .hosts-compact-view {
-    grid-template-columns: 35% 65%;
+    grid-template-columns: 35% 60%;
+    align-items: center;
+}
+
+.hosts-compact-view2 {
+    grid-template-columns: 40% 20%;
+    justify-content: space-evenly;
 }
 
 .host-additionnal-info {
diff --git a/www/views/includes/containers/hosts/list.inc.php b/www/views/includes/containers/hosts/list.inc.php
index 9b1b8aa6..75f8063d 100644
--- a/www/views/includes/containers/hosts/list.inc.php
+++ b/www/views/includes/containers/hosts/list.inc.php
@@ -261,7 +261,7 @@
                                                     <div class="width-100">
                                                         <?php
                                                         if ($compactView) : ?>
-                                                            <div class="grid hosts-compact-view column-gap-20">
+                                                            <div class="grid hosts-compact-view column-gap-40">
                                                                 <div>
                                                                     <div>
                                                                         <p title="Hostname">
@@ -274,37 +274,39 @@
                                                                     </div>
                                                                 </div>
 
-                                                                <div class="grid grid-3 column-gap-20 align-item-center">
-                                                                    <div class="flex align-item-center column-gap-5" title="OS">
-                                                                        <?= \Controllers\Common::printOsIcon($os); ?>
-                                                                        <p><?= ucfirst($os) ?></p>
-                                                                    </div>                                                                    
-
-                                                                    <div class="flex align-item-center column-gap-5" title="Type">
-                                                                        <?= \Controllers\Common::printTypeIcon($type); ?>
-                                                                        <p><?= ucfirst($type) ?></p>
+                                                                <div class="grid hosts-compact-view2 column-gap-20 align-item-center">
+                                                                    <div class="flex flex-direction-column row-gap-10">
+                                                                        <div class="label-icon-tr" title="OS">
+                                                                            <?= \Controllers\Common::printOsIcon($os); ?>
+                                                                            <p class="font-size-13"><?= ucfirst($os) . ' ' . $osVersion ?> </p>
+                                                                        </div>
+
+                                                                        <div class="label-icon-tr" title="Type">
+                                                                            <?= \Controllers\Common::printTypeIcon($type); ?>
+                                                                            <p class="font-size-13"><?= ucfirst($type) ?></p>
+                                                                        </div>
                                                                     </div>
 
-                                                                    <div class="grid grid-3 column-gap-10 align-item-center justify-items-center">
-                                                                        <p class="label-tr" title="<?= $packagesInstalledTotal . ' package(s) installed on this host' ?>"><?= $packagesInstalledTotal ?></p>
-
-                                                                        <p title="<?= $packagesAvailableTotal . ' package update(s) available on this host' ?>">
-                                                                            <?php
-                                                                            if ($packagesAvailableTotal > 0) {
-                                                                                if ($packagesAvailableTotal >= $packagesCountConsideredCritical) {
-                                                                                    echo '<span class="label-white bkg-red">' . $packagesAvailableTotal . '</span>';
-                                                                                } elseif ($packagesAvailableTotal >= $packagesCountConsideredOutdated) {
-                                                                                    echo '<span class="label-white bkg-yellow">' . $packagesAvailableTotal . '</span>';
-                                                                                } else {
-                                                                                    echo '<span class="label-white">' . $packagesAvailableTotal . '</span>';
-                                                                                }
-                                                                            } ?>    
-                                                                        </p>
+                                                                    <div class="flex flex-direction-column row-gap-10">
+                                                                        <div class="label-icon-tr" title="<?= $packagesInstalledTotal . ' package(s) installed on this host' ?>">
+                                                                            <img src="/assets/icons/package.svg" class="icon-np" />
+                                                                            <p class="font-size-13"><?= $packagesInstalledTotal ?></p>
+                                                                        </div>
 
                                                                         <?php
-                                                                        if ($rebootRequired == 'true') {
-                                                                            echo '<img src="/assets/icons/warning.svg" class="icon-np" title="Reboot required" />';
-                                                                        } ?>
+                                                                        if ($packagesAvailableTotal > 0) :
+                                                                            $class = '';
+                                                                            if ($packagesAvailableTotal >= $packagesCountConsideredCritical) {
+                                                                                $class = 'bkg-red';
+                                                                            } elseif ($packagesAvailableTotal >= $packagesCountConsideredOutdated) {
+                                                                                $class = 'bkg-yellow';
+                                                                            } ?>
+                                                                            <div class="label-icon-tr <?= $class ?>" title="<?= $packagesAvailableTotal . ' package update(s) available on this host' ?>">
+                                                                                <img src="/assets/icons/package.svg" class="icon-np" />
+                                                                                <p class="font-size-13"><?= $packagesAvailableTotal ?></p>
+                                                                            </div>
+                                                                            <?php
+                                                                        endif ?>
                                                                     </div>
                                                                 </div>
                                                             </div>