Flummi/Unraid-SlackPack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change advanced view from toggle to fixed

Browse Source
This commit is contained in:
dmacias72 2016-02-22 07:41:46 -07:00
parent 8c7f413560
commit d1a40112f4
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
source/ipmitool-plugin/usr/local/emhttp/plugins/ipmitool-plugin/js/jquery.ipmitool-plugin.js
View File

@ -43,13 +43,17 @@ $(function(){
labels_placement: "left", labels_placement: "left",
on_label: 'Advanced View', on_label: 'Advanced View',
off_label: 'Basic View', off_label: 'Basic View',
checked: $.cookie('ipmitool_sensor_mode') == 'advanced' checked: ($.cookie('ipmitool_sensor_mode') == 'advanced')
}); });
//set cookie and toggle advanced columns //set cookie and toggle advanced columns
$('.advancedview').change(function () { $('.advancedview').change(function () {
$('.advanced').toggle('slow'); var myval = $(this).prop("checked");
$.cookie('ipmitool_sensor_mode', $('.advancedview').prop('checked') ? 'advanced' : 'basic', { expires: 3650 }); $.cookie('ipmitool_sensor_mode', myval ? "advanced" : "basic", { expires: 3650 });
if (myval)
$('.advanced').show('slow');
else
$('.advanced').hide('slow');
}); });
sensorRefresh(); sensorRefresh();
@ -68,12 +72,12 @@ function sensorArray(Refresh){
$.each(data, function (i, val) { $.each(data, function (i, val) {
if (data[i].Status != "ns") { if (data[i].Status != "ns") {
var Reading = parseFloat(data[i].Reading); var Reading = parseFloat(data[i].Reading);
var LowerNonRec = parseFloat(data[i].LowerNonRec); var LowerNR = parseFloat(data[i].LowerNR);
var LowerCritical = parseFloat(data[i].LowerCritical); var LowerC = parseFloat(data[i].LowerC);
var LowerNonCrit = parseFloat(data[i].LowerNonCrit); var LowerNC = parseFloat(data[i].LowerNC);
var UpperNonCrit = parseFloat(data[i].UpperNonCrit); var UpperNC = parseFloat(data[i].UpperNC);
var UpperCritical = parseFloat(data[i].UpperCritical); var UpperC = parseFloat(data[i].UpperC);
var UpperNonRec = parseFloat(data[i].UpperNonRec); var UpperNR = parseFloat(data[i].UpperNR);
var Color = "green"; var Color = "green";
// replace invalid characters // replace invalid characters
@ -83,42 +87,42 @@ function sensorArray(Refresh){
// if voltage is less than lower non-critical // if voltage is less than lower non-critical
// or voltage is greater than upper non-critical show critical // or voltage is greater than upper non-critical show critical
if (Reading < LowerNonCrit && Reading > UpperNonCrit) if (Reading < LowerNC && Reading > UpperNC)
Color = "orange"; Color = "orange";
// if voltage is less than lower critical // if voltage is less than lower critical
// or voltage is greater than upper critical show non-recoverable // or voltage is greater than upper critical show non-recoverable
if (Reading < LowerCritical || Reading > UpperCritical) if (Reading < LowerC || Reading > UpperC)
Color = "red"; Color = "red";
} else if (data[i].Type=="Fan"){ } else if (data[i].Type=="Fan"){
// if Fan RPMs are less than lower non-critical // if Fan RPMs are less than lower non-critical
if (Reading < LowerNonCrit || Reading < LowerCritical || Reading < LowerNonRec) if (Reading < LowerNC || Reading < LowerC || Reading < LowerNR)
Color = "red"; Color = "red";
} else if (data[i].Type=="Temperature"){ } else if (data[i].Type=="Temperature"){
// if Temperature is greater than upper non-critical // if Temperature is greater than upper non-critical
if (Reading > UpperNonCrit || Reading > UpperCritical || Reading > UpperNonRec) if (Reading > UpperNC || Reading > UpperC || Reading > UpperNR)
Color = "red"; Color = "red";
} }
if (Refresh) { if (Refresh) {
$("#" + Name + " td.reading").html("<font color='"+ Color + "'>" + Reading + "</font>"); $("#"+Name+" td.reading").html("<font color='"+ Color + "'>"+Reading+"</font>");
} else { } else {
$("#tblSensor tbody") $("#tblSensor tbody")
.append("<tr id='"+Name+"'>"+ .append("<tr id='"+Name+"'>"+
"<td title='"+data[i].Status+"'><img src='/plugins/ipmitool-plugin/images/green-on.png'/></td>"+ //status "<td title='"+data[i].Status+"'><img src='/plugins/ipmitool-plugin/images/green-on.png'/></td>"+ //status
"<td>"+data[i].Name+"</td>"+ //sensor name "<td>"+data[i].Name+"</td>"+ //sensor name
"<td class='advanced'>"+ data[i].LowerNonRec +"</td>"+ "<td class='advanced'>"+ data[i].LowerNR +"</td>"+
"<td class='advanced'>"+ data[i].LowerCritical +"</td>"+ "<td class='advanced'>"+ data[i].LowerC +"</td>"+
"<td class='advanced'>"+ data[i].LowerNonCrit +"</td>"+ "<td class='advanced'>"+ data[i].LowerNC +"</td>"+
"<td class='reading'>"+ "<font color='"+ Color + "'>" + Reading + "</font></td>"+ //sensor reading "<td class='reading'>"+ "<font color='"+ Color + "'>" + Reading + "</font></td>"+ //sensor reading
"<td>"+data[i].Units+"</td>"+ //sensor units "<td>"+data[i].Units+"</td>"+ //sensor units
"<td class='advanced'>"+ data[i].UpperNonCrit +"</td>"+ "<td class='advanced'>"+ data[i].UpperNC +"</td>"+
"<td class='advanced'>"+ data[i].UpperCritical +"</td>"+ "<td class='advanced'>"+ data[i].UpperC +"</td>"+
"<td class='advanced'>"+ data[i].UpperNonRec +"</td>"+ "<td class='advanced'>"+ data[i].UpperNR +"</td>"+
"</tr>"); "</tr>");
} }
} }
@ -194,4 +198,4 @@ function slideRow(td) {
.children() .children()
.slideUp(function() { td.remove(); }); .slideUp(function() { td.remove(); });
$("#tblEvents").trigger("update") $("#tblEvents").trigger("update")
}; };