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

Dashboard: move all dynamic generated content to "update_1"

Browse Source
This commit is contained in:
bergware
2023-12-14 18:48:46 +01:00
parent 8005406e87
commit 7a0df7de23
6 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix/DashStats.page
+3 -7
View File
@@ -279,9 +279,7 @@ foreach ($cpus as $pair) {
<i class='ups fa fa-compress'></i>_(Usable size)_: <?=$ramsize?><br>
<i class='ups fa fa-expand'></i>_(Maximum size)_: <?="$memory_maximum $unit"?><?=$low?'*':''?>
<legend>_(Legend)_</legend>
<i class='ups fa fa-circle used'></i>_(Services)_: <span id='used'></span><br>
<span id='dynamic'></span>
<i class='ups fa fa-circle free'></i>_(Free)_: <span id='free'></span><br>
</div></span>
<span class='w18 center'><span class='center'><a class='info hand none'>_(RAM usage)_<span>_(Percent of total used memory)_ (<?=$ramsize?>)</span></a></span><div class='pie' id='sys0'><span class='sys0'></span><span class='var0'></span></div></span>
<span class='w18 center'><span class='center'><a class='info hand none'>_(Flash device)_<span>_(Percent usage of flash usb device)_ (<?=$flashsize?>)</span></a></span><div class='pie' id='sys1'><span class='sys1'></span><span class='var1'></span></div></span>
@@ -1502,7 +1500,6 @@ dashboard.on('message',function(msg,meta) {
$('.sys'+k).text(v[0]).css({'color':fontColor(load,<?=$display['critical']?>,<?=$display['warning']?>)});
$('.var'+k).text(v[1]);
if (k == 0) {
$('#used').text(v[5]);
var color = setColor(load,<?=$display['critical']?>,<?=$display['warning']?>);
$('.sys0_').text(v[0]);
$('#sys0_').finish().animate({width:v[0]},{step:function(){$('#sys0_').css('overflow','visible').removeClass().addClass(color);}});
@@ -1522,10 +1519,9 @@ dashboard.on('message',function(msg,meta) {
var names = (dynamic[1]||'').split('\r');
// dynamic info from hook scripts
var html = [];
for (var i=0,name; name=names[i]; i++) if (name) html.push("<i class='ups fa fa-circle' style='color:"+(colors[i+2]||'#486dba')+"'></i>"+name+": "+v[i*2+7]+"<br>");
$('#dynamic').html(html.join(''));
$('#free').text(v[3]);
for (var i=0,name; name=names[i]; i++) if (i!=1) html.push("<i class='ups fa fa-circle' style='color:"+(colors[i]||'#486dba')+"'></i>"+name+": "+(i==0?v[5]:v[i*2+3]));
html.push("<i class='ups fa fa-circle' style='color:"+colors[1]+"'></i>"+names[1]+": "+v[3])
$('#dynamic').html(html.join('<br>'));
} else {
$('#sys'+k).css({'background':'conic-gradient('+colors[0]+' 0% '+v[0]+','+colors[1]+' '+v[0]+' 100%)'});
}
emhttp/plugins/dynamix/nchan/update_1
+2 -1
View File
@@ -59,7 +59,8 @@ while (true) {
exec("sensors -uA 2>/dev/null|grep -Po 'fan\d_input: \K\d+'",$fans);
[$total,$free] = $memory;
$used = $total-$free;
$names = $bytes = $meminfo = $sysinfo = [];
$names = [_('Services'), _('Free')];
$bytes = $meminfo = $sysinfo = [];
$hooks = array_filter(glob("/usr/local/emhttp/plugins/*/system/*",GLOB_NOSORT),function($file){return is_executable($file);});
foreach ($hooks as $hook) {
$names[] = _(basename($hook)); // name of element (with translation)
emhttp/plugins/dynamix/sheets/DashStats-azure.css
-2
View File
@@ -1,4 +1,2 @@
div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}
div.pie::after{background-color:#d7dbdd}
i.free{color:#eceaec}
i.used{color:#606e7f}
emhttp/plugins/dynamix/sheets/DashStats-black.css
-2
View File
@@ -1,4 +1,2 @@
div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(610px,1fr));column-gap:20px}
div.pie::after{background-color:#262626}
i.free{color:#444444}
i.used{color:#787878}
emhttp/plugins/dynamix/sheets/DashStats-gray.css
-2
View File
@@ -1,4 +1,2 @@
div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(580px,1fr));column-gap:20px}
div.pie::after{background-color:#212f3d}
i.free{color:#232523}
i.used{color:#606e7f}
emhttp/plugins/dynamix/sheets/DashStats-white.css
-2
View File
@@ -1,4 +1,2 @@
div.grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(610px,1fr));column-gap:20px}
div.pie::after{background-color:#f7f9f9}
i.free{color:#dcdcdc}
i.used{color:#a8a8a8}