From 5e003af7d3bd15f7301e92d75a2cfff070795307 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 12 Nov 2017 10:24:37 +0100
Subject: [PATCH 1/4] Fix next/prev buttons for emulated disks

---
 plugins/dynamix/DeviceInfo.page | 17 +++++++++++------
 plugins/dynamix/Selftest.page   |  7 -------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index fb784d406..24548645e 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/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['type']=='Parity' && $sheet['status']=='DISK_NP_DSBL')) 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;
diff --git a/plugins/dynamix/Selftest.page b/plugins/dynamix/Selftest.page
index c3e4821fd..91c9c495c 100644
--- a/plugins/dynamix/Selftest.page
+++ b/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');

From 04b6b34474d2d5f823293a8a16bba1f519caa5bf Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 12 Nov 2017 10:25:13 +0100
Subject: [PATCH 2/4] Move DELETE button to separate section at end

---
 plugins/dynamix/ArrayOperation.page | 45 ++++++++++++++---------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/plugins/dynamix/ArrayOperation.page b/plugins/dynamix/ArrayOperation.page
index 1e9c9475a..a7d4a8f62 100644
--- a/plugins/dynamix/ArrayOperation.page
+++ b/plugins/dynamix/ArrayOperation.page
@@ -16,22 +16,23 @@ Tag="snowflake-o"
 ?>
 <?
 $keyfile = file_exists($var['luksKeyfile']);
+$fsLuks  = strpos($var['defaultFsType'],'luks:')!==false;
 $encrypt = false;
-foreach ($disks as $disk)
-  $encrypt |= strpos((($disk['fsType'] == "auto") ? $var['defaultFsType'] : $disk['fsType']),'luks:')!==false;
-
 /* only one of $forced, $missing, or $wrong will be true, or all will be false */
-$forced = false;
+$forced  = false;
 $missing = false;
-$wrong = false;
-if ($encrypt) {
-  if (!$keyfile) {
-    $forced = $var['fsEncryption']=='no';
-    $missing = !$forced;
-  } else {
-    $wrong = $var['fsEncryption']=='wrong';
+$wrong   = false;
+foreach ($disks as $disk) {
+  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;
+    } else {
+      if ($disk['luksState']==3) $wrong = true;
+    }
   }
 }
+if ($forced && $missing) $forced = false;
 
 function check_encryption() {
   global $forced, $missing, $wrong;
@@ -52,11 +53,6 @@ function check_encryption() {
 ?>
 <script>
 function selectInput(form) {
-<?if ($missing && $var['luksRestricted']!='yes'):?>
-  var strict = false;
-<?else:?>
-  var strict = true;
-<?endif;?>
   if (form.input.value == 'text') {
     form.file.value = '';
     form.local.value = '';
@@ -77,7 +73,7 @@ function selectInput(form) {
 <?endif;?>
     $('#file').hide();
     $('input[name="text"],input[name="copy"]').attr('type',$('input[name="showPass"]').prop('checked')?'text':'password');
-    $('#cmdStart').prop('disabled',strict && ($('#copy').is(':visible') ? (form.text.value!=form.copy.value || form.text.value=='') : form.text.value==''));
+    $('#cmdStart').prop('disabled',$('#copy').is(':visible') ? (form.text.value!=form.copy.value || form.text.value=='') : form.text.value=='');
   } else {
     form.text.value = '';
     form.copy.value = '';
@@ -85,7 +81,7 @@ function selectInput(form) {
     $('#copy').hide();
     $('#perm').hide();
     $('#file').show();
-    $('#cmdStart').prop('disabled',strict && !form.file.value);
+    $('#cmdStart').prop('disabled',!form.file.value);
   }
 }
 function getFileContent(event,form) {
@@ -461,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">
@@ -471,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'];
 ?>

From d5c0f76fa5b8ae377163d81d2310185b6d356375 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 12 Nov 2017 10:25:38 +0100
Subject: [PATCH 3/4] Minor visual enhancements

---
 plugins/dynamix/DeviceAttributes.page | 2 +-
 plugins/dynamix/Eth0.page             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/dynamix/DeviceAttributes.page b/plugins/dynamix/DeviceAttributes.page
index f5efd286e..7c0d06535 100644
--- a/plugins/dynamix/DeviceAttributes.page
+++ b/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()">
diff --git a/plugins/dynamix/Eth0.page b/plugins/dynamix/Eth0.page
index 369670963..8ce2a4753 100644
--- a/plugins/dynamix/Eth0.page
+++ b/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}

From a84711034ecbb83fd5466688a4ff4d8bfd101abb Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sun, 12 Nov 2017 13:06:01 +0100
Subject: [PATCH 4/4] Fix next/prev buttons for emulated disks

---
 plugins/dynamix/DeviceInfo.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 24548645e..38bafbb0c 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/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['type']=='Flash' || ($sheet['type']=='Parity' && $sheet['status']=='DISK_NP_DSBL')) 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++;