mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-20 20:02:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #444 from bergware/master

Browse Source 
Dashboard corrections
This commit is contained in:
tom mortensen
2019-01-18 09:22:16 -08:00
committed by GitHub
parent 54627108cb b9602e8e71
commit 084568990e
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/dynamix/DashStats.page
View File

@@ -407,7 +407,7 @@ foreach ($users as $user) {
<tr><td></td><td colspan='5' id='parity'></td><td></td></tr>
<tr><td></td><td colspan='5' id='program'></td><td></td></tr>
</tbody>
<thead><tr><td></td><td colspan='5' class='next'>Array<?if (!$started):?> not started<?endif;?><i class='fa blue-text chevron mt0' id='array_view' onclick='toggleChevron("array_view",0)'></i>
<thead><tr><td></td><td colspan='5' class='next'>Array<?if (!$started):?> (not started)<?endif;?><i class='fa blue-text chevron mt0' id='array_view' onclick='toggleChevron("array_view",0)'></i>
<?if ($started):?><span class='info'><?=my_scale($array_used*1024,$unit)." $unit"?> used of <?=my_scale($array_size*1024,$unit,-1,-1)." $unit"?> (<?=$array_percent?> %)</span><?endif;?>
</td><td></td></tr>
<tr style='display:none'><td></td><td id='array_info' colspan='5'></td><td></td></tr>
@@ -415,7 +415,7 @@ foreach ($users as $user) {
</thead>
<tbody class='array_view' id='array_list' style='display:none'></tbody>
<?if (isset($disks['cache'])):?>
<thead><tr><td></td><td colspan='5' class='next'>Cache<?if (!$started):?> not started<?endif;?><i class='fa blue-text chevron mt0' id='cache_view' onclick='toggleChevron("cache_view",0)'></i>
<thead><tr><td></td><td colspan='5' class='next'>Cache<?if (!$started):?> (not started)<?endif;?><i class='fa blue-text chevron mt0' id='cache_view' onclick='toggleChevron("cache_view",0)'></i>
<?if ($started):?><span class='info'><?=my_scale($cache_used*1024,$unit)." $unit"?> used of <?=my_scale($cache_size*1024,$unit,-1,-1)." $unit"?> (<?=$cache_percent?> %)</span><?endif;?>
</td><td></td></tr>
<tr style='display:none'><td></td><td id='cache_info' colspan='5'></td><td></td></tr>
@@ -424,7 +424,7 @@ foreach ($users as $user) {
<tbody class='cache_view' id='cache_list' style='display:none'></tbody>
<?endif;?>
<?if ($devs):?>
<thead><tr><td></td><td colspan='5' class='next'>Extra<i class='fa blue-text chevron mt0' id='extra_view' onclick='toggleChevron("extra_view",0)'></i><span class='info'></span></td><td></td></tr>
<thead><tr><td></td><td colspan='5' class='next'>Unassigned<i class='fa blue-text chevron mt0' id='extra_view' onclick='toggleChevron("extra_view",0)'></i><span class='info'></span></td><td></td></tr>
<tr style='display:none'><td></td><td id='extra_info' colspan='5'></td><td></td></tr>
<tr id='extra_view_on' style='display:none'><td></td><td>Device</td><td>Status</td><td>Temp</td><td>SMART</td><td>Utilization</td><td></td></tr>
</thead>

20
plugins/dynamix/include/DashUpdate.php
View File

@@ -221,9 +221,9 @@ function array_group($type) {
echo "<td></td></tr>";
}
}
function extra_group(&$disks) {
global $disks,$error,$warning,$red,$orange,$fail,$smart,$full,$high;
foreach ($disks as $disk) {
function extra_group() {
global $devs,$error,$warning,$red,$orange,$fail,$smart,$full,$high;
foreach ($devs as $disk) {
$name = $disk['device'];
$port = port_name($name);
$smart = "state/smart/$name";
@@ -240,8 +240,8 @@ function extra_group(&$disks) {
}
switch ($_POST['cmd']) {
case 'array':
$var = parse_ini_file('state/var.ini') ?: [];
$disks = array_filter(parse_ini_file('state/disks.ini',true),'active_disks') ?: [];
$var = @parse_ini_file('state/var.ini') ?: [];
$disks = @array_filter(parse_ini_file('state/disks.ini',true),'active_disks') ?: [];
$saved = @parse_ini_file('state/monitor.ini',true) ?: [];
require_once "$docroot/webGui/include/CustomMerge.php";
require_once "$docroot/webGui/include/Preselect.php";
@@ -251,8 +251,8 @@ case 'array':
echo "\0".($error+$warning)."\0".($red+$orange)."\0".($fail+$smart)."\0".($full+$high);
break;
case 'cache':
$var = parse_ini_file('state/var.ini');
$disks = array_filter(parse_ini_file('state/disks.ini',true),'active_disks');
$var = @parse_ini_file('state/var.ini') ?: [];
$disks = @array_filter(parse_ini_file('state/disks.ini',true),'active_disks') ?: [];
$saved = @parse_ini_file('state/monitor.ini',true) ?: [];
require_once "$docroot/webGui/include/CustomMerge.php";
require_once "$docroot/webGui/include/Preselect.php";
@@ -261,13 +261,13 @@ case 'cache':
echo "\0".($error+$warning)."\0".($red+$orange)."\0".($fail+$smart)."\0".($full+$high);
break;
case 'extra':
$var = parse_ini_file('state/var.ini');
$devs = parse_ini_file('state/devs.ini',true);
$var = @parse_ini_file('state/var.ini') ?: [];
$devs = @parse_ini_file('state/devs.ini',true) ?: [];
$saved = @parse_ini_file('state/monitor.ini',true) ?: [];
require_once "$docroot/webGui/include/CustomMerge.php";
require_once "$docroot/webGui/include/Preselect.php";
$error = $warning = $red = $orange = $fail = $smart = $full = $high = 0;
extra_group($devs);
extra_group();
echo "\0".($error+$warning)."\0".($red+$orange)."\0".($fail+$smart)."\0".($full+$high);
break;
case 'sys':