Merge branch 'unraid:master' into optimize-file-manager-move

emhttp/languages/en_US/helptext.txt

@@ -542,7 +542,7 @@ The share name can be up to 40 characters, and is case-sensitive with these rest
 
 * must start with a letter
 * subsequent characters can be a letter, digit, period, underscore, or dash, except the last character may not be a period
-* cannot be one of the reserved names: flash, cache, cache2, .., disk1, disk2, ..
+* cannot be one of the reserved names: homes, global, printers, flash, boot, user, user0, dev, remotes, RecycleBin, rootshare, addons, mirror, raidz*, draid, spare, log, disk*, parity*
 :end
 
 :share_edit_comments_help:

emhttp/plugins/dynamix.docker.manager/DockerContainers.page

@@ -24,7 +24,7 @@ require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $width   = $themeHelper->isTopNavTheme() ? -58: -44; // $themeHelper set in DefaultPageLayout.php
 $top     = $themeHelper->isTopNavTheme() ? 40 : 20;
-$busy    = "<i class='fa fa-spin fa-circle-o-notch'></i> "._('Please wait')."... "._('starting up containers');
+$busy    = "<i class='fa fa-spin fa-circle-o-notch'></i> <span class='font-sans'>"._('Please wait')."... "._('starting up containers')."</span>";
 $cpus    = cpu_list();
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">

emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css

@@ -24,7 +24,7 @@ th.load {
     width: 140px;
 }
 input.wait {
-    width: 24px;
+    width: 2.6rem;
     margin: 0 4px;
     padding: 0 5px;
     border: none;

emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php

@@ -2597,7 +2597,7 @@ $(function() {
 		}
 		$("#gpubootvga"+myindex).removeClass();
 		if (mylabel == "_(None)_") $("#gpubootvga"+myindex).addClass('hidden');
-		if (myvalue != "_(virtual)_" && myvalue != "" && myvalue != "_(nogpu)_") {
+		if (myvalue != "virtual" && myvalue != "" && myvalue != "nogpu") {
 			if (ValidGPUs[myvalue].bootvga != "1") $("#gpubootvga"+myindex).addClass('hidden');
 		} else {
 			$("#gpubootvga"+myindex).addClass('hidden');

emhttp/plugins/dynamix/include/UpdateOne.php

@@ -68,6 +68,7 @@ switch ($data['id']) {
 		foreach ($map as $name => $cpuset) {
 			/* set full path of template file */
 			$file = $DockerTemplates->getUserTemplate($name);
+			if ( ! is_file($file) ) continue;
 			$xml = simplexml_load_file($file);
 			if ($xml->CPUset) {
 				/* update node */

emhttp/plugins/dynamix/sheets/DashStats.css

@@ -446,7 +446,8 @@ legend {
 .tile-header-main {
     font-size: 1.6rem;
     line-height: 1;
-    margin: 0;
+    margin: 0 0 0.5rem 0;
+    text-transform: uppercase;
 }
 
 .tile-header-left {

emhttp/plugins/dynamix/styles/default-base.css

@@ -1906,6 +1906,10 @@ span#wlan0 {
     font-family: bitstream, monospace;
 }
 
+.font-sans {
+    font-family: clear-sans, sans-serif;
+ }
+
 .text-center {
     text-align: center;
 }

emhttp/plugins/dynamix/styles/themes/black.css

@@ -40,7 +40,7 @@
     --small-shadow: 0 0 3px var(--gray-700); 
     --hr-color: var(--gray-800); 
 
-    --checkbox-color: var(--gray-800); 
+    --checkbox-color: var(--gray-500); 
     --checkbox-hover-color: var(--gray-600); 
 
     --brand-orange: var(--orange-500);

etc/rc.d/rc.local

@@ -95,7 +95,7 @@ rm -f /boot/plugins/unRAIDServer.plg
 rm -f $CONFIG/plugins/unRAIDServer.plg
 
 # These plugins are now integrated in the OS or obsolete and may interfere
-OBSOLETE="vfio.pci dynamix.wireguard dynamix.ssd.trim dynamix.file.manager gui.search unlimited-width proxy.editor unraid.patch AAA-UnraidPatch-BootLoader-DO_NOT_DELETE theme.engine dark.theme"
+OBSOLETE="flash.remount vfio.pci dynamix.wireguard dynamix.ssd.trim dynamix.file.manager gui.search unlimited-width proxy.editor unraid.patch AAA-UnraidPatch-BootLoader-DO_NOT_DELETE theme.engine dark.theme"
 QUIET="unraid.patch AAA-UnraidPatch-BootLoader-DO_NOT_DELETE"
 
 for PLUGIN in $OBSOLETE; do