mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-26 12:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #446 from bergware/master

Browse Source 
Miscellaneous updates
This commit is contained in:
tom mortensen
2019-01-18 23:23:33 -08:00
committed by GitHub
parent 01dbbd634c a1477b1c21
commit bc93bf00e3
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.docker.manager/include/DockerContainers.php
+1 -1
View File
@@ -97,7 +97,7 @@ foreach ($containers as $ct) {
}
echo "</span></td><td class='updatecolumn'>";
if ($updateStatus=='false') {
echo "<div class='advanced'><span class='orange-text' style='white-space:nowrap;'><i class='fa fa-flash fa-fw'></i> update required</span></div>";
echo "<div class='advanced'><span class='orange-text' style='white-space:nowrap;'><i class='fa fa-flash fa-fw'></i> updated</span></div>";
echo "<a class='exec' onclick=\"updateContainer('".addslashes(htmlspecialchars($name))."');\"><span style='white-space:nowrap;'><i class='fa fa-cloud-download fa-fw'></i> update ready</span></a>";
} elseif ($updateStatus=='true') {
echo "<span class='green-text' style='white-space:nowrap;'><i class='fa fa-check fa-fw'></i> up-to-date</span>";
plugins/dynamix/DashStats.page
+1 -1
View File
@@ -597,7 +597,7 @@ function update30() {
<?if ($devs):?>
$.post('<?=$url?>',{cmd:'extra',hot:'<?=$display['hot']?>',max:'<?=$display['max']?>',unit:'<?=$display['unit']?>',text:<?=$display['text']?>,critical:'<?=$display['critical']?>',warning:'<?=$display['warning']?>'},function(d) {
var data = d.split('\0');
var info = moreInfo(data,'Extra');
var info = moreInfo(data,'Unassigned');
$('#extra_list').html(data[0]);
$('#extra_info').parent().css('display',info?'':'none');
$('#extra_info').html(info);
plugins/dynamix/include/DashUpdate.php
+5 -4
View File
@@ -222,8 +222,8 @@ function array_group($type) {
}
}
function extra_group() {
global $devs,$error,$warning,$red,$orange,$fail,$smart,$full,$high;
foreach ($devs as $disk) {
global $disks,$error,$warning,$red,$orange,$fail,$smart,$full,$high;
foreach ($disks as $disk) {
$name = $disk['device'];
$port = port_name($name);
$disk['color'] = exec("hdparm -C /dev/$port|grep -Po 'active|unknown'") ? 'blue-on' : 'blue-blink';
@@ -261,9 +261,10 @@ case 'cache':
break;
case 'extra':
$var = @parse_ini_file('state/var.ini') ?: [];
$devs = @parse_ini_file('state/devs.ini',true) ?: [];
$disks = @parse_ini_file('state/devs.ini',true) ?: [];
$saved = @parse_ini_file('state/monitor.ini',true) ?: [];
require_once "$docroot/webGui/include/CustomMerge.php";
$smartALL = '/boot/config/smart-all.cfg';
if (file_exists($smartALL)) $var = array_merge($var, parse_ini_file($smartALL));
require_once "$docroot/webGui/include/Preselect.php";
$error = $warning = $red = $orange = $fail = $smart = $full = $high = 0;
extra_group();