From 1a22a096504702338e89c9822989c73daf9f5d6b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 15 Mar 2023 16:04:43 +0100
Subject: [PATCH 01/18] Improve display for mobile devices

---
 plugins/dynamix.docker.manager/include/CreateDocker.php | 2 +-
 plugins/dynamix.docker.manager/log.htm                  | 2 +-
 plugins/dynamix.plugin.manager/include/ShowChanges.php  | 2 +-
 plugins/dynamix.vm.manager/VMMachines.page              | 2 +-
 plugins/dynamix.vm.manager/vnc.html                     | 2 +-
 plugins/dynamix/DashStats.page                          | 2 +-
 plugins/dynamix/PHPsettings.page                        | 2 +-
 plugins/dynamix/include/.login.php                      | 2 +-
 plugins/dynamix/include/.set-password.php               | 2 +-
 plugins/dynamix/include/Boot.php                        | 2 +-
 plugins/dynamix/include/CryptoBenchmark.php             | 2 +-
 plugins/dynamix/include/DefaultPageLayout.php           | 2 +-
 plugins/dynamix/include/ReplaceKey.php                  | 2 +-
 plugins/dynamix/include/TrialRequest.php                | 2 +-
 plugins/dynamix/styles/default-black.css                | 2 +-
 plugins/dynamix/styles/default-white.css                | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index fcecbb68a..2a34b53f2 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -948,7 +948,7 @@ _(Privileged)_:
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 </head>
diff --git a/plugins/dynamix.docker.manager/log.htm b/plugins/dynamix.docker.manager/log.htm
index f233e7d8a..797aa39a9 100644
--- a/plugins/dynamix.docker.manager/log.htm
+++ b/plugins/dynamix.docker.manager/log.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <style>
diff --git a/plugins/dynamix.plugin.manager/include/ShowChanges.php b/plugins/dynamix.plugin.manager/include/ShowChanges.php
index cdc0bea6e..242c8ba2b 100644
--- a/plugins/dynamix.plugin.manager/include/ShowChanges.php
+++ b/plugins/dynamix.plugin.manager/include/ShowChanges.php
@@ -30,7 +30,7 @@ $good  = false;
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 9365ecd8a..a66e4edc8 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -297,7 +297,7 @@ $(function() {
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
diff --git a/plugins/dynamix.vm.manager/vnc.html b/plugins/dynamix.vm.manager/vnc.html
index 6e9ea184e..973abe5fb 100644
--- a/plugins/dynamix.vm.manager/vnc.html
+++ b/plugins/dynamix.vm.manager/vnc.html
@@ -44,7 +44,7 @@
     <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
 
     <!-- Apple iOS Safari settings -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="viewport" content="width=1300">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <!-- Home Screen Icons (favourites and bookmarks use the normal icons) -->
diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index e24d77c65..22cfbcfeb 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -631,7 +631,7 @@ if (!$group) {
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
diff --git a/plugins/dynamix/PHPsettings.page b/plugins/dynamix/PHPsettings.page
index eb2681adf..0c2da482f 100644
--- a/plugins/dynamix/PHPsettings.page
+++ b/plugins/dynamix/PHPsettings.page
@@ -76,7 +76,7 @@ _(Error reporting level)_:
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 </head>
diff --git a/plugins/dynamix/include/.login.php b/plugins/dynamix/include/.login.php
index 9acb97211..f5dd45749 100644
--- a/plugins/dynamix/include/.login.php
+++ b/plugins/dynamix/include/.login.php
@@ -248,7 +248,7 @@ $theme_dark = in_array($display['theme'], ['black', 'gray']);
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="Expires" content="0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="viewport" content="width=1300">
     <meta name="robots" content="noindex, nofollow">
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <meta name="referrer" content="same-origin">
diff --git a/plugins/dynamix/include/.set-password.php b/plugins/dynamix/include/.set-password.php
index 3c4b1f97c..0f4a3bc77 100644
--- a/plugins/dynamix/include/.set-password.php
+++ b/plugins/dynamix/include/.set-password.php
@@ -50,7 +50,7 @@ $THEME_DARK = in_array($display['theme'],['black','gray']);
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="Expires" content="0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="viewport" content="width=1300">
     <meta name="robots" content="noindex, nofollow">
     <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
     <meta name="referrer" content="same-origin">
diff --git a/plugins/dynamix/include/Boot.php b/plugins/dynamix/include/Boot.php
index 8c6bb9b30..8841b82dc 100644
--- a/plugins/dynamix/include/Boot.php
+++ b/plugins/dynamix/include/Boot.php
@@ -29,7 +29,7 @@ $var = parse_ini_file("/var/local/emhttp/var.ini");
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/default-fonts.css')?>">
diff --git a/plugins/dynamix/include/CryptoBenchmark.php b/plugins/dynamix/include/CryptoBenchmark.php
index a1c179d78..c46c541e3 100644
--- a/plugins/dynamix/include/CryptoBenchmark.php
+++ b/plugins/dynamix/include/CryptoBenchmark.php
@@ -32,7 +32,7 @@ $hash = trim(explode(':',$hash)[1]);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index 36a229b02..fe1566067 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -35,7 +35,7 @@ function annotate($text) {echo "\n<!--\n",str_repeat("#",strlen($text)),"\n$text
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <link type="image/png" rel="shortcut icon" href="/webGui/images/<?=_var($var,'mdColor','red-on')?>.png">
diff --git a/plugins/dynamix/include/ReplaceKey.php b/plugins/dynamix/include/ReplaceKey.php
index b3dc5913f..8f28549ed 100644
--- a/plugins/dynamix/include/ReplaceKey.php
+++ b/plugins/dynamix/include/ReplaceKey.php
@@ -28,7 +28,7 @@ $keyfile = base64_encode(file_get_contents($var['regFILE']));
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
diff --git a/plugins/dynamix/include/TrialRequest.php b/plugins/dynamix/include/TrialRequest.php
index 7167d19ef..485e88ddc 100644
--- a/plugins/dynamix/include/TrialRequest.php
+++ b/plugins/dynamix/include/TrialRequest.php
@@ -32,7 +32,7 @@ if (!empty($_POST['trial'])) {
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
 <meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="viewport" content="width=1300">
 <meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
diff --git a/plugins/dynamix/styles/default-black.css b/plugins/dynamix/styles/default-black.css
index 191df9cab..04567ad7c 100644
--- a/plugins/dynamix/styles/default-black.css
+++ b/plugins/dynamix/styles/default-black.css
@@ -61,7 +61,7 @@ div.title span.left{font-size:1.4rem}
 div.title span.right{font-size:1.4rem;padding-top:2px;padding-right:10px;float:right}
 div.title span img{padding-right:4px}
 div.title.shift{margin-top:-30px}
-#menu{position:absolute;top:90px;left:0;right:0;display:grid;grid-template-columns:auto minmax(400px,auto);z-index:101}
+#menu{position:absolute;top:90px;left:0;right:0;display:grid;grid-template-columns:auto max-content;z-index:101}
 .nav-tile{height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;letter-spacing:1.8px;background-color:#f2f2f2;white-space:nowrap;overflow-x:scroll;overflow-y:hidden;}
 .nav-tile::-webkit-scrollbar{height:8px}
 .nav-tile.right{text-align:right}
diff --git a/plugins/dynamix/styles/default-white.css b/plugins/dynamix/styles/default-white.css
index 41e3844c8..3cb542331 100644
--- a/plugins/dynamix/styles/default-white.css
+++ b/plugins/dynamix/styles/default-white.css
@@ -61,7 +61,7 @@ div.title span.left{font-size:1.4rem}
 div.title span.right{font-size:1.4rem;padding-top:2px;padding-right:10px;float:right}
 div.title span img{padding-right:4px}
 div.title.shift{margin-top:-30px}
-#menu{position:absolute;top:90px;left:0;right:0;display:grid;grid-template-columns:auto minmax(400px,auto);z-index:101}
+#menu{position:absolute;top:90px;left:0;right:0;display:grid;grid-template-columns:auto max-content;z-index:101}
 .nav-tile{height:4rem;line-height:4rem;padding:0;margin:0;font-size:1.2rem;letter-spacing:1.8px;background-color:#1c1b1b;white-space:nowrap;overflow-x:scroll;overflow-y:hidden;}
 .nav-tile::-webkit-scrollbar{height:8px}
 .nav-tile.right{text-align:right}

From c968c02a2537e00b8bfbba323603458e23b78e5b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 15 Mar 2023 16:19:33 +0100
Subject: [PATCH 02/18] VM: fix template display

---
 plugins/dynamix.vm.manager/VMMachines.page | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index a66e4edc8..714152ea1 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -173,8 +173,7 @@ function getisoimage(uuid,dev,bus,file){
   var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
   var match= ".iso";
   var box = $("#dialogWindow");
-  box.html($("#templateISO").html());
-
+  box.html($("#templateISO").html().build());
   box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).fileTreeAttach(null,null,function(path){
       var bits = path.substr(1).split('/');
       var auto = bits.length>3 ? '' : share;
@@ -292,6 +291,7 @@ $(function() {
 
 <div id="dialogWindow"></div>
 <div markdown="1" id="templateISO" class="template">
+<!--!
 <html <?=_var($display,'rtl')?>lang="<?=strtok($locale,'_')?:'en'?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -308,4 +308,5 @@ _(ISO Image)_:
 
 </body>
 </html>
+!-->
 </div>
\ No newline at end of file

From 852d0d34a032fa2287895a6fa73ba08f66aa418e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 15 Mar 2023 16:27:06 +0100
Subject: [PATCH 03/18] VM: fix template display

---
 plugins/dynamix.vm.manager/VMMachines.page | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 714152ea1..043350708 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -147,6 +147,8 @@ div.template,div#dialogWindow,input#upload{display:none}
 <script src="<?autov('/plugins/dynamix.vm.manager/javascript/vmmanager.js')?>"></script>
 <script src="<?autov("/webGui/javascript/jquery.filetree.js")?>"></script>
 <script>
+String.prototype.build = function(){return this.replace(/\n(<!--!|!-->)\n/g,'');}
+
 <?if (_var($display,'resize')):?>
 function resize(bind) {
   var width = [];

From a97f9267e1d67910fd46a145e098aad6dbf4200a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 15 Mar 2023 16:54:32 +0100
Subject: [PATCH 04/18] VM: fix template display

---
 plugins/dynamix.vm.manager/VMMachines.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 043350708..37e4e657f 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -293,8 +293,8 @@ $(function() {
 
 <div id="dialogWindow"></div>
 <div markdown="1" id="templateISO" class="template">
-<!--!
 <html <?=_var($display,'rtl')?>lang="<?=strtok($locale,'_')?:'en'?>">
+<!--!
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -304,11 +304,11 @@ $(function() {
 <meta name="referrer" content="same-origin">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
 </head>
+!-->
 <body>
 _(ISO Image)_:
 : <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
 
 </body>
 </html>
-!-->
 </div>
\ No newline at end of file

From 9dd1a65d0c3e9a565db2842fcc4d626d03e1030b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 15 Mar 2023 16:58:19 +0100
Subject: [PATCH 05/18] Revert "VM: fix template display"

This reverts commit a97f9267e1d67910fd46a145e098aad6dbf4200a.
---
 plugins/dynamix.vm.manager/VMMachines.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 37e4e657f..043350708 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -293,8 +293,8 @@ $(function() {
 
 <div id="dialogWindow"></div>
 <div markdown="1" id="templateISO" class="template">
-<html <?=_var($display,'rtl')?>lang="<?=strtok($locale,'_')?:'en'?>">
 <!--!
+<html <?=_var($display,'rtl')?>lang="<?=strtok($locale,'_')?:'en'?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -304,11 +304,11 @@ $(function() {
 <meta name="referrer" content="same-origin">
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
 </head>
-!-->
 <body>
 _(ISO Image)_:
 : <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
 
 </body>
 </html>
+!-->
 </div>
\ No newline at end of file

From d222eb6730860b9943de41809892e8ea39c3bcdc Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 15 Mar 2023 16:58:24 +0100
Subject: [PATCH 06/18] Revert "VM: fix template display"

This reverts commit 852d0d34a032fa2287895a6fa73ba08f66aa418e.
---
 plugins/dynamix.vm.manager/VMMachines.page | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 043350708..714152ea1 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -147,8 +147,6 @@ div.template,div#dialogWindow,input#upload{display:none}
 <script src="<?autov('/plugins/dynamix.vm.manager/javascript/vmmanager.js')?>"></script>
 <script src="<?autov("/webGui/javascript/jquery.filetree.js")?>"></script>
 <script>
-String.prototype.build = function(){return this.replace(/\n(<!--!|!-->)\n/g,'');}
-
 <?if (_var($display,'resize')):?>
 function resize(bind) {
   var width = [];

From da510b844d3cda02a89a54125a4a74aa7cd56519 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 15 Mar 2023 16:58:31 +0100
Subject: [PATCH 07/18] Revert "VM: fix template display"

This reverts commit c968c02a2537e00b8bfbba323603458e23b78e5b.
---
 plugins/dynamix.vm.manager/VMMachines.page | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 714152ea1..a66e4edc8 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -173,7 +173,8 @@ function getisoimage(uuid,dev,bus,file){
   var root = <?= '"'.$domain_cfg["MEDIADIR"].'"';?>;
   var match= ".iso";
   var box = $("#dialogWindow");
-  box.html($("#templateISO").html().build());
+  box.html($("#templateISO").html());
+
   box.find('#target').attr('data-pickroot',root).attr('data-picktop',root).attr('data-pickmatch',match).fileTreeAttach(null,null,function(path){
       var bits = path.substr(1).split('/');
       var auto = bits.length>3 ? '' : share;
@@ -291,7 +292,6 @@ $(function() {
 
 <div id="dialogWindow"></div>
 <div markdown="1" id="templateISO" class="template">
-<!--!
 <html <?=_var($display,'rtl')?>lang="<?=strtok($locale,'_')?:'en'?>">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -308,5 +308,4 @@ _(ISO Image)_:
 
 </body>
 </html>
-!-->
 </div>
\ No newline at end of file

From 66db4e7570535fce9663685ccb0cc8df447a9b9b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 01:45:56 +0100
Subject: [PATCH 08/18] Make "Lock" a page variable

---
 plugins/dynamix.docker.manager/Docker.page    |  1 +
 plugins/dynamix.vm.manager/VMs.page           |  1 +
 plugins/dynamix/Dashboard.page                |  1 +
 plugins/dynamix/include/DefaultPageLayout.php | 16 ++++++++--------
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/dynamix.docker.manager/Docker.page b/plugins/dynamix.docker.manager/Docker.page
index d3a43ecb7..9bd7c897d 100644
--- a/plugins/dynamix.docker.manager/Docker.page
+++ b/plugins/dynamix.docker.manager/Docker.page
@@ -1,6 +1,7 @@
 Menu="Tasks:60"
 Type="xmenu"
 Code="e90b"
+Lock="true"
 Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\")"
 ---
 <?PHP
diff --git a/plugins/dynamix.vm.manager/VMs.page b/plugins/dynamix.vm.manager/VMs.page
index 2f5e8f9ea..f9e5d4218 100644
--- a/plugins/dynamix.vm.manager/VMs.page
+++ b/plugins/dynamix.vm.manager/VMs.page
@@ -1,6 +1,7 @@
 Menu="Tasks:70"
 Type="xmenu"
 Code="e918"
+Lock="true"
 Cond="exec(\"grep -o '^SERVICE=.enable' /boot/config/domain.cfg 2>/dev/null\")"
 ---
 <?PHP
diff --git a/plugins/dynamix/Dashboard.page b/plugins/dynamix/Dashboard.page
index 2b324f980..3c5d1a68a 100644
--- a/plugins/dynamix/Dashboard.page
+++ b/plugins/dynamix/Dashboard.page
@@ -2,4 +2,5 @@ Menu="Tasks:1"
 Type="xmenu"
 Tabs="false"
 Code="e943"
+Lock="true"
 Load="30"
\ No newline at end of file
diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index fe1566067..e73a7d83d 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?
-$display['font'] = filter_var($_COOKIE['fontSize']??$display['font']??'', FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+$display['font'] = filter_var($_COOKIE['fontSize']??$display['font']??'',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 $theme   = strtok($display['theme'],'-');
 $header  = $display['header'];
 $backgnd = $display['background'];
@@ -605,14 +605,14 @@ foreach ($tasks as $button) {
   $page = $button['name'];
   $play = $task==$page ? " active" : "";
   echo "<div class='nav-item{$play}'>";
-  echo "<a href=\"/$page\" onclick=\"initab('/$page')\">"._($button['Name'] ?? $page)."</a></div>";
+  echo "<a href=\"/$page\" onclick=\"initab('/$page')\">"._(_var($button,'Name',$page))."</a></div>";
   // create list of nchan scripts to be started
   if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
 }
 unset($tasks);
 echo "</div>";
 echo "<div class='nav-tile right'>";
-if (in_array($task,['Dashboard','Docker','VMs'])) {
+if (isset($myPage['Lock'])) {
   $title = $themes2 ?  "" : _('Unlock sortable items');
   echo "<div class='nav-item LockButton util'><a 'href='#' class='hand' onclick='LockButton();return false;' title=\"$title\"><b class='icon-u-lock system red-text'></b><span>"._('Unlock sortable items')."</span></a></div>";
 }
@@ -630,7 +630,7 @@ foreach ($buttons as $button) {
       $icon = "<b class='fa $icon system'></b>";
     }
     $title = $themes2 ? "" : " title=\""._($button['Title'])."\"";
-    echo "<div class='nav-item {$button['name']} util'><a href='".($button['Href'] ?? '#')."' onclick='{$button['name']}();return false;'{$title}>$icon<span>"._($button['Title'])."</span></a></div>";
+    echo "<div class='nav-item {$button['name']} util'><a href='"._var($button,'Href','#')."' onclick='{$button['name']}();return false;'{$title}>$icon<span>"._($button['Title'])."</span></a></div>";
   } else {
     echo "<div class='{$button['Link']}'></div>";
   }
@@ -655,7 +655,7 @@ echo "<div class='tabs'>";
 $tab = 1;
 $pages = [];
 if (!empty($myPage['text'])) $pages[$myPage['name']] = $myPage;
-if (($myPage['Type'] ?? '')=='xmenu') $pages = array_merge($pages, find_pages($myPage['name']));
+if (_var($myPage,'Type')=='xmenu') $pages = array_merge($pages, find_pages($myPage['name']));
 if (isset($myPage['Tabs'])) $display['tabs'] = strtolower($myPage['Tabs'])=='true' ? 0 : 1;
 $tabbed = $display['tabs']==0 && count($pages)>1;
 
@@ -665,13 +665,13 @@ foreach ($pages as $page) {
     eval("\$title=\"".htmlspecialchars($page['Title'])."\";");
     if ($tabbed) {
       echo "<div class='tab'><input type='radio' id='tab{$tab}' name='tabs' onclick='settab(this.id)'><label for='tab{$tab}'>";
-      echo tab_title($title,$page['root'],$page['Tag']??false);
+      echo tab_title($title,$page['root'],_var($page,'Tag',false));
       echo "</label><div class='content'>";
       $close = true;
     } else {
       if ($tab==1) echo "<div class='tab'><input type='radio' id='tab{$tab}' name='tabs'><div class='content shift'>";
       echo "<div class='title'><span class='left'>";
-      echo tab_title($title,$page['root'],$page['Tag']??false);
+      echo tab_title($title,$page['root'],_var($page,'Tag',false));
       echo "</span></div>";
     }
     $tab++;
@@ -680,7 +680,7 @@ foreach ($pages as $page) {
     $pgs = find_pages($page['name']);
     foreach ($pgs as $pg) {
       @eval("\$title=\"".htmlspecialchars($pg['Title'])."\";");
-      $icon = $pg['Icon'] ?? "<i class='icon-app PanelIcon'></i>";
+      $icon = _var($pg,'Icon',"<i class='icon-app PanelIcon'></i>");
       if (substr($icon,-4)=='.png') {
         $root = $pg['root'];
         if (file_exists("$docroot/$root/images/$icon")) {

From fa5782f5f0a4ea0bbbf761cfbb514eb8b145e60e Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 01:51:21 +0100
Subject: [PATCH 09/18] PHP8 support

---
 .../dynamix.docker.manager/include/CreateDocker.php    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index 2a34b53f2..1f7a7ccc2 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -39,7 +39,7 @@ $cpus   = DockerUtil::cpus();
 
 function cpu_pinning() {
   global $xml,$cpus;
-  $vcpu = explode(',',$xml['CPUset'] ?? '');
+  $vcpu = explode(',',_var($xml,'CPUset'));
   $total = count($cpus);
   $loop = floor(($total-1)/16)+1;
   for ($c = 0; $c < $loop; $c++) {
@@ -73,7 +73,7 @@ function cpu_pinning() {
 if (isset($_POST['contName'])) {
   $postXML = postToXML($_POST, true);
   $dry_run = isset($_POST['dryRun']) && $_POST['dryRun']=='true';
-  $existing = $_POST['existingContainer'] ?? false;
+  $existing = _var($_POST,'existingContainer',false);
   $create_paths = $dry_run ? false : true;
   // Get the command line
   [$cmd, $Name, $Repository] = xmlToCommand($postXML, $create_paths);
@@ -228,9 +228,9 @@ if (isset($_GET['xmlTemplate'])) {
               $arrConfig['Name'] = 'AppData Config Path';
             }
           }
-          $arrConfig['Name'] = strip_tags($arrConfig['Name']??"");
-          $arrConfig['Description'] = strip_tags($arrConfig['Description']??"");
-          $arrConfig['Requires'] = strip_tags($arrConfig['Requires']??"");
+          $arrConfig['Name'] = strip_tags(_var($arrConfig,'Name'));
+          $arrConfig['Description'] = strip_tags(_var($arrConfig,'Description'));
+          $arrConfig['Requires'] = strip_tags(_var($arrConfig,'Requires'));
         }
       }
       if (!empty($dockercfg['DOCKER_APP_UNRAID_PATH']) && file_exists($dockercfg['DOCKER_APP_UNRAID_PATH'])) {

From fa7a4be214ecedce22a317b4b3e22c97f7e379be Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 03:19:39 +0100
Subject: [PATCH 10/18] Revert vnc.html

---
 plugins/dynamix.vm.manager/vnc.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix.vm.manager/vnc.html b/plugins/dynamix.vm.manager/vnc.html
index 973abe5fb..6e9ea184e 100644
--- a/plugins/dynamix.vm.manager/vnc.html
+++ b/plugins/dynamix.vm.manager/vnc.html
@@ -44,7 +44,7 @@
     <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
 
     <!-- Apple iOS Safari settings -->
-    <meta name="viewport" content="width=1300">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <!-- Home Screen Icons (favourites and bookmarks use the normal icons) -->

From 51687a5cd4dd511a8cefd2e7d930e6ab24ae2d25 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 03:37:46 +0100
Subject: [PATCH 11/18] Remove redundant header in templates

---
 .../dynamix.docker.manager/include/CreateDocker.php | 12 ------------
 plugins/dynamix.vm.manager/VMMachines.page          | 13 -------------
 plugins/dynamix/DashStats.page                      | 13 -------------
 plugins/dynamix/PHPsettings.page                    | 10 ----------
 4 files changed, 48 deletions(-)

diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index 1f7a7ccc2..4651b2951 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -943,16 +943,6 @@ _(Privileged)_:
 #    ╚════╝ ╚══════╝       ╚═╝   ╚══════╝╚═╝     ╚═╝╚═╝     ╚══════╝╚═╝  ╚═╝   ╚═╝   ╚══════╝╚══════╝
 ?>
 <div markdown="1" id="templatePopupConfig" style="display:none">
-<html <?=$display['rtl']?>lang="<?=strtok($locale,'_')?:'en'?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=1300">
-<meta name="robots" content="noindex, nofollow">
-<meta name="referrer" content="same-origin">
-</head>
-<body>
 _(Config Type)_:
 : <select name="Type" onchange="toggleMode(this,false)">
   <option value="Path">_(Path)_</option>
@@ -1006,8 +996,6 @@ _(Password Mask)_:
   <option value="true">_(Yes)_</option>
   </select>
 </div>
-</body>
-</html>
 </div>
 
 <div markdown="1" id="templateDisplayConfig" style="display:none">
diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index a66e4edc8..f8ad78761 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -292,20 +292,7 @@ $(function() {
 
 <div id="dialogWindow"></div>
 <div markdown="1" id="templateISO" class="template">
-<html <?=_var($display,'rtl')?>lang="<?=strtok($locale,'_')?:'en'?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=1300">
-<meta name="robots" content="noindex, nofollow">
-<meta name="referrer" content="same-origin">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
-</head>
-<body>
 _(ISO Image)_:
 : <input type="text" id="target" autocomplete="off" spellcheck="false" value="" data-pickcloseonfile="true" data-pickfolders="true" data-pickfilter="" data-pickmatch="" data-pickroot="" data-picktop="">
 
-</body>
-</html>
 </div>
\ No newline at end of file
diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index 22cfbcfeb..799c8d900 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -626,16 +626,6 @@ if (!$group) {
 
 <div id="templateContentMgmt" class="template">
 <!--!
-<html <?=$display['rtl']?>lang="<?=strtok($locale,'_')?:'en'?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=1300">
-<meta name="robots" content="noindex, nofollow">
-<meta name="referrer" content="same-origin">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
-</head>
 <style>
 .item{display:inline-block;width:210px;float:left;height:4rem}
 </style>
@@ -676,10 +666,7 @@ function hideShow() {
   }
 }
 </script>
-<body>
 <div id="list"></div>
-</body>
-</html>
 !-->
 </div>
 
diff --git a/plugins/dynamix/PHPsettings.page b/plugins/dynamix/PHPsettings.page
index 0c2da482f..22ad3fcb3 100644
--- a/plugins/dynamix/PHPsettings.page
+++ b/plugins/dynamix/PHPsettings.page
@@ -72,15 +72,6 @@ _(Error reporting level)_:
 <div markdown="1" id="templateWindow">
 <!--!
 <html <?=$display['rtl']?>lang="<?=strtok($locale,'_')?:'en'?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=1300">
-<meta name="robots" content="noindex, nofollow">
-<meta name="referrer" content="same-origin">
-</head>
-
 <style>
 table{box-shadow:1px 2px 3px rgba(0,0,0,0.2);width:90%}
 .center{text-align:center;color:#f2f2f2!important;background-color:#1c1b1b}
@@ -100,7 +91,6 @@ h2 a{color:#f2f2f2!important}
 .v i{color:#999}
 .h td,td.e,th{border-color:#606A90}
 </style>
-
 <body>
 <?
 ob_start();

From e9121601009b4f6f2a946bdf7839e00a2e87b4d5 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 03:57:05 +0100
Subject: [PATCH 12/18] Remove redundant header in templates

---
 .../dynamix.plugin.manager/include/ShowChanges.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/plugins/dynamix.plugin.manager/include/ShowChanges.php b/plugins/dynamix.plugin.manager/include/ShowChanges.php
index 242c8ba2b..9a74a136c 100644
--- a/plugins/dynamix.plugin.manager/include/ShowChanges.php
+++ b/plugins/dynamix.plugin.manager/include/ShowChanges.php
@@ -23,19 +23,6 @@ require_once "$docroot/webGui/include/Translations.php";
 $valid = ['/var/tmp/','/tmp/plugins/'];
 $good  = false;
 ?>
-<!DOCTYPE HTML>
-<html <?=_var($display,'rtl')?>lang="<?=strtok($locale,'_')?:'en'?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-<meta name="format-detection" content="telephone=no">
-<meta name="viewport" content="width=1300">
-<meta name="robots" content="noindex, nofollow">
-<meta name="referrer" content="same-origin">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
-<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-popup.css")?>">
-</head>
 <body style="margin:14px 10px">
 <?
 if ($file = realpath(unscript(_var($_GET,'file')))) {
@@ -47,4 +34,3 @@ if ($file = realpath(unscript(_var($_GET,'file')))) {
 ?>
 <br><div style="text-align:center"><input type="button" value="<?=_('Done')?>" onclick="top.Shadowbox.close()"></div>
 </body>
-</html>

From 45fb613c91ab5859223d65e31b582275c805d64d Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 05:13:28 +0100
Subject: [PATCH 13/18] Dashboard: lock tile management

---
 plugins/dynamix/DashStats.page | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index 799c8d900..0a010ec21 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -173,7 +173,7 @@ switch ($display['theme']) {
 <style>
 div.frame{padding-top:14px;padding-bottom:160px}
 div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(<?=$themes1?'610px':'570px'?>,1fr));column-gap:30px}
-div.tile{display:none}
+div.tile,i.tile{display:none}
 div#iframe-popup{display:none;-webkit-overflow-scrolling:touch}
 div.last{padding-bottom:12px}
 div.leftside{float:left;width:66%}
@@ -235,7 +235,7 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px}
 <table id='db-box1' class='share_status dashboard'>
 <tbody class='system'>
 <tr><td><?=_var($var,'NAME')?>
-<i class='fa fa-fw fa-wrench control' onclick='contentMgmt()' title="_(Content Management)_"></i><a href='/Dashboard/Settings/Identification'><i class='fa fa-fw fa-cog control' title="_(Go to identification settings)_"></i></a>
+<i class='fa fa-fw fa-wrench control tile' onclick='contentMgmt()' title="_(Content Management)_"></i><a href='/Dashboard/Settings/Identification'><i class='fa fa-fw fa-cog control' title="_(Go to identification settings)_"></i></a>
 <span class='ctrl'>
 <?if ($parity||$mover||$btrfs):?>
 <span class='fa fa-fw fa-<?=$started?'stop':'play'?>-circle busy' title="<?=$started?_("Stop the array"):_("Start the array")?>"></span>
@@ -1052,7 +1052,7 @@ function addProperties() {
   $('tbody.system').addClass('sortable').attr('sort',n++);
   $('tbody').not('.system').each(function(){
     $(this).addClass('sortable').attr('sort',n++);
-    $(this).find('td:first').prepend("<i class='fa fa-fw fa-close control' onclick='dismiss($(this))' title=\"_(Close Tile)_\"></i>");
+    $(this).find('td:first').prepend("<i class='fa fa-fw fa-close control tile' onclick='dismiss($(this))' title=\"_(Close Tile)_\"></i>");
   });
 }
 function showContent() {
@@ -1141,6 +1141,7 @@ function LockButton() {
     $('div.nav-item.LockButton a').prop('title',"_(Lock sortable items)_");
     $('div.nav-item.LockButton b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
 <?endif;?>
+    $('i.tile').show();
     $('div.nav-item.LockButton span').text("_(Lock sortable items)_");
     $('#db-box1,#db-box2,#db-box3').sortable({connectWith:'#db-box1,#db-box2,#db-box3'});
     $('table.dashboard').sortable({helper:sortableHelper,items:'.sortable',cursor:'grab',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
@@ -1162,6 +1163,7 @@ function LockButton() {
     $('div.nav-item.LockButton a').prop('title',"_(Unlock sortable items)_");
     $('div.nav-item.LockButton b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
 <?endif;?>
+    $('i.tile').hide();
     $('div.nav-item.LockButton span').text("_(Unlock sortable items)_");
     $('table.dashboard').sortable('destroy');
   }

From d316c5cede96d91006b6e741248f8ecd4d1bcef3 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 05:13:50 +0100
Subject: [PATCH 14/18] Docker: add move indicator

---
 plugins/dynamix.docker.manager/DockerContainers.page        | 3 +++
 plugins/dynamix.docker.manager/include/DockerContainers.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page
index 5c1f78e5b..a7725cad7 100644
--- a/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/plugins/dynamix.docker.manager/DockerContainers.page
@@ -40,6 +40,7 @@ th.nine{width:9%}
 th.load{width:140px}
 input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent}
 table tbody td{line-height:normal}
+i.mover{margin-right:8px;display:none} 
 </style>
 <table id="docker_containers" class="tablesorter shift">
 <thead><tr><th><a href="#" style="cursor:hand;margin-left:12px;display:inline-block;width:32px" onclick="resetSorting()" title="_(Reset sorting)_"><i class="fa fa-th-list"></i></a>_(Application)_</th><th>_(Version)_</th><th>_(Network)_</th><th>_(Port Mappings)_ <small>(_(App to Host)_)</small></th><th>_(Volume Mappings)_ <small>(_(App to Host)_)</small></th><th class="load advanced">_(CPU & Memory load)_</th><th class="nine">_(Autostart)_</th><th class="five">_(Uptime)_</th></tr></thead>
@@ -97,6 +98,7 @@ var sortableHelper = function(e,ui){
 function LockButton() {
   if ($.cookie('lockbutton') == null) {
     $.cookie('lockbutton','lockbutton');
+    $('i.mover').show();
 <?if ($themes1):?>
     $('div.nav-item.LockButton').find('a').prop('title',"_(Lock sortable items)_");
     $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
@@ -111,6 +113,7 @@ function LockButton() {
     }});
   } else {
     $.removeCookie('lockbutton');
+    $('i.mover').hide();
 <?if ($themes1):?>
     $('div.nav-item.LockButton').find('a').prop('title',"_(Unlock sortable items)_");
     $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php
index 80dfd9693..45801189f 100644
--- a/plugins/dynamix.docker.manager/include/DockerContainers.php
+++ b/plugins/dynamix.docker.manager/include/DockerContainers.php
@@ -99,7 +99,7 @@ foreach ($containers as $ct) {
     [$host_path,$container_path,$access_mode] = my_explode(':',$mount,3);
     $paths[] = sprintf('%s<i class="fa fa-%s" style="margin:0 6px"></i>%s', htmlspecialchars($container_path), $access_mode=='ro'?'long-arrow-left':'arrows-h', htmlspecialchars($host_path));
   }
-  echo "<tr class='sortable'><td class='ct-name' style='width:220px;padding:8px'>";
+  echo "<tr class='sortable'><td class='ct-name' style='width:220px;padding:8px'><i class='fa fa-arrows-v mover orange-text'></i>";
   if ($template) {
     $appname = "<a class='exec' onclick=\"editContainer('".addslashes(htmlspecialchars($name))."','".addslashes(htmlspecialchars($template))."')\">".htmlspecialchars($name)."</a>";
   } else {

From 243fe697b0c70189967f8e31f1fac56d59389db2 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 05:14:06 +0100
Subject: [PATCH 15/18] VM; add move indicator

---
 plugins/dynamix.vm.manager/VMMachines.page        | 5 ++++-
 plugins/dynamix.vm.manager/include/VMMachines.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index f8ad78761..1d92a0750 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -132,7 +132,8 @@ table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
 div.template,div#dialogWindow,input#upload{display:none}
 .fileTree{background:<?=$bgcolor?>;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
-.dropdown-menu{z-index:10001;
+.dropdown-menu{z-index:10001}
+i.mover{margin-right:8px;display:none} 
 </style>
 <table id="kvm_table" class="tablesorter four shift">
 <thead><tr><th class="th1"><a href="#" style="cursor:hand;margin-left:12px;display:inline-block;width:32px" onclick="resetSorting()" title="Reset sorting"><i class="fa fa-th-list"></i></a>_(Name)_</th><th class="th2">_(Description)_</th><th>_(CPUs)_</th><th>_(Memory)_</th><th>_(vDisks)_</th><th>_(Graphics)_</th><th class="th3">_(Autostart)_</th></tr></thead>
@@ -220,6 +221,7 @@ var sortableHelper = function(e,ui){
 function LockButton() {
   if ($.cookie('lockbutton') == null) {
     $.cookie('lockbutton','lockbutton');
+    $('i.mover').show();
 <?if ($themes1):?>
     $('div.nav-item.LockButton').find('a').prop('title',"_(Lock sortable items)_");
     $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
@@ -234,6 +236,7 @@ function LockButton() {
     }});
   } else {
     $.removeCookie('lockbutton');
+    $('i.mover').hide();
 <?if ($themes1):?>
     $('div.nav-item.LockButton').find('a').prop('title',"_(Unlock sortable items)_");
     $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
diff --git a/plugins/dynamix.vm.manager/include/VMMachines.php b/plugins/dynamix.vm.manager/include/VMMachines.php
index 17f66f8e1..898e3c50c 100644
--- a/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -122,7 +122,7 @@ foreach ($vms as $vm) {
   }
 
   /* VM information */
-  echo "<tr parent-id='$i' class='sortable'><td class='vm-name' style='width:220px;padding:8px'>";
+  echo "<tr parent-id='$i' class='sortable'><td class='vm-name' style='width:220px;padding:8px'><i class='fa fa-arrows-v mover orange-text'></i>";
   echo "<span class='outer'><span id='vm-$uuid' $menu class='hand'>$image</span><span class='inner'><a href='#' onclick='return toggle_id(\"name-$i\")' title='click for more VM info'>$vm</a><br><i class='fa fa-$shape $status $color'></i><span class='state'>"._($status)."</span></span></span></td>";
   echo "<td>$desc</td>";
   echo "<td><a class='vcpu-$uuid' style='cursor:pointer'>$vcpu</a></td>";

From b4e6f88002db58e46b82cea7fc57a205b6f59429 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 20:39:27 +0100
Subject: [PATCH 16/18] Docker operation corrections

---
 .../DockerContainers.page                       | 17 ++++++-----------
 .../include/DockerContainers.php                |  5 +++--
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page
index a7725cad7..c117085e4 100644
--- a/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/plugins/dynamix.docker.manager/DockerContainers.page
@@ -67,13 +67,10 @@ $('.tabs').append("<span id='busy' class='red-text strong' style='display:none;p
 <?endif;?>
 <?if ($display['resize']):?>
 function resize() {
-  var width = [];
   $('#docker_list').height(Math.max(window.innerHeight-340,330));
-  $('#docker_containers thead,#docker_containers tbody').removeClass('fixed');
-  $('#docker_containers tbody tr:first-child td').each(function(){width.push($(this).width());});
-  $('#docker_containers thead tr th').each(function(i){$(this).width(width[i]);});
-  $('#docker_containers tbody tr td').each(function(i){$(this).width(width[i]);});
-  $('#docker_containers thead,#docker_containers tbody').addClass('fixed');
+  $('#docker_containers thead tr th').each(function(){$(this).width($(this).width());});
+  $('#docker_containers tbody tr td').each(function(){$(this).width($(this).width());});
+  $('#docker_containers thead,#docker_containers tbody').removeClass('fixed').addClass('fixed');
 }
 <?endif;?>
 function resetSorting() {
@@ -91,20 +88,17 @@ function listview() {
     if (auto && more) wait.show(); else wait.hide();
   });
 }
-var sortableHelper = function(e,ui){
-  ui.children().each(function(){$(this).width($(this).width());});
-  return ui;
-};
 function LockButton() {
   if ($.cookie('lockbutton') == null) {
     $.cookie('lockbutton','lockbutton');
     $('i.mover').show();
+    $('#docker_list .sortable').css({'cursor':'move'});
 <?if ($themes1):?>
     $('div.nav-item.LockButton').find('a').prop('title',"_(Lock sortable items)_");
     $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
 <?endif;?>
     $('div.nav-item.LockButton').find('span').text("_(Lock sortable items)_");
-    $('#docker_list').sortable({helper:sortableHelper,items:'.sortable',cursor:'grab',axis:'y',containment:'parent',cancel:'span.docker_readmore,input',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
+    $('#docker_list').sortable({helper:'clone',items:'.sortable',cursor:'grab',axis:'y',containment:'parent',cancel:'span.docker_readmore,input',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
     update:function(e,ui){
       var row = $('#docker_list').find('tr:first');
       var names = ''; var index = '';
@@ -114,6 +108,7 @@ function LockButton() {
   } else {
     $.removeCookie('lockbutton');
     $('i.mover').hide();
+    $('#docker_list .sortable').css({'cursor':'default'});
 <?if ($themes1):?>
     $('div.nav-item.LockButton').find('a').prop('title',"_(Unlock sortable items)_");
     $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
diff --git a/plugins/dynamix.docker.manager/include/DockerContainers.php b/plugins/dynamix.docker.manager/include/DockerContainers.php
index 45801189f..85fe67ff7 100644
--- a/plugins/dynamix.docker.manager/include/DockerContainers.php
+++ b/plugins/dynamix.docker.manager/include/DockerContainers.php
@@ -34,8 +34,9 @@ if (!$containers && !$images) {
 }
 
 if (file_exists($user_prefs)) {
-  $prefs = parse_ini_file($user_prefs); $sort = [];
-  foreach ($containers as $ct) $sort[] = array_search($ct['Name'],$prefs) ?? 999;
+  $prefs = @parse_ini_file($user_prefs) ?: [];
+  $sort = [];
+  foreach ($containers as $ct) $sort[] = array_search($ct['Name'],$prefs);
   array_multisort($sort,SORT_NUMERIC,$containers);
   unset($sort);
 }

From e5376edfa2e4c7ae9c6ebb42036c0307d91024ff Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 20:39:40 +0100
Subject: [PATCH 17/18] VM: operation corrections

---
 plugins/dynamix.vm.manager/VMMachines.page    | 40 ++++++++++---------
 .../dynamix.vm.manager/include/VMMachines.php |  7 ++--
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 1d92a0750..5ea3420b6 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -120,20 +120,17 @@ div.four label{float:left;display:table-cell;width:25%}
 div.four label:nth-child(4n+4){float:none;clear:both}
 div.four label.cpu1{width:32%}
 div.four label.cpu2{width:26%}
-table.domdisk thead th:nth-child(1){width:76%;}
-table.domdisk thead th:nth-child(2){width:8%;}
-table.domdisk thead th:nth-child(3){width:8%;}
-table.domdisk thead th:nth-child(3){width:8%;}
+div.template,div#dialogWindow,input#upload{display:none}
+table.domdisk thead tr th:nth-child(1){width:56%!important}
+table.domdisk thead tr th:nth-child(n+2){width:8%!important}
 table.domdisk thead tr th:nth-child(1){padding-left:72px}
 table.domdisk tbody tr td:nth-child(1){padding-left:72px}
 table.domdisk tbody tr:nth-child(even){background-color:transparent!important}
 table.domdisk tbody tr:nth-child(4n-1){background-color:transparent!important}
-.fileTree{background:<?=$bgcolor?>;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-div.template,div#dialogWindow,input#upload{display:none}
+i.mover{margin-right:8px;display:none} 
 .fileTree{background:<?=$bgcolor?>;width:500px;max-height:320px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button[disabled]{cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
 .dropdown-menu{z-index:10001}
-i.mover{margin-right:8px;display:none} 
 </style>
 <table id="kvm_table" class="tablesorter four shift">
 <thead><tr><th class="th1"><a href="#" style="cursor:hand;margin-left:12px;display:inline-block;width:32px" onclick="resetSorting()" title="Reset sorting"><i class="fa fa-th-list"></i></a>_(Name)_</th><th class="th2">_(Description)_</th><th>_(CPUs)_</th><th>_(Memory)_</th><th>_(vDisks)_</th><th>_(Graphics)_</th><th class="th3">_(Autostart)_</th></tr></thead>
@@ -155,8 +152,7 @@ function resize(bind) {
   var s = Math.max(window.innerHeight-340,330);
   if (h>s || bind) {
     $('#kvm_list').height(s);
-    $('#kvm_table tbody tr:first-child td').each(function(){width.push($(this).width());});
-    $('#kvm_table thead tr th').each(function(i){$(this).width(width[i]);});
+    $('#kvm_table thead tr th').each(function(){$(this).width($(this).width());});
     if (!bind) $('#kvm_table thead,#kvm_table tbody').addClass('fixed');
   }
 }
@@ -215,6 +211,7 @@ function dialogStyle() {
   $('.ui-button-text').css({'padding':'0px 5px'});
 }
 var sortableHelper = function(e,ui){
+  ui.next().hide();
   ui.children().each(function(){$(this).width($(this).width());});
   return ui;
 };
@@ -222,26 +219,33 @@ function LockButton() {
   if ($.cookie('lockbutton') == null) {
     $.cookie('lockbutton','lockbutton');
     $('i.mover').show();
+    $('#kvm_list .sortable').css({'cursor':'move'});
 <?if ($themes1):?>
-    $('div.nav-item.LockButton').find('a').prop('title',"_(Lock sortable items)_");
-    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
+    $('div.nav-item.LockButton a').prop('title',"_(Lock sortable items)_");
+    $('div.nav-item.LockButton b').removeClass('icon-u-lock red-text').addClass('icon-u-lock-open green-text');
 <?endif;?>
-    $('div.nav-item.LockButton').find('span').text("_(Lock sortable items)_");
-    $('#kvm_list').sortable({helper:sortableHelper,items:'tr.sortable',cursor:'move',axis:'y',containment:'parent',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
+    $('div.nav-item.LockButton span').text("_(Lock sortable items)_");
+    $('#kvm_list').sortable({helper:sortableHelper,items:'.sortable',cursor:'grab',axis:'y',containment:'parent',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
     update:function(e,ui){
-      var row = $('#kvm_list').find('tr:first');
-      var names = ''; var index = '';
+      $('#kvm_list .sortable').each(function(){
+        var parent = $(this).attr('parent-id');
+        var child = $('tr[child-id="'+parent+'"]');
+        child.detach().insertAfter($(this));
+      });
+      var row = $('#kvm_list tr:first');
+      var names = '', index = '';
       row.parent().children().find('td.vm-name').each(function(){names+=$(this).find('a').text()+';';index+=$(this).parent().parent().children().index($(this).parent())+';';});
       $.post('/plugins/dynamix.vm.manager/include/UserPrefs.php',{names:names,index:index});
     }});
   } else {
     $.removeCookie('lockbutton');
     $('i.mover').hide();
+    $('#kvm_list .sortable').css({'cursor':'default'});
 <?if ($themes1):?>
-    $('div.nav-item.LockButton').find('a').prop('title',"_(Unlock sortable items)_");
-    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
+    $('div.nav-item.LockButton a').prop('title',"_(Unlock sortable items)_");
+    $('div.nav-item.LockButton b').removeClass('icon-u-lock-open green-text').addClass('icon-u-lock red-text');
 <?endif;?>
-    $('div.nav-item.LockButton').find('span').text("_(Unlock sortable items)_");
+    $('div.nav-item.LockButton span').text("_(Unlock sortable items)_");
     $('#kvm_list').sortable('destroy');
   }
 }
diff --git a/plugins/dynamix.vm.manager/include/VMMachines.php b/plugins/dynamix.vm.manager/include/VMMachines.php
index 898e3c50c..de020e1ed 100644
--- a/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -29,8 +29,9 @@ if (empty($vms)) {
 if (file_exists($user_prefs)) {
   $prefs = @parse_ini_file($user_prefs) ?: [];
   $sort = [];
-  foreach ($vms as $vm) $sort[] = array_search($vm,$prefs) ?: 999;
+  foreach ($vms as $vm) $sort[] = array_search($vm,$prefs);
   array_multisort($sort,SORT_NUMERIC,$vms);
+  unset($sort);
 } else {
   natcasesort($vms);
 }
@@ -134,9 +135,9 @@ foreach ($vms as $vm) {
   /* Disk device information */
   echo "<tr child-id='$i' id='name-$i".(in_array('name-'.$i++,$show) ? "'>" : "' style='display:none'>");
   echo "<td colspan='8' style='margin:0;padding:0'>";
-  echo "<table class='tablesorter domdisk' id='domdisk_table'>";
+  echo "<table class='tablesorter domdisk'>";
   echo "<thead><tr><th><i class='fa fa-hdd-o'></i> <b>"._('Disk devices')."</b></th><th>"._('Serial')."</b></th><th>"._('Bus')."</th><th>"._('Capacity')."</th><th>"._('Allocation')."</th><th>Boot Order</th</tr></thead>";
-  echo "<tbody id='domdisk_list'>";
+  echo "<tbody>";
 
   /* Display VM disks */
   foreach ($lv->get_disk_stats($res) as $arrDisk) {

From 41d35df56de5f210379b88a7d7e27cbabb099f01 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 16 Mar 2023 21:07:51 +0100
Subject: [PATCH 18/18] Dashboard: reset tiles list when Docker/VM selection is
 changed

---
 plugins/dynamix/DisplaySettings.page | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/dynamix/DisplaySettings.page b/plugins/dynamix/DisplaySettings.page
index 3844607bb..c2595fc3c 100644
--- a/plugins/dynamix/DisplaySettings.page
+++ b/plugins/dynamix/DisplaySettings.page
@@ -32,6 +32,7 @@ select.fixed{max-width:166px}
 <script>
 var path = '/boot/config/plugins/dynamix';
 var filename = '';
+var dashapps = "<?=$display['dashapps']?>";
 
 function restore() {
   // restore original image and activate APPLY button
@@ -46,6 +47,8 @@ function upload() {
   } else if (filename) {
     $.post("/webGui/include/FileUpload.php",{cmd:'save',path:path,filename:filename,output:'banner.png'});
   }
+  // reset dashboard tiles list when Docker/VM selection is changed
+  if (dashapps != document.display_settings.dashapps.value) $.removeCookie('inactive_content');
 }
 function presetTime(form) {
   var system = form.date.selectedIndex==0;
@@ -67,7 +70,6 @@ function updateDirection(lang) {
   var rtl = "";
   $('input[name="rtl"]').val(rtl);
 }
-
 $(function() {
   var dropbox = $('#dropbox');
   // attach the drag-n-drop feature to the 'dropbox' element