maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Fix small bug in admin traffic summary, refs #492

Browse Source 
Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
This commit is contained in:
Florian Aders (EleRas)
2011-04-24 17:45:03 +02:00
parent 7db2fc6aeb
commit 6d0e44e103
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/Classic/admin/traffic/index.tpl
View File

@@ -4,13 +4,13 @@ $header
$.tablesorter.addParser( { $.tablesorter.addParser( {
id: 'filesize', id: 'filesize',
is: function(s) { is: function(s) {
return s.match( new RegExp( /[0-9]+(\.[0-9]+)?\ (KiB|Bi|GiB|MiB|TiB)/ ) ); return s.match( new RegExp( /[0-9]+(\.[0-9]+)?\ (KiB|B|GiB|MiB|TiB)/ ) );
}, },
format: function(s) { format: function(s) {
var suf = s.match( new RegExp( /(KiB|Bi|GiB|MiB|TiB)/) )[1]; var suf = s.match( new RegExp( /(KiB|B|GiB|MiB|TiB)/) )[1];
var num = parseFloat( s.match( new RegExp( /^[0-9]+(\.[0-9]+)?/ ) )[0] ); var num = parseFloat( s.match( new RegExp( /^[0-9]+(\.[0-9]+)?/ ) )[0] );
switch( suf ) { switch( suf ) {
case 'Bi': case 'B':
return num; return num;
case 'KiB': case 'KiB':
return num * 1024; return num * 1024;

6
templates/Froxlor/admin/traffic/index.tpl
View File

@@ -4,13 +4,13 @@ $header
$.tablesorter.addParser( { $.tablesorter.addParser( {
id: 'filesize', id: 'filesize',
is: function(s) { is: function(s) {
return s.match( new RegExp( /[0-9]+(\.[0-9]+)?\ (KiB|Bi|GiB|MiB|TiB)/ ) ); return s.match( new RegExp( /[0-9]+(\.[0-9]+)?\ (KiB|B|GiB|MiB|TiB)/ ) );
}, },
format: function(s) { format: function(s) {
var suf = s.match( new RegExp( /(KiB|Bi|GiB|MiB|TiB)/) )[1]; var suf = s.match( new RegExp( /(KiB|B|GiB|MiB|TiB)/) )[1];
var num = parseFloat( s.match( new RegExp( /^[0-9]+(\.[0-9]+)?/ ) )[0] ); var num = parseFloat( s.match( new RegExp( /^[0-9]+(\.[0-9]+)?/ ) )[0] );
switch( suf ) { switch( suf ) {
case 'Bi': case 'B':
return num; return num;
case 'KiB': case 'KiB':
return num * 1024; return num * 1024;