From adf73cca02693755865ab23d4838ad918a901f95 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Apr 2020 07:23:03 +0200
Subject: [PATCH 1/8] Multi cache pool support

---
 plugins/dynamix/CacheDevices.page | 6 +++++-
 plugins/dynamix/DeviceInfo.page   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/CacheDevices.page b/plugins/dynamix/CacheDevices.page
index b21bde565..1ff195cbb 100644
--- a/plugins/dynamix/CacheDevices.page
+++ b/plugins/dynamix/CacheDevices.page
@@ -45,13 +45,17 @@ function addPoolPopup() {
         var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
         var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
         var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
+        var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
+        if (!poolname.trim()) return;
         if (reserved.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (shares.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use user share names)_',type:'error',confirmButtonText:'_(Ok)_'});
+        } else if (pools.includes(poolname)) {
+          swal({title:'_(Invalid pool name)_',text:'_(Share name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (!valid.test(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else if (poolname) {
+        } else {
           $(this).find('form').submit();
           $(this).dialog('close');
         }
diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 2abb3f753..76c1bdbb9 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -239,13 +239,17 @@ function renamePoolPopup() {
         var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
         var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
         var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
+        var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
+        if (!poolname.trim()) return;
         if (reserved.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (shares.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use user share names)_',type:'error',confirmButtonText:'_(Ok)_'});
+        } else if (pools.includes(poolname)) {
+          swal({title:'_(Invalid pool name)_',text:'_(Share name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (!valid.test(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else if (poolname) {
+        } else {
           $(this).find('form').submit();
           $(this).dialog('close');
         }

From 758b3300bffd1428d5bf932f8cfca0e8a9dc86d1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Apr 2020 07:25:04 +0200
Subject: [PATCH 2/8] Multi cache pool support

---
 plugins/dynamix/CacheDevices.page | 4 ++--
 plugins/dynamix/DeviceInfo.page   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/CacheDevices.page b/plugins/dynamix/CacheDevices.page
index 1ff195cbb..e9d06c092 100644
--- a/plugins/dynamix/CacheDevices.page
+++ b/plugins/dynamix/CacheDevices.page
@@ -41,12 +41,12 @@ function addPoolPopup() {
     hide : {effect:'fade', duration:250},
     buttons: {
       _(Add)_: function() {
-        var poolname = $(this).find('input[name="poolName"]').val();
+        var poolname = $(this).find('input[name="poolName"]').val().trim();
         var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
         var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
         var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
         var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
-        if (!poolname.trim()) return;
+        if (!poolname) return;
         if (reserved.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (shares.includes(poolname)) {
diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 76c1bdbb9..434e63440 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -235,12 +235,12 @@ function renamePoolPopup() {
     hide : {effect:'fade', duration:250},
     buttons: {
       _(Rename)_: function() {
-        var poolname = $(this).find('input[name="poolName"]').val();
+        var poolname = $(this).find('input[name="poolName"]').val().trim();
         var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
         var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
         var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
         var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
-        if (!poolname.trim()) return;
+        if (!poolname) return;
         if (reserved.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (shares.includes(poolname)) {

From b5f1acdbf3b7d8cd8314a2b45a5e6a896ac95405 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Apr 2020 07:26:30 +0200
Subject: [PATCH 3/8] Revert "Multi cache pool support"

This reverts commit 758b3300bffd1428d5bf932f8cfca0e8a9dc86d1.
---
 plugins/dynamix/CacheDevices.page | 4 ++--
 plugins/dynamix/DeviceInfo.page   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/CacheDevices.page b/plugins/dynamix/CacheDevices.page
index e9d06c092..1ff195cbb 100644
--- a/plugins/dynamix/CacheDevices.page
+++ b/plugins/dynamix/CacheDevices.page
@@ -41,12 +41,12 @@ function addPoolPopup() {
     hide : {effect:'fade', duration:250},
     buttons: {
       _(Add)_: function() {
-        var poolname = $(this).find('input[name="poolName"]').val().trim();
+        var poolname = $(this).find('input[name="poolName"]').val();
         var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
         var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
         var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
         var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
-        if (!poolname) return;
+        if (!poolname.trim()) return;
         if (reserved.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (shares.includes(poolname)) {
diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 434e63440..76c1bdbb9 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -235,12 +235,12 @@ function renamePoolPopup() {
     hide : {effect:'fade', duration:250},
     buttons: {
       _(Rename)_: function() {
-        var poolname = $(this).find('input[name="poolName"]').val().trim();
+        var poolname = $(this).find('input[name="poolName"]').val();
         var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
         var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
         var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
         var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
-        if (!poolname) return;
+        if (!poolname.trim()) return;
         if (reserved.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (shares.includes(poolname)) {

From 77ecb38de664f4f7a880e2e7b96206b0ea4c818b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Apr 2020 08:28:47 +0200
Subject: [PATCH 4/8] Multi cache pool support

---
 plugins/dynamix/CacheDevices.page | 6 +++++-
 plugins/dynamix/DeviceInfo.page   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/CacheDevices.page b/plugins/dynamix/CacheDevices.page
index 1ff195cbb..f90fa9967 100644
--- a/plugins/dynamix/CacheDevices.page
+++ b/plugins/dynamix/CacheDevices.page
@@ -27,6 +27,9 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 table.divider{margin-top:30px}
 </style>
 <script>
+var button = false;
+function buttonOnly(){return button;}
+
 function addPoolPopup() {
   var popup = $('#dialogAddPool');
   // Load popup with the template info
@@ -56,6 +59,7 @@ function addPoolPopup() {
         } else if (!valid.test(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else {
+          button = true;
           $(this).find('form').submit();
           $(this).dialog('close');
         }
@@ -107,7 +111,7 @@ pool_status();
 
 <div id="dialogAddPool" style="display:none"></div>
 <div id="templatePopupPool" style="display:none">
-<form markdown="1" method="POST" action="/update.htm" target="progressFrame">
+<form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return buttonOnly()">
 <input type="hidden" name="changeSlots" value="apply">
 _(Name)_:
 : <input type="text" name="poolName" maxlength="40" value="<?=count($pools)==0?'cache':''?>">
diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 76c1bdbb9..11ee7df9a 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -66,6 +66,9 @@ span.helptext{display:none;font-style:italic}
 span.code{display:inline-block;width:186px}
 </style>
 <script>
+var button = false;
+function buttonOnly(){return button;}
+
 function doDispatch(form) {
   var fields = {};
 <?if ($display['unit']=='F'):?>
@@ -250,6 +253,7 @@ function renamePoolPopup() {
         } else if (!valid.test(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else {
+          button = true;
           $(this).find('form').submit();
           $(this).dialog('close');
         }
@@ -812,7 +816,7 @@ _(SMART attribute notifications)_:
 
 <div id="dialogRenamePool" style="display:none"></div>
 <div id="templatePopupPool" style="display:none">
-<form markdown="1" method="POST" action="/update.htm" target="progressFrame">
+<form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return buttonOnly()">
 <input type="hidden" name="poolNameOrig" value="<?=$name?>">
 <input type="hidden" name="changeSlots" value="apply">
 _(Name)_:

From dc095b2c3ac937757a7792f5c3f39b2c718d2d2a Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Apr 2020 08:38:35 +0200
Subject: [PATCH 5/8] Multi cache pool support

---
 plugins/dynamix/CacheDevices.page | 2 +-
 plugins/dynamix/DeviceInfo.page   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/CacheDevices.page b/plugins/dynamix/CacheDevices.page
index f90fa9967..4ad0c55db 100644
--- a/plugins/dynamix/CacheDevices.page
+++ b/plugins/dynamix/CacheDevices.page
@@ -55,7 +55,7 @@ function addPoolPopup() {
         } else if (shares.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use user share names)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (pools.includes(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Share name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
+          swal({title:'_(Invalid pool name)_',text:'_(Pool name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (!valid.test(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else {
diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 11ee7df9a..f6bdb465b 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -249,7 +249,7 @@ function renamePoolPopup() {
         } else if (shares.includes(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Do not use user share names)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (pools.includes(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Share name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
+          swal({title:'_(Invalid pool name)_',text:'_(Pool name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else if (!valid.test(poolname)) {
           swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
         } else {

From 664ad8257dc8248dde7a570004b9303bbf7c4ec7 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Apr 2020 09:07:30 +0200
Subject: [PATCH 6/8] Multi cache pool support

---
 plugins/dynamix/CacheDevices.page | 44 +++++++++++++++++--------------
 plugins/dynamix/DeviceInfo.page   | 44 +++++++++++++++++--------------
 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/plugins/dynamix/CacheDevices.page b/plugins/dynamix/CacheDevices.page
index 4ad0c55db..85f833e38 100644
--- a/plugins/dynamix/CacheDevices.page
+++ b/plugins/dynamix/CacheDevices.page
@@ -27,9 +27,28 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 table.divider{margin-top:30px}
 </style>
 <script>
-var button = false;
-function buttonOnly(){return button;}
-
+function validate(poolname) {
+  var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
+  var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
+  var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
+  var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
+  if (!poolname.trim()) return false;
+  if (reserved.includes(poolname)) {
+    swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
+    return false;
+  } else if (shares.includes(poolname)) {
+    swal({title:'_(Invalid pool name)_',text:'_(Do not use user share names)_',type:'error',confirmButtonText:'_(Ok)_'});
+    return false;
+  } else if (pools.includes(poolname)) {
+    swal({title:'_(Invalid pool name)_',text:'_(Pool name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
+    return false;
+  } else if (!valid.test(poolname)) {
+    swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
+    return false;
+  } else {
+    return true;
+  }
+}
 function addPoolPopup() {
   var popup = $('#dialogAddPool');
   // Load popup with the template info
@@ -44,22 +63,7 @@ function addPoolPopup() {
     hide : {effect:'fade', duration:250},
     buttons: {
       _(Add)_: function() {
-        var poolname = $(this).find('input[name="poolName"]').val();
-        var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
-        var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
-        var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
-        var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
-        if (!poolname.trim()) return;
-        if (reserved.includes(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else if (shares.includes(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Do not use user share names)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else if (pools.includes(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Pool name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else if (!valid.test(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else {
-          button = true;
+        if (validate($(this).find('input[name="poolName"]').val())) {
           $(this).find('form').submit();
           $(this).dialog('close');
         }
@@ -111,7 +115,7 @@ pool_status();
 
 <div id="dialogAddPool" style="display:none"></div>
 <div id="templatePopupPool" style="display:none">
-<form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return buttonOnly()">
+<form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return validate(this.poolName.value)">
 <input type="hidden" name="changeSlots" value="apply">
 _(Name)_:
 : <input type="text" name="poolName" maxlength="40" value="<?=count($pools)==0?'cache':''?>">
diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index f6bdb465b..50aa35124 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -66,9 +66,6 @@ span.helptext{display:none;font-style:italic}
 span.code{display:inline-block;width:186px}
 </style>
 <script>
-var button = false;
-function buttonOnly(){return button;}
-
 function doDispatch(form) {
   var fields = {};
 <?if ($display['unit']=='F'):?>
@@ -224,6 +221,28 @@ function xfsCheck(path) {
 function updateMode(form,mode) {
   $(form).find('input[name="#arg[3]"]').val(mode);
 }
+function validate(poolname) {
+  var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
+  var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
+  var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
+  var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
+  if (!poolname.trim()) return false;
+  if (reserved.includes(poolname)) {
+    swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
+    return false;
+  } else if (shares.includes(poolname)) {
+    swal({title:'_(Invalid pool name)_',text:'_(Do not use user share names)_',type:'error',confirmButtonText:'_(Ok)_'});
+    return false;
+  } else if (pools.includes(poolname)) {
+    swal({title:'_(Invalid pool name)_',text:'_(Pool name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
+    return false;
+  } else if (!valid.test(poolname)) {
+    swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
+    return false;
+  } else {
+    return true;
+  }
+}
 function renamePoolPopup() {
   var popup = $('#dialogRenamePool');
   // Load popup with the template info
@@ -238,22 +257,7 @@ function renamePoolPopup() {
     hide : {effect:'fade', duration:250},
     buttons: {
       _(Rename)_: function() {
-        var poolname = $(this).find('input[name="poolName"]').val();
-        var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
-        var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
-        var shares = [<?=implode(',',array_map('escapeshellarg',array_filter(array_map('sharename',scandir('boot/config/shares')))))?>];
-        var pools = [<?=implode(',',array_map('escapeshellarg',$pools))?>];
-        if (!poolname.trim()) return;
-        if (reserved.includes(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else if (shares.includes(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Do not use user share names)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else if (pools.includes(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Pool name already exists)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else if (!valid.test(poolname)) {
-          swal({title:'_(Invalid pool name)_',text:'_(Use lowercase characters only and no ending digits)_',type:'error',confirmButtonText:'_(Ok)_'});
-        } else {
-          button = true;
+        if (validate($(this).find('input[name="poolName"]').val())) {
           $(this).find('form').submit();
           $(this).dialog('close');
         }
@@ -816,7 +820,7 @@ _(SMART attribute notifications)_:
 
 <div id="dialogRenamePool" style="display:none"></div>
 <div id="templatePopupPool" style="display:none">
-<form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return buttonOnly()">
+<form markdown="1" method="POST" action="/update.htm" target="progressFrame" onsubmit="return validate(this.poolName.value)">
 <input type="hidden" name="poolNameOrig" value="<?=$name?>">
 <input type="hidden" name="changeSlots" value="apply">
 _(Name)_:

From 4900d7a4a605309016bea174e195b884664f0cd8 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Apr 2020 09:53:16 +0200
Subject: [PATCH 7/8] Multi cache pool support

---
 plugins/dynamix/include/DeviceList.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php
index 368474f05..5d62313ba 100644
--- a/plugins/dynamix/include/DeviceList.php
+++ b/plugins/dynamix/include/DeviceList.php
@@ -237,7 +237,7 @@ function array_online(&$disk) {
   case 'DISK_NP':
     if (in_array($disk['name'],$pools)) {
       echo "<td>".device_info($disk,true)."</td>";
-      echo "<td><em>"._('Not installed')."</em></td>";
+      echo "<td><a class='none nohand'><i class=\"icon-disk icon\"></i><span></span></a><em>"._('Not installed')."</em></td>";
       echo "<td colspan='4'></td>";
       fs_info($disk);
     }

From f57168b3d8482b03d202dbbccbcd514bc96d33ed Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Fri, 3 Apr 2020 10:23:56 +0200
Subject: [PATCH 8/8] Multi cache pool support

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

diff --git a/plugins/dynamix/CacheDevices.page b/plugins/dynamix/CacheDevices.page
index 85f833e38..bdfff4da1 100644
--- a/plugins/dynamix/CacheDevices.page
+++ b/plugins/dynamix/CacheDevices.page
@@ -24,7 +24,7 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
 <link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/jquery.ui.css")?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-{$display['theme']}.css")?>">
 <style>
-table.divider{margin-top:30px}
+table.divider{margin-top:20px}
 </style>
 <script>
 function validate(poolname) {