From a3dba96908bd757c0279475b61b6128b748ea29a Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Sat, 7 Jun 2025 09:35:35 +1000 Subject: [PATCH] docs, css fixes --- docs/MIGRATION.md | 2 +- docs/UPDATES.md | 3 +++ front/js/settings_utils.js | 2 +- front/js/ui_components.js | 4 ++-- front/php/templates/footer.php | 2 +- front/settings.php | 2 +- front/workflowsCore.php | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/MIGRATION.md b/docs/MIGRATION.md index 5695b6e4..e3aebcce 100755 --- a/docs/MIGRATION.md +++ b/docs/MIGRATION.md @@ -1,7 +1,7 @@ # Migration form PiAlert to NetAlertX > [!WARNING] -> Follow this guide only after you you downloaded and started NetAlert X at least once after previously using the PiAlert image. +> Follow this guide only after you you downloaded and started a version of NetAlertX prior to v25.6.7 (e.g. `docker pull ghcr.io/jokob-sk/netalertx:25.5.24`) at least once after previously using the PiAlert image. Later versions don't support migration and devices and settings will have to migrated manually, e.g. via [CSV import](./DEVICES_BULK_EDITING.md). ## STEPS: diff --git a/docs/UPDATES.md b/docs/UPDATES.md index 6c1c6e0a..58cf046a 100755 --- a/docs/UPDATES.md +++ b/docs/UPDATES.md @@ -1,5 +1,8 @@ # Docker Update Strategies to upgrade NetAlertX +> [!WARNING] +> For versions prior to `v25.6.7` upgrade to version `v25.5.24` first (`docker pull ghcr.io/jokob-sk/netalertx:25.5.24`) as later versions don't support a full upgrade. Alternatovelly, devices and settings can be migrated manually, e.g. via [CSV import](./DEVICES_BULK_EDITING.md). + This guide outlines approaches for updating Docker containers, usually when upgrading to a newer version of NetAlertX. Each method offers different benefits depending on the situation. Here are the methods: - Manual: Direct commands to stop, remove, and rebuild containers. diff --git a/front/js/settings_utils.js b/front/js/settings_utils.js index 3e190993..4c275ee6 100755 --- a/front/js/settings_utils.js +++ b/front/js/settings_utils.js @@ -433,7 +433,7 @@ function initListInteractionOptions(element) { if (clickCounter === 1) { // Single-click action showModalFieldInput( - ` ${getString( + ` ${getString( "Gen_Update_Value" )}`, getString("settings_update_item_warning"), diff --git a/front/js/ui_components.js b/front/js/ui_components.js index 1a5c133e..9c625395 100755 --- a/front/js/ui_components.js +++ b/front/js/ui_components.js @@ -200,9 +200,9 @@ function validateRegex(elem) { // Validate against regex if (regex.test(value)) { - iconSpan.html(""); + iconSpan.html(""); } else { - iconSpan.html(""); + iconSpan.html(""); } } diff --git a/front/php/templates/footer.php b/front/php/templates/footer.php index 16169163..45e95689 100755 --- a/front/php/templates/footer.php +++ b/front/php/templates/footer.php @@ -28,7 +28,7 @@
- | + | | | | diff --git a/front/settings.php b/front/settings.php index 68d75b1f..0171cff8 100755 --- a/front/settings.php +++ b/front/settings.php @@ -354,7 +354,7 @@ $settingsJSON_DB = json_encode($settings, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX enabledHtml = `
- +
` } diff --git a/front/workflowsCore.php b/front/workflowsCore.php index 91fbe175..edf45bab 100755 --- a/front/workflowsCore.php +++ b/front/workflowsCore.php @@ -144,7 +144,7 @@ function generateWorkflowUI(wf, wfIndex) { ) let $wfEnabledIcon = $("", { - class: `alignRight fa-regular ${wfEnabled ? "fa-dot-circle" : "fa-circle" }` + class: `alignRight fa ${wfEnabled ? "fa-dot-circle" : "fa-circle" }` });