From d38f83c3c2e2d9c92e7f679367e9f7ccadfac442 Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 16 Nov 2023 11:30:27 +0100 Subject: [PATCH 1/5] Console settings: move help text from inline to helptext file --- emhttp/languages/en_US/helptext.txt | 20 ++++++++++++++++++++ emhttp/plugins/dynamix/Console.page | 14 +++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/emhttp/languages/en_US/helptext.txt b/emhttp/languages/en_US/helptext.txt index 8bbe6599c..e0267fa77 100644 --- a/emhttp/languages/en_US/helptext.txt +++ b/emhttp/languages/en_US/helptext.txt @@ -2440,3 +2440,23 @@ Any 3rd party driver installed by a plugin will have a support symbol next to it Click the edit button to add/modify/delete any modprobe.d config file in the config/modprobe.d directory on the flash drive. :end + +:console_keyboard_help: +Select your default keymap for the local console (not the web Terminal). +:end + +:console_screen_help: +**Default:** 'Default' will set the blank timeout to 15 minutes and powersave to 60 minutes. + +**Disabled:** 'Disabled' will disable the blank and powersave timeout. + +**All other values:** Will set the blank timout to the selected value and disable the powersave timeout. +:end + +:console_bash_help: +If set to 'Yes' the bash history will persist reboots, set to 'No' to disable. + +**ATTENTION:** The bash history will be written to the USB Boot device so this will introduce higher wear and tear! + +**Note:** Disabling and Enabling will remove the entire bash history. +:end diff --git a/emhttp/plugins/dynamix/Console.page b/emhttp/plugins/dynamix/Console.page index 94469de13..5b4fa497f 100644 --- a/emhttp/plugins/dynamix/Console.page +++ b/emhttp/plugins/dynamix/Console.page @@ -76,9 +76,7 @@ _(Local keyboard layout)_: $text) echo mk_option($console['keyboard_layout'], $keymap, $text, (!isset($console['keyboard_layout']) && $keymap == 'us' ? 'selected' : ''))?> -
-

Select your default keymap for the local console (not the web Terminal).

-
+:console_keyboard_help: _(Local screen blank time)_: : _(minutes)_ -
-

Default: 'Default' will set the blank timeout to 15 minutes and powersave to 60 minutes.
-Disabled: 'Disabled' will disable the blank and powersave timeout.
-All other values: Will set the blank timout to the selected value and disable the powersave timeout.

-
+:console_screen_help: _(Persistent Bash History)_: : -
-

If set to 'Yes' the bash history will persist reboots, set to 'No' to disable.
ATTENTION: The bash history will be written to the USB Boot device so this will introduce higher wear and tear!
Note: Disabling and Enabling will remove the entire bash history.

