mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-13 21:20:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
bergware
2021-03-19 00:33:15 +01:00
parent f73cd6a8d9 add8e7a885
commit f1efa0c4da
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/dynamix/Diagnostics.page
View File

@@ -44,6 +44,7 @@ diagnostic.on('message',function(data) {
function cleanUp(file) {
if (document.hasFocus()) {
$.post('/webGui/include/Download.php',{cmd:'delete',file:file});
$("#download").attr("disabled",false);
} else {
setTimeout(function(){cleanUp(file);},2000);
}
@@ -114,4 +115,4 @@ to the system log.*
*Use* **Anonymize diagnostics** *when publishing the diagnostics file in the public forum. In private communication with Limetech it is recommended to uncheck this setting and capture all information unaltered.*
:end
<input type="button" value="_(Download)_" onclick="diagnostics(zipfile())"><input type="button" value="_(Done)_" onclick="done()"><input type="checkbox" id="anonymize" checked>_(Anonymize diagnostics)_
<input id='download' type="button" value="_(Download)_" onclick="$(this).attr('disabled',true);diagnostics(zipfile())"><input type="button" value="_(Done)_" onclick="done()"><input type="checkbox" id="anonymize" checked>_(Anonymize diagnostics)_

4
plugins/dynamix/scripts/monitor
View File

@@ -137,8 +137,8 @@ function check_usage($name,$used,$text,$info) {
global $notify,$disks,$saved,$display,$server;
if ($used == -1) return;
$disk = &$disks[$name];
$warning = $disk['warning'] ?? $display['warning'];
$critical = $disk['critical'] ?? $display['critical'];
$warning = $disk['warning'] ?: $display['warning'];
$critical = $disk['critical'] ?: $display['critical'];
$warn = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : '');
$item = 'used';
$last = $saved[$item][$name] ?? 0;

2
plugins/dynamix/styles/dynamix-white.css
View File

@@ -92,7 +92,7 @@ span.select ul.unused{display:block}
span.select ul li.nosort{font-weight:bold}
span.select ul li.ident{padding-left:7px}
span.select ul li span{display:none}
span.select{padding:3px 6px;margin:0 10px 0 0;border:none;border-radius:4px;box-shadow:0 2px 0 #ff8c2f,inset 0 -1px #f2f2f2;background-color:tranparent;outline:none;display:inline-block;cursor:pointer}
span.select{padding:3px 6px;margin:0 10px 0 0;border:none;border-radius:4px;box-shadow:0 2px 0 #ff8c2f,inset 0 -1px #f2f2f2;background-color:transparent;outline:none;display:inline-block;cursor:pointer}
span.select[disabled]{color:#1c1b1b;border-color:#808080;background-color:#e8e8e8;opacity:0.5;cursor:default}
div.sb-message{padding:10px;text-align:center}
div.sb-message a:link,div.sb-message a:visited{color:#486dba;text-decoration:underline}