From d874668ce1a00c99a0395655228626eca7ac0b49 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 10 Nov 2023 21:50:04 +0000
Subject: [PATCH] Stylize sidebar status indicators

---
 app/css/all.css                      | 6 +++++-
 includes/sidebar.php                 | 6 +++---
 includes/sysstats.php                | 4 ++--
 locale/en_US/LC_MESSAGES/messages.po | 8 ++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/css/all.css b/app/css/all.css
index 1800f67f..ea4ee935 100644
--- a/app/css/all.css
+++ b/app/css/all.css
@@ -52,7 +52,11 @@ License: GNU General Public License v3.0
 
 .info-item-xs {
   font-size: 0.7rem;
-  margin-left: 0.3rem;
+  margin-left: 0.75rem;
+}
+
+.sb-status {
+  margin-left: 0.75rem!important;
 }
 
 .info-item-wifi {
diff --git a/includes/sidebar.php b/includes/sidebar.php
index 13558354..3b755770 100755
--- a/includes/sidebar.php
+++ b/includes/sidebar.php
@@ -10,15 +10,15 @@
             <img src="app/img/raspAP-logo.php" class="navbar-logo" width="64" height="64">
           </div>
           <div class="col-xs ml-2">
-            <div class="ml-1">Status</div>
+            <div class="ml-1 sb-status">Status</div>
             <div class="info-item-xs"><span class="icon">
               <i class="fas fa-circle <?php echo ($hostapd_led); ?>"></i></span> <?php echo _("Hotspot").' '. _($hostapd_status); ?>
             </div>
             <div class="info-item-xs"><span class="icon">
-              <i class="fas fa-circle <?php echo ($memused_led); ?>"></i></span> <?php echo _("Memory Use").': '. htmlspecialchars(strval($memused), ENT_QUOTES); ?>%
+              <i class="fas fa-circle <?php echo ($memused_led); ?>"></i></span> <?php echo _("Mem Use").': '. htmlspecialchars(strval($memused), ENT_QUOTES); ?>%
             </div>
             <div class="info-item-xs"><span class="icon">
-              <i class="fas fa-circle <?php echo ($cputemp_led); ?>"></i></span> <?php echo _("CPU Temp").': '. htmlspecialchars($cputemp, ENT_QUOTES); ?>°C
+              <i class="fas fa-circle <?php echo ($cputemp_led); ?>"></i></span> <?php echo _("CPU").': '. htmlspecialchars($cputemp, ENT_QUOTES); ?>°C
             </div>
           </div>
         </div>
diff --git a/includes/sysstats.php b/includes/sysstats.php
index 2f567a8b..4bc599e6 100755
--- a/includes/sysstats.php
+++ b/includes/sysstats.php
@@ -46,10 +46,10 @@ if ($cputemp > 70) {
 // hostapd status
 $hostapd = $system->hostapdStatus();
 if ($hostapd[0] ==1) {
-    $hostapd_status = "active";
+    $hostapd_status = "up";
     $hostapd_led = "service-status-up";
 } else {
-    $hostapd_status = "inactive";
+    $hostapd_status = "down";
     $hostapd_led = "service-status-down";
 }
 
diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po
index 4a2f4948..ece177d8 100644
--- a/locale/en_US/LC_MESSAGES/messages.po
+++ b/locale/en_US/LC_MESSAGES/messages.po
@@ -37,11 +37,11 @@ msgstr "WiFi client"
 msgid "Hotspot"
 msgstr "Hotspot"
 
-msgid "Memory Use"
-msgstr "Memory Use"
+msgid "Mem Use"
+msgstr "Mem Use"
 
-msgid "CPU Temp"
-msgstr "CPU Temp"
+msgid "CPU"
+msgstr "CPU"
 
 msgid "Networking"
 msgstr "Networking"