diff --git a/emhttp/plugins/dynamix/ArrayOperation.page b/emhttp/plugins/dynamix/ArrayOperation.page index 74381e295b..f08dc3c605 100644 --- a/emhttp/plugins/dynamix/ArrayOperation.page +++ b/emhttp/plugins/dynamix/ArrayOperation.page @@ -394,6 +394,10 @@ mymonitor.on('message', function(state) { $('#mover-button').prop('disabled',false); $('#mover-text').html("_(Move)_ _(will immediately invoke the Mover)_.  onclick=\"$.cookie('one','tab2')\">(_(Schedule)_)"); + + + $('#mover-button').prop('disabled',false); + $('#mover-text').html("_(Empty)_ _(will immediately invoke the Mover to Empty a disk)_.  onclick=\"$.cookie('one','tab2')\">(_(Schedule)_)"); break; case '1': // parity running @@ -406,6 +410,10 @@ mymonitor.on('message', function(state) { $('#mover-button').prop('disabled',true); $('#mover-text').html("_(Disabled)_ -- _(Parity operation is running)_"); + + + $('#mover-button').prop('disabled',true); + $('#mover-text').html("_(Empty)_ _(will immediately invoke the Mover to Empty a disk)_.  onclick=\"$.cookie('one','tab2')\">(_(Schedule)_)"); break; case '2': // mover running @@ -414,6 +422,10 @@ mymonitor.on('message', function(state) { $('#mover-button').prop('disabled',true); $('#mover-text').html("_(Disabled)_ - _(Mover is running)_."); + + + $('#mover-button').prop('disabled',true); + $('#mover-text').html("_(Empty)_ _(will immediately invoke the Mover to Empty a disk)_.  onclick=\"$.cookie('one','tab2')\">(_(Schedule)_)"); break; case '3': // btrfs running @@ -422,6 +434,10 @@ mymonitor.on('message', function(state) { $('#mover-button').prop('disabled',true); $('#mover-text').html("_(Disabled)_ -- _(BTRFS operation is running)_"); + + + $('#mover-button').prop('disabled',true); + $('#mover-text').html("_(Empty)_ _(will immediately invoke the Mover to Empty a disk)_.  onclick=\"$.cookie('one','tab2')\">(_(Schedule)_)"); break; } @@ -832,6 +848,13 @@ endswitch; + +
+ + +
+
+
diff --git a/emhttp/plugins/dynamix/MoverSettings.page b/emhttp/plugins/dynamix/MoverSettings.page index e6576111a4..e67f46f949 100755 --- a/emhttp/plugins/dynamix/MoverSettings.page +++ b/emhttp/plugins/dynamix/MoverSettings.page @@ -18,13 +18,15 @@ Tag="calendar-check-o" $mode = ['Disabled','Hourly','Daily','Weekly','Monthly']; $days = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday']; $setup = true; +$buttontext = _('Move now'); if (!$pool_devices) { - echo "

"._('No Cache device present')."!

"; - $setup = false; + echo "

"._('No Cache device present only empty function will run')."!

"; + $setup = true; + $buttontext = _('Empty now'); } elseif ($var['shareUser']=='-') { echo "

"._('User shares not enabled')."!

"; $setup = false; -} +} if (empty($var['shareMoverSchedule'])) { $cron = explode(' ', "* * * * *"); $move = 0; @@ -32,7 +34,7 @@ if (empty($var['shareMoverSchedule'])) { $cron = explode(' ', $var['shareMoverSchedule']); $move = $cron[2]!='*' ? 4 : ($cron[4]!='*' ? 3 : (substr($cron[1],0,1)!='*' ? 2 : 1)); } -$showMoverButton = $setup && $pool_devices; +$showMoverButton = $setup; $moverRunning = file_exists('/var/run/mover.pid'); ?>