Merge branch 'master' of github.com:limetech/webgui

plugins/dynamix/ArrayOperation.page

@@ -544,6 +544,12 @@ function formatWarning(val) {
       <td>_(This Unraid OS release has been withdrawn and may no longer be used. Please)_ <a href="/Plugins">_(update)_</a> _(your server)_.</td></tr>
 <?  else:
       switch (_var($var,'mdState')):
+      case "STARTED":
+?>      <tr><td><?status_indicator()?>**_(Stopped)_**. _(Configuration valid)_.</td><td><input type="button" id="cmdStart" value="_(Start)_" onclick="prepareInput(this.form)"></td>
+        <td>**_(Start)_** _(will bring the array on-line)_.</td></tr>
+<?      maintenance_mode();
+        check_encryption();
+        break;
       case "STOPPED":
         $action = explode(' ',_var($var,'mdResyncAction'));
         if ($action[0]=="recon"):

plugins/dynamix/DashStats.page

@@ -212,7 +212,7 @@ i.indent{display:inline-block;width:18px}
 i.f32{font-size:32px!important}
 i.f14{font-size:1.4rem!important}
 i.fa.orb{margin-left:0}
-i.fa-wrench{color:#0099ff!important;background-color:rgba(0,153,255,0.1)!important}
+i.fa-wrench.tile{color:#0099ff!important;background-color:rgba(0,153,255,0.1)!important}
 i[class^="icon-"]{font-size:1.6rem;margin-right:8px}
 i[class^="icon-u-"]{font-size:inherit}
 i#mycase[class^="case-"]{font-size:128px}

plugins/dynamix/ShareList.page

@@ -35,7 +35,8 @@ $(function() {
 
 <style>
 table.share_status thead tr td:first-child{width:15%}
-table.share_status thead tr td:nth-child(n+3){width:10%}
+table.share_status thead tr td:nth-child(n+3){width:9%!important}
+table.share_status thead tr td:nth-child(5){width:13%!important}
 </style>
 
 <table class="share_status">

plugins/dynamix/default.cfg

@@ -28,6 +28,8 @@ theme="white"
 locale=""
 raw=""
 rtl=""
+headermetacolor=""
+headerdescription="yes"
 showBannerGradient="yes"
 [parity]
 mode="0"

plugins/dynamix/include/OpenTerminal.php

@@ -58,7 +58,7 @@ case 'syslog':
   $path = '/var/log/';
   $file = realpath($path.$_GET['name']);
   $sock = "/var/run/syslog.sock";
-  exec("ttyd-exec -s2 -om1 -i '$sock' ".command($path,$file));
+  exec("ttyd-exec -s9 -om1 -i '$sock' ".command($path,$file));
   break;
 case 'disklog':
   // read disk log info (main page)
@@ -66,7 +66,7 @@ case 'disklog':
   $sock = "/var/tmp/$name.sock";
   $ata  = exec("ls -n '/sys/block/$name'|grep -Pom1 'ata\d+'");
   $dev  = $ata ? $name.'|'.$ata.'[.:]' : $name;
-  exec("ttyd-exec -s2 -om1 -i '$sock' ".wait($name,"grep -P \"'$dev'\" '/var/log/syslog*'"));
+  exec("ttyd-exec -s9 -om1 -i '$sock' ".wait($name,"grep -P \"'$dev'\" '/var/log/syslog*'"));
   break;
 case 'log':
   // read vm log file
@@ -74,7 +74,7 @@ case 'log':
   $name = unbundle($_GET['name']);
   $file = realpath($path.$_GET['more']);
   $sock = "/var/tmp/$name.sock";
-  exec("ttyd-exec -s2 -om1 -i '$sock' ".command($path,$file));
+  exec("ttyd-exec -s9 -om1 -i '$sock' ".command($path,$file));
   break;
 case 'docker':
   $name = unbundle($_GET['name']);
@@ -86,18 +86,18 @@ case 'docker':
       $docker = wait($name,"docker logs -n $rows '$name'"); // container stopped
     else
       $docker = "$run docker logs -f -n $rows '$name'"; // container started
-    exec("ttyd-exec -s2 -om1 -i '$sock' $docker");
+    exec("ttyd-exec -s9 -om1 -i '$sock' $docker");
   } else {
     // docker console command
     $sock = "/var/tmp/$name.sock";
-    exec("ttyd-exec -s2 -om1 -i '$sock' docker exec -it '$name' $more");
+    exec("ttyd-exec -s9 -om1 -i '$sock' docker exec -it '$name' $more");
   }
   break;
 case 'lxc':
   $name = unbundle($_GET['name']);
   $more = unbundle($_GET['more']);
   $sock = "/var/tmp/$name.sock";
-  exec("ttyd-exec -s2 -om1 -i '$sock' lxc-attach '$name' $more");
+  exec("ttyd-exec -s9 -om1 -i '$sock' lxc-attach '$name' $more");
   break;
 }
 ?>