tyler.durden/squidanalyzer
1
0
Fork 0
mirror of https://github.com/darold/squidanalyzer.git synced 2025-07-31 01:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set default sorttable sort in descending order first.

Browse Source
This commit is contained in:
Darold Gilles 2013-01-28 21:08:34 +01:00
parent 14c6c4a21c
commit 6e6497fbbc
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
SquidAnalyzer.pm
View File

@ -1126,9 +1126,9 @@ sub _print_header
<script type="text/javascript" src="$self->{WebUrl}sorttable.js"></script> <script type="text/javascript" src="$self->{WebUrl}sorttable.js"></script>
<!-- javascript to draw graphics --> <!-- javascript to draw graphics -->
<script type="text/javascript" src="$self->{WebUrl}flotr2.js"></script> <script type="text/javascript" src="$self->{WebUrl}flotr2.js"></script>
<script type="text/javascript" >var sortpos = 1;</script> <script type="text/javascript" >var sortpos = 2;</script>
</head> </head>
<body onload="var myTH = document.getElementsByTagName('th')[sortpos]; sorttable.innerSortFunction.apply(myTH, []); sorttable.innerSortFunction.apply(myTH, []);"> <body onload="var myTH = document.getElementsByTagName('th')[sortpos]; sorttable.innerSortFunction.apply(myTH, []);">
<div id="conteneur"> <div id="conteneur">
<a name="atop"></a> <a name="atop"></a>
<div id="header"> <div id="header">
@ -1578,8 +1578,8 @@ sub _print_mime_stat
print $out qq{ print $out qq{
</tr>}; </tr>};
} }
my $sortpos = 1; my $sortpos = 2;
$sortpos = 2 if ($self->{OrderMime} eq 'bytes'); $sortpos = 3 if ($self->{OrderMime} eq 'bytes');
print $out qq{ print $out qq{
</tbody> </tbody>
</table> </table>
@ -1837,9 +1837,9 @@ sub _print_network_stat
<td style="text-align: left;">$network_stat{$net}{url}</td> <td style="text-align: left;">$network_stat{$net}{url}</td>
</tr> </tr>
}; };
my $sortpos = 1; my $sortpos = 2;
$sortpos = 2 if ($self->{OrderNetwork} eq 'bytes'); $sortpos = 3 if ($self->{OrderNetwork} eq 'bytes');
$sortpos = 3 if ($self->{OrderNetwork} eq 'duration'); $sortpos = 4 if ($self->{OrderNetwork} eq 'duration');
print $outnet qq{ print $outnet qq{
<script type="text/javascript">sortpos = $sortpos;</script> <script type="text/javascript">sortpos = $sortpos;</script>
<div class="uplink"> <div class="uplink">
@ -1851,9 +1851,9 @@ sub _print_network_stat
} }
print $out "</tbody></table>\n"; print $out "</tbody></table>\n";
my $sortpos = 1; my $sortpos = 2;
$sortpos = 2 if ($self->{OrderNetwork} eq 'bytes'); $sortpos = 3 if ($self->{OrderNetwork} eq 'bytes');
$sortpos = 3 if ($self->{OrderNetwork} eq 'duration'); $sortpos = 4 if ($self->{OrderNetwork} eq 'duration');
print $out qq{ print $out qq{
<script type="text/javascript">sortpos = $sortpos;</script> <script type="text/javascript">sortpos = $sortpos;</script>
<div class="uplink"> <div class="uplink">
@ -2074,9 +2074,9 @@ sub _print_user_stat
$self->_print_footer(\$outusr); $self->_print_footer(\$outusr);
$outusr->close(); $outusr->close();
} }
my $sortpos = 1; my $sortpos = 2;
$sortpos = 2 if ($self->{OrderUser} eq 'bytes'); $sortpos = 3 if ($self->{OrderUser} eq 'bytes');
$sortpos = 3 if ($self->{OrderUser} eq 'duration'); $sortpos = 4 if ($self->{OrderUser} eq 'duration');
print $out qq{ print $out qq{
</tbody> </tbody>
</table> </table>
@ -2238,12 +2238,10 @@ sub _print_user_detail
} }
} }
$infile->close(); $infile->close();
my $nurl = scalar keys %url_stat;
my $nurl = scalar keys %url_stat;
print $$out qq{ print $$out qq{
<h3>$Translate{'Url_number'}: $nurl</h3> <h3>$Translate{'Url_number'}: $nurl</h3>
};
print $$out qq{
<table class="sortable stata"> <table class="sortable stata">
<thead> <thead>
<tr> <tr>
@ -2312,9 +2310,9 @@ sub _print_user_detail
print $$out qq{ print $$out qq{
</tr>}; </tr>};
} }
my $sortpos = 1; my $sortpos = 2;
$sortpos = 2 if ($self->{OrderUrl} eq 'bytes'); $sortpos = 3 if ($self->{OrderUrl} eq 'bytes');
$sortpos = 3 if ($self->{OrderUrl} eq 'duration'); $sortpos = 4 if ($self->{OrderUrl} eq 'duration');
print $$out qq{ print $$out qq{
</tbody> </tbody>
</table> </table>
@ -2375,12 +2373,12 @@ sub _print_top_url_stat
# Print the HTML header # Print the HTML header
my $cal = $self->_get_calendar($stat_date, $type, $outdir); my $cal = $self->_get_calendar($stat_date, $type, $outdir);
$self->_print_header(\$out, $self->{menu}, $cal); $self->_print_header(\$out, $self->{menu}, $cal);
print $out "<h3>$Translate{'Url_number'}: $nurl</h3>\n";
for my $tpe ('Hits', 'Bytes', 'Duration') { for my $tpe ('Hits', 'Bytes', 'Duration') {
my $t1 = $Translate{"Url_${tpe}_title"}; my $t1 = $Translate{"Url_${tpe}_title"};
$t1 =~ s/\%d/$self->{TopNumber}/; $t1 =~ s/\%d/$self->{TopNumber}/;
if ($tpe eq 'Hits') { if ($tpe eq 'Hits') {
print $out $self->_print_title($t1, $stat_date); print $out $self->_print_title($t1, $stat_date);
print $out "<h3>$Translate{'Url_number'}: $nurl</h3>\n";
} else { } else {
print $out "<h4>$t1 $stat_date</h4><div class=\"line-separator\"></div>\n"; print $out "<h4>$t1 $stat_date</h4><div class=\"line-separator\"></div>\n";
} }
@ -2548,13 +2546,14 @@ sub _print_top_domain_stat
# Print the HTML header # Print the HTML header
my $cal = $self->_get_calendar($stat_date, $type, $outdir); my $cal = $self->_get_calendar($stat_date, $type, $outdir);
$self->_print_header(\$out, $self->{menu}, $cal); $self->_print_header(\$out, $self->{menu}, $cal);
print $out "<h3>$Translate{'Domain_number'}: $nurl</h3>\n";
for my $tpe ('Hits', 'Bytes', 'Duration') { for my $tpe ('Hits', 'Bytes', 'Duration') {
my $t1 = $Translate{"Domain_${tpe}_title"}; my $t1 = $Translate{"Domain_${tpe}_title"};
$t1 =~ s/\%d/$self->{TopNumber}/; $t1 =~ s/\%d/$self->{TopNumber}/;
if ($tpe eq 'Hits') { if ($tpe eq 'Hits') {
print $out $self->_print_title($t1, $stat_date); print $out $self->_print_title($t1, $stat_date);
print $out "<h3>$Translate{'Domain_number'}: $nurl</h3>\n";
my %data = (); my %data = ();
my $total_hits = 0; my $total_hits = 0;

2
resources/sorttable.js
View File

@ -151,6 +151,8 @@ sorttable = {
//sorttable.shaker_sort(row_array, this.sorttable_sortfunction); //sorttable.shaker_sort(row_array, this.sorttable_sortfunction);
/* and comment out this one */ /* and comment out this one */
row_array.sort(this.sorttable_sortfunction); row_array.sort(this.sorttable_sortfunction);
// SquidAnalyzer: Sort in descending order first
row_array.reverse();
tb = this.sorttable_tbody; tb = this.sorttable_tbody;
for (var j=0; j<row_array.length; j++) { for (var j=0; j<row_array.length; j++) {