From 06e49f7adbeaac073a30b71a106dfabe80ac8d37 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Sun, 22 Sep 2024 17:05:49 +1000 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9ADocs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/BACKUPS.md | 2 +- front/css/app.css | 5 ++ front/deviceDetails.php | 6 +-- front/index.php | 4 +- front/plugins/sync/README.md | 68 ++++++++++++++++++--------- front/plugins/ui_settings/config.json | 4 +- 6 files changed, 58 insertions(+), 31 deletions(-) diff --git a/docs/BACKUPS.md b/docs/BACKUPS.md index 8f21aabc..c8cce5cf 100755 --- a/docs/BACKUPS.md +++ b/docs/BACKUPS.md @@ -8,7 +8,7 @@ There are 3 artifacts that can be used to backup the application: | File | Description | Limitations | |-----------------------|-------------------------------|-------------------------------| | `/db/app.db` | Database file(s) | The database file might be in an uncommitted state or corrupted | -| `/config/app.conf` | Configuration file | Doesn't contain settings from the Maintenance section | +| `/config/app.conf` | Configuration file | Can be overriden with the [`APP_CONF_OVERRIDE` env variable](https://github.com/jokob-sk/NetAlertX/tree/main/dockerfiles#docker-environment-variables). | | `/config/devices.csv` | CSV file containing device information | Doesn't contain historical data | ## Data and backup storage diff --git a/front/css/app.css b/front/css/app.css index fd31ed46..74d24be2 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -1097,6 +1097,11 @@ input[readonly] { display: inline-block; } +#settingsPage .form-control +{ + min-height: 42px; +} + #settingsPage .select2-selection { background-color: rgb(96, 96, 96); diff --git a/front/deviceDetails.php b/front/deviceDetails.php index 6aa28f39..3655a3a4 100755 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -1445,10 +1445,10 @@ function setDeviceData (direction='', refreshCallback='') { // update data to server $.get('php/server/devices.php?action=setDeviceData&mac='+ mac - + '&name=' + encodeURIComponent($('#txtName').val()) - + '&owner=' + encodeURIComponent($('#txtOwner').val()) + + '&name=' + encodeURIComponent($('#txtName').val().replace(/'/g, "")) + + '&owner=' + encodeURIComponent($('#txtOwner').val().replace(/'/g, "")) + '&type=' + $('#txtDeviceType').val() - + '&vendor=' + encodeURIComponent($('#txtVendor').val()) + + '&vendor=' + encodeURIComponent($('#txtVendor').val().replace(/'/g, "")) + '&icon=' + encodeURIComponent($('#txtIcon').val()) + '&favorite=' + ($('#chkFavorite')[0].checked * 1) + '&group=' + encodeURIComponent($('#txtGroup').val()) diff --git a/front/index.php b/front/index.php index 24c8b554..499b318a 100755 --- a/front/index.php +++ b/front/index.php @@ -78,7 +78,7 @@ if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1) - Net Alert X | Log in + NetAlert X | Log in @@ -104,7 +104,7 @@ if ($ENABLED_DARKMODE === True) {