-
+:console_bash_help:   : From deb591208f3a83118262e09f0a73046b0712715d Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 16 Nov 2023 11:30:56 +0100 Subject: [PATCH 2/5] GUI search: update styling for black/white themes --- emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css | 4 ++-- emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css b/emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css index 37b334e4f..eae0876f8 100644 --- a/emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css +++ b/emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css @@ -1,3 +1,3 @@ #guiSearchBoxSpan{display:inline-block;position:relative;margin:4px 2px 2px 2px;padding:0;text-align:left;height:auto;line-height:normal;font-size:1.3rem} -#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:1rem;left:1rem;color:#e68a00;z-index:2} -#guiSearchBox{width:50rem;border:2px solid #e68a00;border-radius:20px;padding-left:2.8rem;color:#1c1b1b;background-color:#feefb3} +#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:1rem;left:1rem} +#guiSearchBox{width:50rem;border:none;border-radius:20px;padding-left:3rem;opacity:0.5;invert(100%)} diff --git a/emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css b/emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css index 37b334e4f..eae0876f8 100644 --- a/emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css +++ b/emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css @@ -1,3 +1,3 @@ #guiSearchBoxSpan{display:inline-block;position:relative;margin:4px 2px 2px 2px;padding:0;text-align:left;height:auto;line-height:normal;font-size:1.3rem} -#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:1rem;left:1rem;color:#e68a00;z-index:2} -#guiSearchBox{width:50rem;border:2px solid #e68a00;border-radius:20px;padding-left:2.8rem;color:#1c1b1b;background-color:#feefb3} +#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:1rem;left:1rem} +#guiSearchBox{width:50rem;border:none;border-radius:20px;padding-left:3rem;opacity:0.5;invert(100%)} From c500553d8b91f5aa89a70566f50650a7f7605b56 Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 16 Nov 2023 12:27:25 +0100 Subject: [PATCH 3/5] My servers: fixed invalid translation --- emhttp/plugins/dynamix.my.servers/include/translations.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emhttp/plugins/dynamix.my.servers/include/translations.php b/emhttp/plugins/dynamix.my.servers/include/translations.php index 84445e25f..49eb2b42c 100644 --- a/emhttp/plugins/dynamix.my.servers/include/translations.php +++ b/emhttp/plugins/dynamix.my.servers/include/translations.php @@ -25,8 +25,8 @@ * 3a. This is done so that the translation is available to the rest of the Unraid webgui. * 3b. Unfortunately there are numerous "special characters" that aren't allowed in Unraid's translation keys as they're automatically stripped out. * 3c. This means that we have to create a new translation key that is a "safe" version of the translation key used in the web components. - * 3d. Special characters that are not allowed are: . ( ) { } [ ] ; ' " < > * / - * 3e. There are likely more but I'm unable to find the documentation PDF. Go figure. + * 3d. Special characters that are not allowed are: ? { } | & ~ ! [ ] ( ) / : * ^ . " ' + * 3e. There are likely more but I'm unable to find the documentation PDF - updated list of invalid characters above as mentioned in the language guide document. * * Usage example: * ``` @@ -277,7 +277,7 @@ class WebComponentTranslations 'Checking...' => _('Checking...'), 'View release notes' => _('View release notes'), 'View Changelog for {0}' => sprintf(_('View Changelog for %s'), '{0}'), - 'View Changelog & Update' => _('View Changelog & Update'), + 'View Changelog Update' => _('View Changelog & Update'), '{0} Release Notes' => sprintf(_('%s Release Notes'), '{0}'), 'Unable to open release notes' => _('Unable to open release notes'), 'Downgrades are only recommended if you\'re unable to solve a critical issue.' => _('Downgrades are only recommended if you\'re unable to solve a critical issue.'), From 66a642f918f6f0761f92a80f848eec3a190fb8da Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 16 Nov 2023 17:36:09 +0100 Subject: [PATCH 4/5] VM machines: insert space between text and icon Fix English phrase --- emhttp/plugins/dynamix.vm.manager/include/VMMachines.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php index e82f84573..fdaa51e82 100644 --- a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php +++ b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php @@ -185,7 +185,7 @@ foreach ($vms as $vm) { $changemedia = "getisoimageboth(\"{$uuid}\",\"hda\",\"{$cdbus}\",\"{$cdfile}\",\"hdb\",\"{$cdbus2}\",\"{$cdfile2}\")"; $title = _('Select ISO image'); - $cdstr = $cdromcount." / 2"; + $cdstr = $cdromcount." / 2 "; echo ""; echo "$image$vm
"._($status)." $snapshotstcount"; echo "$desc"; @@ -247,8 +247,8 @@ foreach ($vms as $vm) { } else { $title = _('Insert CD'); $changemedia = "changemedia(\"{$uuid}\",\"{$dev}\",\"{$bus}\",\"--select\")"; - $disk = _("No CD image inserted in to drive"); - echo "$disk$bus$capacity$allocation$boot"; + $disk = _("No CD image inserted into drive"); + echo "$disk $bus$capacity$allocation$boot"; } } echo ""; From 6bb9c351a50e3ea657246d8c10f7e718a96ab14d Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 16 Nov 2023 17:50:01 +0100 Subject: [PATCH 5/5] GUI search: update styling for black/white themes --- emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css | 4 ++-- emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css b/emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css index eae0876f8..552540a5f 100644 --- a/emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css +++ b/emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css @@ -1,3 +1,3 @@ #guiSearchBoxSpan{display:inline-block;position:relative;margin:4px 2px 2px 2px;padding:0;text-align:left;height:auto;line-height:normal;font-size:1.3rem} -#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:1rem;left:1rem} -#guiSearchBox{width:50rem;border:none;border-radius:20px;padding-left:3rem;opacity:0.5;invert(100%)} +#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:.8rem;left:1.5rem;font-size:1.3rem} +#guiSearchBox{width:50rem;border:none;border-radius:20px;padding-left:4rem;opacity:0.5;invert(100%)} diff --git a/emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css b/emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css index eae0876f8..552540a5f 100644 --- a/emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css +++ b/emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css @@ -1,3 +1,3 @@ #guiSearchBoxSpan{display:inline-block;position:relative;margin:4px 2px 2px 2px;padding:0;text-align:left;height:auto;line-height:normal;font-size:1.3rem} -#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:1rem;left:1rem} -#guiSearchBox{width:50rem;border:none;border-radius:20px;padding-left:3rem;opacity:0.5;invert(100%)} +#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:.8rem;left:1.5rem;font-size:1.3rem} +#guiSearchBox{width:50rem;border:none;border-radius:20px;padding-left:4rem;opacity:0.5;invert(100%)}