Skip to content

Commit 8697869

Browse files
author
Ilia Rostovtsev
committed
Version 18.40 [hot-fix #699]
1 parent 0e7b733 commit 8697869

File tree

3 files changed

+54
-51
lines changed

3 files changed

+54
-51
lines changed

‎unauthenticated/js/parent.js

+52-49
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@ function __si__bg_upd_exec() {
227227
setTimeout(function() {
228228
if (localStorage.getItem($hostname + "-sysinfo_cpu_percent_stats") || localStorage.getItem($hostname + "-sysinfo_mem_percent_stats") || localStorage.getItem($hostname + "-sysinfo_virt_percent_stats") || localStorage.getItem($hostname + "-sysinfo_disk_percent_stats")) {
229229
if ($("#right-side-tabs-sysinfo .graph-container").length) {
230+
var v = !localStorage.getItem($hostname + "-sysinfo_" + l + "_stats"),
231+
u = $(".info-container .graph-container." + l + "");
232+
v ? u.addClass("hidden").prev("br").addClass("hidden") : u.removeClass("hidden").prev("br").removeClass("hidden");
230233
if (l == "cpu_percent") {
231234
$("#right-side-tabs-sysinfo .graph-container." + l + " .description").attr("title", localStorage.getItem($hostname + "-sysinfo_load")).text("" + lang("theme_xhred_global_cpu_load") + ": " + localStorage.getItem($hostname + "-sysinfo_cpu_percent_stats") + "% (" + localStorage.getItem($hostname + "-sysinfo_load") + ")");
232235
$("#right-side-tabs-sysinfo .graph-container." + l + " .bar").attr("style", "width:" + localStorage.getItem($hostname + "-sysinfo_cpu_percent_stats") + "%")
@@ -250,32 +253,32 @@ function __si__bg_upd_exec() {
250253
$('#right-side-tabs .info-container .info-list-data span[data-data="' + l + '"]').html($(n).html($(n).html().split(",")[0])[0].outerHTML)
251254
}
252255
if (l == "local_time" && settings_window_replace_timestamps) {
253-
var v = $('#right-side-tabs .info-container .info-list-data span[data-data="' + l + '"] a');
254-
if (v && v.length) {
255-
v.html(v.next("span").detach())
256+
var x = $('#right-side-tabs .info-container .info-list-data span[data-data="' + l + '"] a');
257+
if (x && x.length) {
258+
x.html(x.next("span").detach())
256259
}
257260
var t = t__wi_p.$(".info-container").find("span[data-convertible-timestamp-full]"),
258-
u = t.attr("data-convertible-timestamp-full");
259-
t.html(moment.unix(u).format(settings_window_replaced_timestamp_format_full))
261+
w = t.attr("data-convertible-timestamp-full");
262+
t.html(moment.unix(w).format(settings_window_replaced_timestamp_format_full))
260263
}
261264
if (l == "cpu_temperature") {
262265
var q = 0;
263-
$.each($(n).filter(".badge-cpustatus"), function(z, A) {
264-
var y = parseInt($(this).text().split(":")[1]),
265-
B = (y <= 30 ? "--bg-info" : (y > 30 && y <= 60 ? "--bg-success" : (y > 60 && y <= 80) ? "bg-warning" : (y > 80) ? "bg-danger" : "")),
266-
C = $(this).text().indexOf("°C") > -1;
267-
if (!C) {
268-
B = (y <= 86 ? "--bg-info" : (y > 86 && y <= 140 ? "--bg-success" : (y > 140 && y <= 176) ? "bg-warning" : (y > 176) ? "bg-danger" : ""))
266+
$.each($(n).filter(".badge-cpustatus"), function(B, C) {
267+
var A = parseInt($(this).text().split(":")[1]),
268+
D = (A <= 30 ? "--bg-info" : (A > 30 && A <= 60 ? "--bg-success" : (A > 60 && A <= 80) ? "bg-warning" : (A > 80) ? "bg-danger" : "")),
269+
E = $(this).text().indexOf("°C") > -1;
270+
if (!E) {
271+
D = (A <= 86 ? "--bg-info" : (A > 86 && A <= 140 ? "--bg-success" : (A > 140 && A <= 176) ? "bg-warning" : (A > 176) ? "bg-danger" : ""))
269272
}
270-
if (B == "bg-warning" || B == "bg-danger") {
273+
if (D == "bg-warning" || D == "bg-danger") {
271274
q = 1
272275
}
273276
if (!$("#right-side-tabs .info-container .badge-drivestatus.badge-cpustatus").length) {
274277
$('strong[data-stats="cpu"] + br[data-stats="cpu"]').after(n.replace(/<br>|&nbsp;/gi, ""))
275278
}
276-
$($("#right-side-tabs .info-container .badge-drivestatus.badge-cpustatus")[z]).html($(this).text()).removeClass((function(D, E) {
277-
return (E.match(/(^|\s)bg-\S+/g) || []).join(" ")
278-
})).addClass(B)
279+
$($("#right-side-tabs .info-container .badge-drivestatus.badge-cpustatus")[B]).html($(this).text()).removeClass((function(F, G) {
280+
return (G.match(/(^|\s)bg-\S+/g) || []).join(" ")
281+
})).addClass(D)
279282
}).promise().done(function() {
280283
if (q) {
281284
$('[data-stats="cpu"]').removeClass("hidden")
@@ -286,22 +289,22 @@ function __si__bg_upd_exec() {
286289
}
287290
if (l == "hdd_temperature") {
288291
var r = 0;
289-
$.each($(n), function(z, A) {
290-
var y = parseInt($(this).text().split(":")[1]),
291-
B = (y <= 30 ? "--bg-info" : (y > 30 && y <= 60 ? "--bg-success" : (y > 60 && y <= 80) ? "bg-warning" : (y > 80) ? "bg-danger" : "")),
292-
C = $(this).text().indexOf("°C") > -1;
293-
if (!C) {
294-
B = (y <= 86 ? "--bg-info" : (y > 86 && y <= 140 ? "--bg-success" : (y > 140 && y <= 176) ? "bg-warning" : (y > 176) ? "bg-danger" : ""))
292+
$.each($(n), function(B, C) {
293+
var A = parseInt($(this).text().split(":")[1]),
294+
D = (A <= 30 ? "--bg-info" : (A > 30 && A <= 60 ? "--bg-success" : (A > 60 && A <= 80) ? "bg-warning" : (A > 80) ? "bg-danger" : "")),
295+
E = $(this).text().indexOf("°C") > -1;
296+
if (!E) {
297+
D = (A <= 86 ? "--bg-info" : (A > 86 && A <= 140 ? "--bg-success" : (A > 140 && A <= 176) ? "bg-warning" : (A > 176) ? "bg-danger" : ""))
295298
}
296-
if (B == "bg-warning" || B == "bg-danger") {
299+
if (D == "bg-warning" || D == "bg-danger") {
297300
r = 1
298301
}
299302
if (!$("#right-side-tabs .info-container .badge-drivestatus:not(.badge-cpustatus)").length) {
300303
$('strong[data-stats="drive"] + br[data-stats="drive"]').after(n.replace(/<br>|&nbsp;/gi, ""))
301304
}
302-
$($("#right-side-tabs .info-container .badge-drivestatus:not(.badge-cpustatus)")[z]).html($(this).text()).removeClass((function(D, E) {
303-
return (E.match(/(^|\s)bg-\S+/g) || []).join(" ")
304-
})).addClass(B)
305+
$($("#right-side-tabs .info-container .badge-drivestatus:not(.badge-cpustatus)")[B]).html($(this).text()).removeClass((function(F, G) {
306+
return (G.match(/(^|\s)bg-\S+/g) || []).join(" ")
307+
})).addClass(D)
305308
}).promise().done(function() {
306309
if (r) {
307310
$('[data-stats="drive"]').removeClass("hidden")
@@ -311,11 +314,11 @@ function __si__bg_upd_exec() {
311314
})
312315
}
313316
if (l == "uptime" || l == "running_proc") {
314-
var v = $('#right-side-tabs .info-container .info-list-data span[data-data="' + l + '"] a');
315-
if (v && v.length) {
316-
var s = v.parent(),
317-
x = s.text();
318-
s.html(v.text(x))
317+
var x = $('#right-side-tabs .info-container .info-list-data span[data-data="' + l + '"] a');
318+
if (x && x.length) {
319+
var s = x.parent(),
320+
z = s.text();
321+
s.html(x.text(z))
319322
}
320323
}
321324
if (l == "warning_si") {
@@ -325,28 +328,28 @@ function __si__bg_upd_exec() {
325328
}
326329
if (l == "extended_si") {
327330
var p = $("#right-side-tabs .info-container .extended-list-data");
328-
var w = (n.replace(/aria-expanded="true"/gi, 'aria-expanded="false"').replace(/collapse in/gi, "collapse"));
331+
var y = (n.replace(/aria-expanded="true"/gi, 'aria-expanded="false"').replace(/collapse in/gi, "collapse"));
329332
opened_tabs = $("#extended_sysinfo .panel .in").map(function() {
330-
w = (w.replace('data-toggle="collapse" href="#' + this.id + '" aria-expanded="false" aria-controls="' + this.id + '"', 'data-toggle="collapse" href="#' + this.id + '" aria-expanded="true" aria-controls="' + this.id + '"'));
331-
w = (w.replace('div id="' + this.id + '" class="panel-collapse collapse"', 'div id="' + this.id + '" class="panel-collapse collapse in"'))
333+
y = (y.replace('data-toggle="collapse" href="#' + this.id + '" aria-expanded="false" aria-controls="' + this.id + '"', 'data-toggle="collapse" href="#' + this.id + '" aria-expanded="true" aria-controls="' + this.id + '"'));
334+
y = (y.replace('div id="' + this.id + '" class="panel-collapse collapse"', 'div id="' + this.id + '" class="panel-collapse collapse in"'))
332335
}).promise().done(function() {
333-
p.html('<div style="height: 11px"></div>' + w);
334-
var y = $("#right-side-tabs .extended-list-data");
335-
y.find("div.panel-heading:not(#status_services-status):not(#status-virtual-server):not(#acl_logins-acl):not(#sysinfo-virtual-server):not(#quota-virtual-server):not(#bw-virtual-server)").parent().remove();
336-
$.each(y.find("div.panel-heading .panel-title"), function() {
337-
var A = $(this).find("a"),
338-
z = $(this).find("a").attr("aria-expanded") != "true" ? 1 : 0,
339-
B = (z ? "+" : "—");
340-
$(this).append('<span class="pull-right panel-title-status' + (z ? " margined-right-2" : "") + '">' + B + "</span>");
341-
A.text(upperFirst($.trim(A.text())))
336+
p.html('<div style="height: 11px"></div>' + y);
337+
var A = $("#right-side-tabs .extended-list-data");
338+
A.find("div.panel-heading:not(#status_services-status):not(#status-virtual-server):not(#acl_logins-acl):not(#sysinfo-virtual-server):not(#quota-virtual-server):not(#bw-virtual-server)").parent().remove();
339+
$.each(A.find("div.panel-heading .panel-title"), function() {
340+
var C = $(this).find("a"),
341+
B = $(this).find("a").attr("aria-expanded") != "true" ? 1 : 0,
342+
D = (B ? "+" : "—");
343+
$(this).append('<span class="pull-right panel-title-status' + (B ? " margined-right-2" : "") + '">' + D + "</span>");
344+
C.text(upperFirst($.trim(C.text())))
342345
});
343-
y.find(".panel.panel-default").detach().appendTo("#right-side-tabs #extended_sysinfo");
344-
y.find("div.panel-body").find("img").remove();
345-
y.find("a").attr("target", "page");
346-
y.find('input[type="submit"]').addClass("btn btn-default btn-xs");
347-
y.find('input[type="submit"]').parents("form").attr("formtarget", "page");
348-
y.find('button[type="button"].ui_submit').addClass("btn btn-default btn-xs");
349-
y.find('button[type="button"].ui_submit').parents("form").attr("formtarget", "page");
346+
A.find(".panel.panel-default").detach().appendTo("#right-side-tabs #extended_sysinfo");
347+
A.find("div.panel-body").find("img").remove();
348+
A.find("a").attr("target", "page");
349+
A.find('input[type="submit"]').addClass("btn btn-default btn-xs");
350+
A.find('input[type="submit"]').parents("form").attr("formtarget", "page");
351+
A.find('button[type="button"].ui_submit').addClass("btn btn-default btn-xs");
352+
A.find('button[type="button"].ui_submit').parents("form").attr("formtarget", "page");
350353
$("#extended_sysinfo .panel").on("show.bs.collapse", function() {
351354
$(this).find(".panel-title-status").removeClass("margined-right-2").text("—")
352355
}).on("hide.bs.collapse", function() {

‎unauthenticated/js/parent.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.40-git-201703281356
1+
18.40-git-201703281358

0 commit comments

Comments
 (0)