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

hide custom driver, add status bar, move details to separate tab

Browse Source
This commit is contained in:
dmacias72 2017-04-28 20:23:48 -06:00
parent f74793cd1d
commit 2c6a11a562
1 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
source/nut/usr/local/emhttp/plugins/nut/NUTsettings.page
View File

@ -18,23 +18,15 @@ Icon="nut.png"
* Modified by macester macecapri@gmail.com for NUT plugin * Modified by macester macecapri@gmail.com for NUT plugin
* *
*/ */
?>
<?
$sName = "nut"; $sName = "nut";
$cfg = parse_plugin_cfg($sName); $cfg = parse_plugin_cfg($sName);
?> ?>
<script> <table class="tablesorter shift nut" <?if (!file_exists('/var/run/upsmon.pid')):?>style="display:none"<?endif;?>>
function toggleCustomDriver(form) { <thead><tr><th>UPS Status</th><th>Battery Charge %</th><th>Runtime Left </th><th>Nominal Power</th><th>UPS Load</th><th>UPS Load %</th></tr></thead>
var readonly = form.DRIVER.value != 'custom'; <tbody id="nut_summary"><tr><td colspan="6">&nbsp;</td></tr></tbody>
form.SERIAL.readOnly = readonly; </table>
if (readonly) form.SERIAL.value = '';
}
$(function() {
showStatus('upsmon');
});
</script>
<form markdown="1" name="nut_settings" method="POST" action="/update.php" target="progressFrame"> <form markdown="1" name="nut_settings" method="POST" action="/update.php" target="progressFrame">
<input type="hidden" name="#file" value="<?=$sName?>/<?=$sName?>.cfg"> <input type="hidden" name="#file" value="<?=$sName?>/<?=$sName?>.cfg">
@ -51,7 +43,7 @@ Start NUT UPS service:
> Setting 'Yes' will also enable NUT on unRAID boot. > Setting 'Yes' will also enable NUT on unRAID boot.
UPS Driver: UPS Driver:
: <select name="DRIVER" size="1" onChange="toggleCustomDriver(this.form)"> : <select id="DRIVER" name="DRIVER" size="1" >
<?=mk_option($cfg['DRIVER'], "blazer_usb", "Blazer_usb");?> <?=mk_option($cfg['DRIVER'], "blazer_usb", "Blazer_usb");?>
<?=mk_option($cfg['DRIVER'], "blazer_ser", "Blazer_ser");?> <?=mk_option($cfg['DRIVER'], "blazer_ser", "Blazer_ser");?>
<?=mk_option($cfg['DRIVER'], "bcmxcp_usb", "Bcmxcp_usb");?> <?=mk_option($cfg['DRIVER'], "bcmxcp_usb", "Bcmxcp_usb");?>
@ -59,7 +51,7 @@ UPS Driver:
<?=mk_option($cfg['DRIVER'], "tripplite_usb", "Tripplite_usb");?> <?=mk_option($cfg['DRIVER'], "tripplite_usb", "Tripplite_usb");?>
<?=mk_option($cfg['DRIVER'], "usbhid-ups", "Usbhid-ups");?> <?=mk_option($cfg['DRIVER'], "usbhid-ups", "Usbhid-ups");?>
<?=mk_option($cfg['DRIVER'], "custom", "Custom");?> <?=mk_option($cfg['DRIVER'], "custom", "Custom");?>
</select> </select><input type="text" class="serial" name="SERIAL" class="narrow" maxlength="40" value="<?=$cfg['SERIAL'];?>">
> **Check the link below to find the driver matching your UPS** > **Check the link below to find the driver matching your UPS**
> >
@ -67,11 +59,6 @@ UPS Driver:
> >
> For other devices set **Custom** and enter the driver manually below. > For other devices set **Custom** and enter the driver manually below.
> Dont forget to match the port with your driver > Dont forget to match the port with your driver
Custom Driver:
: <input type="text" name="SERIAL" class="narrow" maxlength="40" value="<?=$cfg['SERIAL'];?>">
> Use the *Link* above to find which Driver to choose. > Use the *Link* above to find which Driver to choose.
> Dont forget to match the port with your driver > Dont forget to match the port with your driver
@ -140,7 +127,7 @@ Turn off UPS after shutdown:
> Check your bios and enable, "Automatically power on after power loss" so that the server starts again when powers is restored. > Check your bios and enable, "Automatically power on after power loss" so that the server starts again when powers is restored.
<br><br><br> <br>
> **Additional Notes** > **Additional Notes**
> >
@ -152,34 +139,22 @@ Turn off UPS after shutdown:
> >
> macester (macecapri@gmail.com) > macester (macecapri@gmail.com)
<input type="submit" name="#default" value="Default"> <input type="submit" name="#default" value="Default">
: <input type="submit" name="#apply" value="Apply"><input type="button" value="Done" onclick="done()"> : <input type="submit" name="#apply" value="Apply"><input type="button" value="Done" onclick="done()">
</form> </form>
<div id="title"><span class="left"><img src="/plugins/nut/icons/nutsettings.png" class="icon">NUT Status</span></div>
<script src="jquery.min.js" type="text/javascript"></script>
<script type="text/javascript">
<script>
$(function() { $(function() {
showStatus('upsmon');
getStatus(); $('#DRIVER').change(checkSerial);
checkSerial();
}); });
function getStatus() { function checkSerial(){
if ($('#DRIVER')[0].selectedIndex == 6)
$('div#nut_status').load('/plugins/nut/include/nut_status.php'); $('.serial').css('visibility','visible')
setTimeout("getStatus()",10000); else
$('.serial').css('visibility','hidden')
} }
</script> </script>
<table class='share_status dash m0'>
<thead>
<tr><td colspan='3'>UPS Statistics</td></tr>
</thead>
<tr><td colspan='3'><div id='nut_status'></div></td></tr>
</table>