webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Colorize the bandwidth meter and update jquery.

Browse Source
This commit is contained in:
Joern-Ingo Weigert
2013-03-08 16:23:13 +01:00
committed by Michael Tremer
parent 465d1730ba
commit d0d063fe14
6 changed files with 63 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
html/html/include/jquery-1.2.6.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
html/html/include/jquery-1.9.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
html/html/themes/ipfire/include/functions.pl
View File

@@ -179,7 +179,7 @@ END
; ;
if ($settings{'SPEED'} ne 'off') { if ($settings{'SPEED'} ne 'off') {
print <<END print <<END
<script type="text/javascript" src="/include/jquery-1.2.6.min.js"></script> <script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var t_current; var t_current;
var t_last; var t_last;

6
html/html/themes/ipfire/include/style.css
View File

@@ -433,3 +433,9 @@ max-width: 2.5em;
position: relative; position: relative;
width: 100%; width: 100%;
} }
/* FOOTER COLORIZE BANDWIDTH */
#rx_kbs { color: green; }
#tx_kbs { color: red; }

104
html/html/themes/maniac/include/functions.pl
View File

@@ -179,66 +179,53 @@ END
; ;
if ($settings{'SPEED'} ne 'off') { if ($settings{'SPEED'} ne 'off') {
print <<END print <<END
<script type="text/javascript" language="javascript"> <script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script>
<script type="text/javascript">
var http_request = false; var t_current;
var t_last;
function LoadInetInfo(url) { var rxb_current;
var rxb_last;
http_request = false; var txb_current;
var txb_last;
if (window.XMLHttpRequest) { // Mozilla, Safari,... function refreshInetInfo() {
http_request = new XMLHttpRequest(); \$.ajax({
if (http_request.overrideMimeType) { url: '/cgi-bin/speed.cgi',
http_request.overrideMimeType('text/xml'); success: function(xml){
// zu dieser Zeile siehe weiter unten t_current = new Date();
} var t_diff = t_current - t_last;
} else if (window.ActiveXObject) { // IE t_last = t_current;
try {
http_request = new ActiveXObject("Msxml2.XMLHTTP"); rxb_current = \$("rxb",xml).text();
} catch (e) { var rxb_diff = rxb_current - rxb_last;
try { rxb_last = rxb_current;
http_request = new ActiveXObject("Microsoft.XMLHTTP");
} catch (e) {} var rx_kbs = rxb_diff/t_diff;
} rx_kbs = Math.round(rx_kbs*10)/10;
}
txb_current = \$("txb",xml).text();
if (!http_request) { var txb_diff = txb_current - txb_last;
alert('Ende :( Kann keine XMLHTTP-Instanz erzeugen'); txb_last = txb_current;
return false;
} var tx_kbs = txb_diff/t_diff;
http_request.onreadystatechange = DisplayInetInfo; tx_kbs = Math.round(tx_kbs*10)/10;
http_request.open('GET', url, true);
http_request.send(null); \$("#rx_kbs").text(rx_kbs + ' kb/s');
\$("#tx_kbs").text(tx_kbs + ' kb/s');
} }
});
function DisplayInetInfo() { window.setTimeout("refreshInetInfo()", 3000);
if (http_request.readyState == 4) { }
var xmldoc = http_request.responseXML; \$(document).ready(function(){
var root1_node = xmldoc.getElementsByTagName('rx_kbs').item(0); refreshInetInfo();
var root2_node = xmldoc.getElementsByTagName('tx_kbs').item(0); });
var root3_node = xmldoc.getElementsByTagName('rxb').item(0); </script>
var root4_node = xmldoc.getElementsByTagName('txb').item(0);
document.forms['speed'].txkb.value = root1_node.firstChild.data;
document.forms['speed'].rxkb.value = root2_node.firstChild.data;
// document.getElementsByTagName("input")[0].style.color = "#00FF00";
url = "/cgi-bin/speed.cgi?rxb_last=" + root3_node.firstChild.data + "&txb_last=" + root4_node.firstChild.data;
window.setTimeout("LoadInetInfo(url)", 3000);
}
}
</script>
</head> </head>
<body onLoad="LoadInetInfo('/cgi-bin/speed.cgi')"> <body>
END END
; ;
} }
else { else {
print "</head><body>";} print "</head>\n<body>";}
print <<END print <<END
<!-- IPFIRE HEADER --> <!-- IPFIRE HEADER -->
@@ -375,10 +362,9 @@ END
if ($settings{'SPEED'} ne 'off') { if ($settings{'SPEED'} ne 'off') {
print <<END print <<END
<br /> <br />
<form name='speed'> <b>$Lang::tr{'bandwidth usage'}:</b>
<b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: none; padding: 0; background-color: #000000; vertical-align: middle" /> $Lang::tr{'incoming'}: <span id="rx_kbs"></span>&nbsp;$Lang::tr{'outgoing'}: <span id="tx_kbs"></span>
$Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: none; padding: 0; background-color: #000000; vertical-align: middle"/>
</form>
END END
; ;
} }

6
html/html/themes/maniac/include/style.css
View File

@@ -462,3 +462,9 @@ max-width: 2.5em;
position: relative; position: relative;
width: 100%; width: 100%;
} }
/* FOOTER COLORIZE BANDWIDTH */
#rx_kbs { color: green; }
#tx_kbs { color: red; }