From b977781937d2c233150b30c926e2908d59cfc56f Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Sat, 13 Apr 2024 07:13:09 +1000 Subject: [PATCH] Fresh install fixes --- dockerfiles/pre-setup.sh | 2 +- front/devices.php | 2 ++ front/php/templates/header.php | 3 +++ front/php/templates/language/en_us.json | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dockerfiles/pre-setup.sh b/dockerfiles/pre-setup.sh index 1ab830c0..0065c7a1 100755 --- a/dockerfiles/pre-setup.sh +++ b/dockerfiles/pre-setup.sh @@ -32,7 +32,7 @@ echo -e '#!/bin/execlineb -P [INSTALL] 🚀 Starting app (:${PORT}) " }' > /etc/s6-overlay/s6-rc.d/$APP_NAME/run -echo -e "python ${INSTALL_DIR}/server" >> /etc/s6-overlay/s6-rc.d/server/run +echo -e "python ${INSTALL_DIR}/server" >> /etc/s6-overlay/s6-rc.d/$APP_NAME/run touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx} /etc/s6-overlay/s6-rc.d/{php-fpm,nginx}/dependencies.d/SetupOneshot touch /etc/s6-overlay/s6-rc.d/user/contents.d/{SetupOneshot,php-fpm,nginx,$APP_NAME} /etc/s6-overlay/s6-rc.d/{php-fpm,nginx,$APP_NAME}/dependencies.d/SetupOneshot touch /etc/s6-overlay/s6-rc.d/nginx/dependencies.d/php-fpm diff --git a/front/devices.php b/front/devices.php index 7ef18f8b..36f7ed72 100755 --- a/front/devices.php +++ b/front/devices.php @@ -402,6 +402,8 @@ function filterDataByStatus(data, status) { return item.dev_NewDevice === 1; case 'down': return (item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown !== 0) || item.dev_PresentLastScan === 0; + case 'down_only': + return (item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown !== 0); case 'archived': return item.dev_Archived === 1; default: diff --git a/front/php/templates/header.php b/front/php/templates/header.php index 932817f4..1f8ee23b 100755 --- a/front/php/templates/header.php +++ b/front/php/templates/header.php @@ -255,6 +255,9 @@ if ($ENABLED_DARKMODE === True) {
  • +
  • + +
  • diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 992b394f..8a506cb0 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -189,6 +189,7 @@ "Device_Shortcut_Connected": "Connected", "Device_Shortcut_Devices": "Devices", "Device_Shortcut_DownAlerts": "Down & Offline", + "Device_Shortcut_DownOnly": "Down", "Device_Shortcut_Favorites": "Favorites", "Device_Shortcut_NewDevices": "New Devices", "Device_Shortcut_OnlineChart": "Device presence",