diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page index 94191ee1b..d5cd439d0 100644 --- a/plugins/dynamix/DashStats.page +++ b/plugins/dynamix/DashStats.page @@ -56,8 +56,7 @@ $sleep = isset($display['sleep']); $array_size = $array_used = 0; $extra_size = $extra_used = 0; $cache_size = $cache_used = []; -$cache_type = $cache_pool = []; -$cache_percent = []; +$cache_type = $cache_rate = []; $parity = $var['mdResync']; $mover = file_exists('/var/run/mover.pid'); @@ -78,8 +77,8 @@ foreach ($disks as $disk) { $cache_size[$name] = $disk['fsSize']; $cache_used[$name] = $disk['fsSize']-$disk['fsFree']; $cache_type[$name] = $disk['rotational'] ? ($disk['luksState'] ? 'disk-encrypted' : 'disk') : 'nvme'; - $cache_pool[$name] = $disk['devices']; - $cache_percent[$name] = number_format(100*$cache_used[$name]/($cache_size[$name] ?: 1),1,$dot,''); + $cache_rate[$name] = number_format(100*$cache_used[$name]/($cache_size[$name] ?: 1),1,$dot,''); + if (!$cache[$name]['devices']) unset($pools[$name]); } break; } @@ -181,8 +180,8 @@ input[value=Edit]{margin:12px 0 0 0;padding:5px 10px} .share1,.share2,.share3,.view1,.view2,.view3,.user1,.user2,.user3{display:none} #shares_view_on,#users_view_on,#array_view_on,#extra_view_on{display:none} -._view{display:none} -#_view_on{display:none} +.__view{display:none} +#__view_on{display:none} form[name=boot]{display:none} .flat{height:0;lineheight:0} @@ -517,16 +516,14 @@ foreach ($users as $user) { - - (_(stopped)_) + (_(stopped)_) - + -_(Device)__(Status)__(Temp)__(SMART)__(Utilization)_ +_(Device)__(Status)__(Temp)__(SMART)__(Utilization)_ - - + _(Unassigned)_ @@ -869,7 +866,7 @@ function toggleView(field,init,view) { if (unset) visible = $('.share').is(':visible'); case 'array_view': - case '_view': + case '__view': case 'extra_view': var on = $('#'+field+'_on'); @@ -1057,7 +1054,7 @@ $(function() { toggleView('parity_view',true); toggleView('array_view',true); - toggleView('_view',true); + toggleView('__view',true); toggleView('extra_view',true); diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php index 498f34e5a..c30745b3c 100644 --- a/plugins/dynamix/include/DashUpdate.php +++ b/plugins/dynamix/include/DashUpdate.php @@ -265,11 +265,9 @@ case 'cache': $error = $warning = $red = $orange = $fail = $smart = $full = $high = 0; $cache = cache_filter($disks); $pools = pools_filter($cache); - foreach ($pools as $pool) { - if ($cache[$pool]['devices']) { - array_group('Cache',$pool); - echo "\0".($error+$warning)."\0".($red+$orange)."\0".($fail+$smart)."\0".($full+$high)."\r"; - } + foreach ($pools as $pool) if ($cache[$pool]['devices']) { + array_group('Cache',$pool); + echo "\0".($error+$warning)."\0".($red+$orange)."\0".($fail+$smart)."\0".($full+$high)."\r"; } break; case 'extra':