From 13b67d2a1e1b7efbcf47938c42060ab8f1b98671 Mon Sep 17 00:00:00 2001 From: Darold Gilles Date: Mon, 10 Dec 2012 16:03:19 +0100 Subject: [PATCH] Remove some hardcoded CSS. Thanks to Nathanael Bonin for the patches. --- SquidAnalyzer.pm | 118 ++++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/SquidAnalyzer.pm b/SquidAnalyzer.pm index f9ed612..09e1dcb 100644 --- a/SquidAnalyzer.pm +++ b/SquidAnalyzer.pm @@ -1413,7 +1413,7 @@ sub _print_cache_stat $Translate{'Domains'} }; print $out qq{ -$Translate{'Cost'} $self->{Currency} +$Translate{'Cost'} $self->{Currency} } if ($self->{CostPrice}); print $out qq{ @@ -1503,17 +1503,17 @@ sub _print_mime_stat print $out "

$Translate{'Mime_number'}: $ntype

\n"; print $out qq{ - +
- + - + - + }; print $out qq{ - + } if ($self->{CostPrice}); print $out qq{ @@ -1527,8 +1527,8 @@ sub _print_mime_stat my $total_cost = sprintf("%2.2f", int($mime_stat{$_}{bytes}/1000000) * $self->{CostPrice}); my $comma_bytes = &format_bytes($mime_stat{$_}{bytes}); print $out qq{ - - + + @@ -1685,22 +1685,22 @@ sub _print_network_stat $network_bytes = ''; print $out "

$Translate{'Network_number'}: $nnet

\n"; print $out qq{ -
$Translate{'Mime_link'}$Translate{'Mime_link'} $Translate{'Requests'}% $Translate{'Requests'}% $Translate{'Requests'} $Translate{'Bytes'}% $Translate{'Bytes'}% $Translate{'Bytes'}$Translate{'Cost'} $self->{Currency}$Translate{'Cost'} $self->{Currency}
$_
$_ $mime_stat{$_}{hits} $c_percent $comma_bytes
+
- + - + - + }; print $out qq{ - + } if ($self->{CostPrice}); print $out qq{ - + @@ -1731,8 +1731,8 @@ sub _print_network_stat } my $comma_bytes = &format_bytes($network_stat{$net}{bytes}); print $out qq{ - - + + @@ -1796,7 +1796,7 @@ sub _print_network_stat print $out qq{ - + }; print $outnet qq{ @@ -1946,17 +1946,17 @@ sub _print_user_stat print $out qq{
$Translate{'Network_link'} $Translate{'Requests'}% $Translate{'Requests'}% $Translate{'Requests'} $Translate{'Bytes'}% $Translate{'Bytes'}% $Translate{'Bytes'} $Translate{'Duration'}% $Translate{'Time'}% $Translate{'Time'}$Translate{'Cost'} $self->{Currency}$Translate{'Cost'} $self->{Currency}$Translate{'Users'}$Translate{'Users'} $Translate{'Largest'} $Translate{'Url'}
$show
$show $network_stat{$net}{hits} $h_percent $comma_bytes$retuser $network_stat{$net}{largest_file}$network_stat{$net}{url}$network_stat{$net}{url}
- + - + - + - + }; print $out qq{ - + } if ($self->{CostPrice}); print $out qq{ @@ -1988,13 +1988,13 @@ sub _print_user_stat my $comma_bytes = &format_bytes($user_stat{$usr}{bytes}); if ($self->{UrlReport}) { print $out qq{ - - + + }; } else { print $out qq{ - - + + }; } print $out qq{ @@ -2010,7 +2010,7 @@ sub _print_user_stat } if ($self->{CostPrice}); print $out qq{ - +}; if (!-d "$outdir/users/$url") { @@ -2127,14 +2127,14 @@ sub _print_netuser_stat - + - + - + }; print $$out qq{ - + } if ($self->{CostPrice}); print $$out qq{ @@ -2162,13 +2162,13 @@ sub _print_netuser_stat my $comma_bytes = &format_bytes($netuser_stat{$usr}{bytes}); if ($self->{UrlReport}) { print $$out qq{ - - + + }; } else { print $$out qq{ - - + + }; } print $$out qq{ @@ -2184,7 +2184,7 @@ sub _print_netuser_stat } if ($self->{CostPrice}); print $$out qq{ - +}; } print $$out qq{ @@ -2238,17 +2238,17 @@ sub _print_user_detail print $$out qq{
$Translate{'Users'} $Translate{'Requests'}% $Translate{'Requests'}% $Translate{'Requests'} $Translate{'Bytes'}% $Translate{'Bytes'}% $Translate{'Bytes'} $Translate{'Duration'}% $Translate{'Time'}% $Translate{'Time'}$Translate{'Cost'} $self->{Currency}$Translate{'Cost'} $self->{Currency}$Translate{'Largest'}
$show
$show
$show
$show$user_stat{$usr}{largest_file}$user_stat{$usr}{url}$user_stat{$usr}{url}
$Translate{'Users'} $Translate{'Requests'}% $Translate{'Requests'}% $Translate{'Requests'} $Translate{'Bytes'}% $Translate{'Bytes'}% $Translate{'Bytes'} $Translate{'Duration'}% $Translate{'Time'}% $Translate{'Time'}$Translate{'Cost'} $self->{Currency}$Translate{'Cost'} $self->{Currency}$Translate{'Largest'}
$show
$show
$show
$show$netuser_stat{$usr}{largest_file}$netuser_stat{$usr}{url}$netuser_stat{$usr}{url}
- + - + - + - + }; print $$out qq{ - + } if ($self->{CostPrice}); print $$out qq{ @@ -2266,8 +2266,8 @@ sub _print_user_detail my $total_cost = sprintf("%2.2f", int($url_stat{$url}{bytes}/1000000) * $self->{CostPrice}); my $comma_bytes = &format_bytes($url_stat{$url}{bytes}); print $$out qq{ - - + + @@ -2354,14 +2354,14 @@ sub _print_top_url_stat - + - + - + }; print $out qq{ - + } if ($self->{CostPrice}); print $out qq{ @@ -2403,8 +2403,9 @@ sub _print_top_url_stat } } print $out qq{ - - + + + @@ -2424,7 +2425,7 @@ sub _print_top_url_stat $i++; last if ($i > $self->{TopNumber}); } - print $out qq{
$Translate{'Url'} $Translate{'Requests'}% $Translate{'Requests'}% $Translate{'Requests'} $Translate{'Bytes'}% $Translate{'Bytes'}% $Translate{'Bytes'} $Translate{'Duration'}% $Translate{'Time'}% $Translate{'Time'}$Translate{'Cost'} $self->{Currency}$Translate{'Cost'} $self->{Currency}
$url
$url $url_stat{$url}{hits} $h_percent $comma_bytes
$Translate{'Url'} $Translate{'Requests'}% $Translate{'Requests'}% $Translate{'Requests'} $Translate{'Bytes'}% $Translate{'Bytes'}% $Translate{'Bytes'} $Translate{'Duration'}% $Translate{'Time'}% $Translate{'Time'}$Translate{'Cost'} $self->{Currency}$Translate{'Cost'} $self->{Currency}$Translate{'First_visit'}
$u
$u $url_stat{$u}{hits} $c_percent $comma_bytes
}; + print $out qq{}; } print $out qq{ @@ -2551,14 +2552,14 @@ sub _print_top_domain_stat $Translate{'Url'} $Translate{'Requests'} -% $Translate{'Requests'} +% $Translate{'Requests'} $Translate{'Bytes'} -% $Translate{'Bytes'} +% $Translate{'Bytes'} $Translate{'Duration'} -% $Translate{'Time'} +% $Translate{'Time'} }; print $out qq{ -$Translate{'Cost'} $self->{Currency} +$Translate{'Cost'} $self->{Currency} } if ($self->{CostPrice}); print $out qq{ $Translate{'First_visit'} @@ -2600,8 +2601,9 @@ sub _print_top_domain_stat } } print $out qq{ - -*.$_ + + +*.$_ $domain_stat{$_}{hits} $c_percent $comma_bytes @@ -2621,7 +2623,7 @@ sub _print_top_domain_stat $i++; last if ($i > $self->{TopNumber}); } - print $out qq{}; + print $out qq{}; } print $out qq{ @@ -3004,7 +3006,7 @@ sub flotr2_bargraph