Merge branch '6.4-wip' of github.com:limetech/webgui into 6.4-wip

plugins/dynamix/ArrayOperation.page

@@ -16,14 +16,14 @@ Tag="snowflake-o"
 ?>
 <?
 $keyfile = file_exists($var['luksKeyfile']);
+$fsLuks  = strpos($var['defaultFsType'],'luks:')!==false;
 $encrypt = false;
 /* only one of $forced, $missing, or $wrong will be true, or all will be false */
-$forced = false;
+$forced  = false;
 $missing = false;
-$wrong = false;
+$wrong   = false;
 foreach ($disks as $disk) {
-  if (($disk['fsType']=="auto" && (strpos($var['defaultFsType'],'luks:')!==false || $disk['luksState']==2 || $disk['luksState']==3)) ||
-      (strpos($disk['fsType'],'luks:')!==false)) {
+  if (($disk['fsType']=='auto' && ($fsLuks || $disk['luksState']==2 || $disk['luksState']==3)) || (strpos($disk['fsType'],'luks:')!==false)) {
     $encrypt = true;
     if (!$keyfile) {
       if ($disk['luksState']==0) $forced = true; else $missing = true;
@@ -457,6 +457,13 @@ toggle_diskio(true);
 </form>
 <?endif;?>
 <?endif;?>
+<form name="shutdownOps" method="POST" action="/webGui/include/Boot.php">
+<table class="array_status">
+ <tr><td></td><td><input type="button" name="reboot" value="Reboot" onclick="shutdown_now(this.form,'reboot')"><input type="button" name="shutdown" value="Power down" onclick="shutdown_now(this.form,'shutdown')"></td>
+ <td><strong>Reboot</strong> will activate a <em>clean</em> system reset.<br><strong>Power down</strong> will activate a <em>clean</em> power down.</td></tr>
+ <tr><td></td><td class="line" colspan="2"></td></tr>
+</table>
+</form>
 <?if ($keyfile):?>
 <form name="delete_keyfile" method="POST" action="/update.php" target="progressFrame">
 <input type="hidden" name="#file" value="unused">
@@ -467,12 +474,6 @@ toggle_diskio(true);
 </table>
 </form>
 <?endif;?>
-<form name="shutdownOps" method="POST" action="/webGui/include/Boot.php">
-<table class="array_status">
- <tr><td></td><td><input type="button" name="reboot" value="Reboot" onclick="shutdown_now(this.form,'reboot')"><input type="button" name="shutdown" value="Power down" onclick="shutdown_now(this.form,'shutdown')"></td>
- <td><strong>Reboot</strong> will activate a <em>clean</em> system reset.<br><strong>Power down</strong> will activate a <em>clean</em> power down.</td></tr>
-</table>
-</form>
 <?
 if (isset($display['sleep'])) @include $display['sleep'];
 ?>

plugins/dynamix/DeviceAttributes.page

@@ -23,7 +23,7 @@ $(function() {
 });
 </script>
 <table class='share_status small'>
-<thead><td style="width:30px">#</td><td>Attribute Name</td><td>Flag</td><td>Value</td><td>Worst</td><td>Threshold</td><td>Type</td><td>Updated</td><td>Failed</td><td style="width:145px">Raw Value</td></thead>
+<thead><td style="width:40px">#</td><td>Attribute Name</td><td>Flag</td><td>Value</td><td>Worst</td><td>Threshold</td><td>Type</td><td>Updated</td><td>Failed</td><td style="width:145px">Raw Value</td></thead>
 <tbody id="disk_attributes"><tr><td colspan='10' style='text-align:center;padding-top:12px'><i class='fa fa-spinner fa-spin'></i>&nbsp;<em>Please wait... retrieving S.M.A.R.T. information!</em></td></tr></tbody>
 </table>
 <input type="button" value="Done" onclick="done()">

plugins/dynamix/DeviceInfo.page

@@ -41,7 +41,7 @@ if ($type=='New') {
   $dev  = $disk['device'];
   $file = $disk['id']."-$date.txt";
   foreach ($disks as $sheet) {
-    if ($sheet['name']=='flash' || strpos($sheet['status'],'_NP')) continue;
+    if ($sheet['type']=='Flash' || $sheet['color']=='grey-off') continue;
     $sheets[] = $sheet['name'];
     if ($sheet['name']==$name) { $i = $n; $spindown = "diskSpindownDelay.{$sheet['idx']}"; $delay = $sheet['spindownDelay']; }
     $n++;
@@ -149,12 +149,17 @@ function setGlue(form,reset) {
     $('#helptext').hide();
   }
 }
-<?if (count($sheets)>1):?>
-var ctrl  = "<span class='status vhshift'><span class='waitmsg' style='display:none;font-size:small;font-style:italic;margin-right:8px'>please wait...</span><a href='/Main/<?=$type?>?name=<?=$prev?>' title='previous device'>";
-    ctrl += "<button type='button' style='margin-right:4px' onclick='this.disabled=true;$(\".waitmsg\").show();'><i class='fa fa-chevron-left'></i></button></a>";
-    ctrl += "<a href='/Main/<?=$type?>?name=<?=$next?>' title='next device'><button type='button' onclick='this.disabled=true;$(\".waitmsg\").show();'><i class='fa fa-chevron-right'></i></button></a></span>";
-<?endif;?>
 $(function() {
+<?if (count($sheets)>1):?>
+  var ctrl  = "<span class='status vhshift'><span class='waitmsg' style='display:none;font-size:small;font-style:italic;margin-right:8px'>please wait...</span><a href='/Main/<?=$type?>?name=<?=$prev?>' title='previous device'>";
+      ctrl += "<button type='button' style='margin-right:4px' onclick='this.disabled=true;$(\".waitmsg\").show();'><i class='fa fa-chevron-left'></i></button></a>";
+      ctrl += "<a href='/Main/<?=$type?>?name=<?=$next?>' title='next device'><button type='button' onclick='this.disabled=true;$(\".waitmsg\").show();'><i class='fa fa-chevron-right'></i></button></a></span>";
+<?if ($tabbed):?>
+  $('.tabs').append(ctrl);
+<?else:?>
+  $('div[id=title]:first').append(ctrl);
+<?endif;?>
+<?endif;?>
   var form = document.smart_settings;
 <?if (!isset($disk['smType'])):?>
   form.smType.selectedIndex = 0;

plugins/dynamix/Eth0.page

@@ -70,11 +70,11 @@ $vlan_eth0 = [0];
 if (isset($eth0)) foreach ($eth0 as $key => $val) if (strpos($key,$vlan_id)===0) $vlan_eth0[] = substr($key,strlen($vlan_id));
 ?>
 <style>
-span.pin i{font-size:16px;cursor:pointer}
+span.pin i{font-size:20px;cursor:pointer}
 span.red{color:#E68A00}
 span.blue{color:#00529B}
 span.green{color:#4F8A10}
-input.gap{margin-right:10px}
+input.gap{margin-right:6px}
 div.shade-white{background-color:#F8F8F8}
 div.shade-black{background-color:#0C0C0C}
 div.shade-azure{background-color:#EDEAEF}

plugins/dynamix/Selftest.page

@@ -171,13 +171,6 @@ function startLongTest() {
   }
 }
 $(function() {
-<?if (count($sheets)>1):?>
-<?if ($tabbed):?>
-  $('.tabs').append(ctrl);
-<?else:?>
-  $('div[id=title]:first').append(ctrl);
-<?endif;?>
-<?endif;?>
   var smarttest = $.cookie('test.<?=addslashes(htmlspecialchars($dev))?>');
   testUpdate(smarttest===undefined);
   if (smarttest !== undefined) $('#'+smarttest+'_test').val('Stop').removeAttr('disabled');