diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page index 835bcfc2f..b6da578d3 100755 --- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page +++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page @@ -471,7 +471,7 @@ function loadlist() { elementSelectorsForSpacing: [ '#kvm_table', ], - manualSpacingOffset: 30, // without this, the main content will still be scrollable by like 20px + manualSpacingOffset: 50, // without this, the main content will still be scrollable by like 20px }); // Handle table header fixed positioning after resize function tableHeaderResize() { diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page old mode 100644 new mode 100755 index 647d2931c..741f17321 --- a/emhttp/plugins/dynamix/DisplaySettings.page +++ b/emhttp/plugins/dynamix/DisplaySettings.page @@ -152,24 +152,18 @@ _(Language)_: _(Font size)_: : :display_font_size_help: _(Terminal font size)_: : :display_tty_size_help: diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php old mode 100644 new mode 100755 index cc5e088a4..a985f8903 --- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php +++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php @@ -1,6 +1,6 @@ isSidebarTheme(); $themeHelper->updateDockerLogColor($docroot); $display['font'] = filter_var($_COOKIE['fontSize'] ?? $display['font'] ?? '', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); - +// adjust font size if cookie was set to a value that is not supported +switch ($display['font']) { + case "50": + $display['font'] = "56.25"; + break; + case "75": + $display['font'] = "68.75"; + break; + case "80": + $display['font'] = "68.75"; + break; +} $header = $display['header']; // keep $header, $backgnd vars for plugin backwards compatibility for the time being $backgnd = $display['background']; diff --git a/sbin/upgrade b/sbin/upgrade index d84d52a49..90e0afa0f 100755 --- a/sbin/upgrade +++ b/sbin/upgrade @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Lime Technology, Inc. +# Copyright 2025 Lime Technology, Inc. # Unraid OS upgrade script. # Invoked early in emhttpd execution. @@ -31,5 +31,8 @@ fi # stating with 6.10 'USE_SSL="auto"' without a LE cert is invalid [[ ! -f /boot/config/ssl/certs/certificate_bundle.pem ]] && sed -i s/USE_SSL=\"auto\"/USE_SSL=\"no\"/ /boot/config/ident.cfg +# remove support for huge / very large / very small font sizes (replace with nearest size still supported) +[ -f "/boot/config/plugins/dynamix/dynamix.cfg" ] && sed -ri -e 's/font="(80|75)"/font="68.75"/g' -e 's/font="50"/font="56.25"/g' -e 's/tty="11"/tty="13"/g' -e 's/tty="(19|21)"/tty="17"/g' "/boot/config/plugins/dynamix/dynamix.cfg" + # delete any temp dir left over from a version downgrade (see dynamix.plugin.manager/include/Downgrade.php) rm -rf /boot/deletemedowngrade.*