From: eldy <> Date: Sat, 22 Nov 2003 03:33:16 +0000 (+0000) Subject: Reports look better on Mozilla browsers. X-Git-Tag: AWSTATS_6_0_BETA~75 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4badde75b459978f47b118791647e3a8a3d90e2b;p=thirdparty%2FAWStats.git Reports look better on Mozilla browsers. --- diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index 96ea3b6e..2dcc3948 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -547,10 +547,11 @@ print <$Message[7]:$SiteDomain"; } + if ($FrameName eq 'mainleft') { print "$Message[7]:$SiteDomain"; } else { print "$Message[7]: $SiteDomain"; } # Logo and flags @@ -6894,88 +6895,88 @@ if (scalar keys %HTMLOutput) { print "\n"; # When $linetitle=&AtLeastOneNotNull($ShowMonthStats,$ShowDaysOfMonthStats,$ShowDaysOfWeekStats,$ShowHoursStats); - if ($linetitle) { print "".($menuicon?" ":"")."$Message[93]:\n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowMonthStats) { print ($frame?"":""); print "$Message[128]"; print ($frame?"\n":"   "); } - #if ($ShowMonthDayStats) { print ($frame?"   \"...\" ":""); print "$Message[130]\n"; print ($frame?"\n":"   "); } - if ($ShowDaysOfMonthStats) { print ($frame?"":""); print "$Message[138]"; print ($frame?"\n":"   "); } - if ($ShowDaysOfWeekStats) { print ($frame?"":""); print "$Message[91]"; print ($frame?"\n":"   "); } - if ($ShowHoursStats) { print ($frame?"":""); print "$Message[20]"; print ($frame?"\n":"   "); } + if ($linetitle) { print "".($menuicon?" ":"")."$Message[93]:\n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowMonthStats) { print ($frame?"":""); print "$Message[128]"; print ($frame?"\n":"   "); } + #if ($ShowMonthDayStats) { print ($frame?"   \"...\" ":""); print "$Message[130]\n"; print ($frame?"\n":"   "); } + if ($ShowDaysOfMonthStats) { print ($frame?"":""); print "$Message[138]"; print ($frame?"\n":"   "); } + if ($ShowDaysOfWeekStats) { print ($frame?"":""); print "$Message[91]"; print ($frame?"\n":"   "); } + if ($ShowHoursStats) { print ($frame?"":""); print "$Message[20]"; print ($frame?"\n":"   "); } if ($linetitle) { print ($frame?"":"\n"); } # Who $linetitle=&AtLeastOneNotNull($ShowDomainsStats,$ShowHostsStats,$ShowAuthenticatedUsers,$ShowEMailSenders,$ShowEMailReceivers,$ShowRobotsStats,$ShowWormsStats); - if ($linetitle) { print "".($menuicon?" ":"")."$Message[92]:\n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowDomainsStats) { print ($frame?"":""); print "$Message[148]"; print ($frame?"\n":"   "); } - if ($ShowDomainsStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } - if ($ShowHostsStats) { print ($frame?"":""); print "".ucfirst($Message[81]).""; print ($frame?"\n":"   "); } - if ($ShowHostsStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } - if ($ShowHostsStats =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } - if ($ShowHostsStats) { print ($frame?"   \"...\" ":""); print "$Message[45]\n"; print ($frame?"\n":"   "); } - if ($ShowAuthenticatedUsers) { print ($frame?"":""); print "$Message[94]"; print ($frame?"\n":"   "); } - if ($ShowAuthenticatedUsers) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } - if ($ShowAuthenticatedUsers =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } - if ($ShowEMailSenders) { print ($frame?"":""); print "$Message[131]"; print ($frame?"\n":"   "); } - if ($ShowEMailSenders) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } - if ($ShowEMailSenders =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } - if ($ShowEMailReceivers) { print ($frame?"":""); print "$Message[132]"; print ($frame?"\n":"   "); } - if ($ShowEMailReceivers) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } - if ($ShowEMailReceivers =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } - if ($ShowRobotsStats) { print ($frame?"":""); print "$Message[53]"; print ($frame?"\n":"   "); } - if ($ShowRobotsStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } - if ($ShowRobotsStats =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } -# if ($ShowWormsStats) { print ($frame?"":""); print "$Message[136]"; print ($frame?"\n":"   "); } -# if ($ShowWormsStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } -# if ($ShowWormsStats =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } + if ($linetitle) { print "".($menuicon?" ":"")."$Message[92]:\n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowDomainsStats) { print ($frame?"":""); print "$Message[148]"; print ($frame?"\n":"   "); } + if ($ShowDomainsStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } + if ($ShowHostsStats) { print ($frame?"":""); print "".ucfirst($Message[81]).""; print ($frame?"\n":"   "); } + if ($ShowHostsStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } + if ($ShowHostsStats =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } + if ($ShowHostsStats) { print ($frame?"   \"...\" ":""); print "$Message[45]\n"; print ($frame?"\n":"   "); } + if ($ShowAuthenticatedUsers) { print ($frame?"":""); print "$Message[94]"; print ($frame?"\n":"   "); } + if ($ShowAuthenticatedUsers) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } + if ($ShowAuthenticatedUsers =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } + if ($ShowEMailSenders) { print ($frame?"":""); print "$Message[131]"; print ($frame?"\n":"   "); } + if ($ShowEMailSenders) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } + if ($ShowEMailSenders =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } + if ($ShowEMailReceivers) { print ($frame?"":""); print "$Message[132]"; print ($frame?"\n":"   "); } + if ($ShowEMailReceivers) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } + if ($ShowEMailReceivers =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } + if ($ShowRobotsStats) { print ($frame?"":""); print "$Message[53]"; print ($frame?"\n":"   "); } + if ($ShowRobotsStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } + if ($ShowRobotsStats =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } +# if ($ShowWormsStats) { print ($frame?"":""); print "$Message[136]"; print ($frame?"\n":"   "); } +# if ($ShowWormsStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } +# if ($ShowWormsStats =~ /L/i) { print ($frame?"   \"...\" ":""); print "$Message[9]\n"; print ($frame?"\n":"   "); } if ($linetitle) { print ($frame?"":"\n"); } # Navigation $linetitle=&AtLeastOneNotNull($ShowSessionsStats,$ShowPagesStats,$ShowFileTypesStats,$ShowFileSizesStats,$ShowOSStats,$ShowBrowsersStats,$ShowScreenSizeStats); - if ($linetitle) { print "".($menuicon?" ":"")."$Message[72]:\n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowSessionsStats) { print ($frame?"":""); print "$Message[117]"; print ($frame?"\n":"   "); } - if ($ShowFileTypesStats) { print ($frame?"":""); print "$Message[73]"; print ($frame?"\n":"   "); } - if ($ShowPagesStats) { print ($frame?"":""); print "$Message[29]\n"; print ($frame?"\n":"   "); } - if ($ShowPagesStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } - if ($ShowPagesStats =~ /E/i) { print ($frame?"   \"...\" ":""); print "$Message[104]\n"; print ($frame?"\n":"   "); } - if ($ShowPagesStats =~ /X/i) { print ($frame?"   \"...\" ":""); print "$Message[116]\n"; print ($frame?"\n":"   "); } - if ($ShowOSStats) { print ($frame?"":""); print "$Message[59]"; print ($frame?"\n":"   "); } - if ($ShowOSStats) { print ($frame?"   \"...\" ":""); print "$Message[58]\n"; print ($frame?"\n":"   "); } - if ($ShowOSStats) { print ($frame?"   \"...\" ":""); print "$Message[0]\n"; print ($frame?"\n":"   "); } - if ($ShowBrowsersStats) { print ($frame?"":""); print "$Message[21]"; print ($frame?"\n":"   "); } - if ($ShowBrowsersStats) { print ($frame?"   \"...\" ":""); print "$Message[58]\n"; print ($frame?"\n":"   "); } - if ($ShowBrowsersStats) { print ($frame?"   \"...\" ":""); print "$Message[0]\n"; print ($frame?"\n":"   "); } - if ($ShowScreenSizeStats) { print ($frame?"":""); print "$Message[135]"; print ($frame?"\n":"   "); } + if ($linetitle) { print "".($menuicon?" ":"")."$Message[72]:\n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowSessionsStats) { print ($frame?"":""); print "$Message[117]"; print ($frame?"\n":"   "); } + if ($ShowFileTypesStats) { print ($frame?"":""); print "$Message[73]"; print ($frame?"\n":"   "); } + if ($ShowPagesStats) { print ($frame?"":""); print "$Message[29]\n"; print ($frame?"\n":"   "); } + if ($ShowPagesStats) { print ($frame?"   \"...\" ":""); print "$Message[80]\n"; print ($frame?"\n":"   "); } + if ($ShowPagesStats =~ /E/i) { print ($frame?"   \"...\" ":""); print "$Message[104]\n"; print ($frame?"\n":"   "); } + if ($ShowPagesStats =~ /X/i) { print ($frame?"   \"...\" ":""); print "$Message[116]\n"; print ($frame?"\n":"   "); } + if ($ShowOSStats) { print ($frame?"":""); print "$Message[59]"; print ($frame?"\n":"   "); } + if ($ShowOSStats) { print ($frame?"   \"...\" ":""); print "$Message[58]\n"; print ($frame?"\n":"   "); } + if ($ShowOSStats) { print ($frame?"   \"...\" ":""); print "$Message[0]\n"; print ($frame?"\n":"   "); } + if ($ShowBrowsersStats) { print ($frame?"":""); print "$Message[21]"; print ($frame?"\n":"   "); } + if ($ShowBrowsersStats) { print ($frame?"   \"...\" ":""); print "$Message[58]\n"; print ($frame?"\n":"   "); } + if ($ShowBrowsersStats) { print ($frame?"   \"...\" ":""); print "$Message[0]\n"; print ($frame?"\n":"   "); } + if ($ShowScreenSizeStats) { print ($frame?"":""); print "$Message[135]"; print ($frame?"\n":"   "); } if ($linetitle) { print ($frame?"":"\n"); } # Referers $linetitle=&AtLeastOneNotNull($ShowOriginStats,$ShowKeyphrasesStats,$ShowKeywordsStats); - if ($linetitle) { print "".($menuicon?" ":"")."$Message[23]:\n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowOriginStats) { print ($frame?"":""); print "$Message[37]\n"; print ($frame?"\n":"   "); } - if ($ShowOriginStats) { print ($frame?"   \"...\" ":""); print "$Message[126]\n"; print ($frame?"\n":"   "); } - if ($ShowOriginStats) { print ($frame?"   \"...\" ":""); print "$Message[127]\n"; print ($frame?"\n":"   "); } - if ($ShowKeyphrasesStats || $ShowKeywordsStats) { print ($frame?"":""); print "$Message[14]"; print ($frame?"\n":"   "); } - if ($ShowKeyphrasesStats) { print ($frame?"   \"...\" ":""); print "$Message[120]\n"; print ($frame?"\n":"   "); } - if ($ShowKeywordsStats) { print ($frame?"   \"...\" ":""); print "$Message[121]\n"; print ($frame?"\n":"   "); } + if ($linetitle) { print "".($menuicon?" ":"")."$Message[23]:\n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowOriginStats) { print ($frame?"":""); print "$Message[37]\n"; print ($frame?"\n":"   "); } + if ($ShowOriginStats) { print ($frame?"   \"...\" ":""); print "$Message[126]\n"; print ($frame?"\n":"   "); } + if ($ShowOriginStats) { print ($frame?"   \"...\" ":""); print "$Message[127]\n"; print ($frame?"\n":"   "); } + if ($ShowKeyphrasesStats || $ShowKeywordsStats) { print ($frame?"":""); print "$Message[14]"; print ($frame?"\n":"   "); } + if ($ShowKeyphrasesStats) { print ($frame?"   \"...\" ":""); print "$Message[120]\n"; print ($frame?"\n":"   "); } + if ($ShowKeywordsStats) { print ($frame?"   \"...\" ":""); print "$Message[121]\n"; print ($frame?"\n":"   "); } if ($linetitle) { print ($frame?"":"\n"); } # Others $linetitle=&AtLeastOneNotNull($ShowFileTypesStats=~/C/i,$ShowMiscStats,$ShowHTTPErrorsStats,$ShowSMTPErrorsStats,$ShowClusterStats); - if ($linetitle) { print "".($menuicon?" ":"")."$Message[2]:\n"; } - if ($linetitle) { print ($frame?"\n":""); } - if ($ShowFileTypesStats =~ /C/i) { print ($frame?"":""); print "$Message[98]"; print ($frame?"\n":"   "); } - if ($ShowMiscStats) { print ($frame?"":""); print "$Message[139]"; print ($frame?"\n":"   "); } - if ($ShowHTTPErrorsStats) { print ($frame?"":""); print "$Message[32]"; print ($frame?"\n":"   "); } + if ($linetitle) { print "".($menuicon?" ":"")."$Message[2]:\n"; } + if ($linetitle) { print ($frame?"\n":""); } + if ($ShowFileTypesStats =~ /C/i) { print ($frame?"":""); print "$Message[98]"; print ($frame?"\n":"   "); } + if ($ShowMiscStats) { print ($frame?"":""); print "$Message[139]"; print ($frame?"\n":"   "); } + if ($ShowHTTPErrorsStats) { print ($frame?"":""); print "$Message[32]"; print ($frame?"\n":"   "); } foreach (keys %TrapInfosForHTTPErrorCodes) { - if ($ShowHTTPErrorsStats) { print ($frame?"   \"...\" ":""); print "$Message[31]\n"; print ($frame?"\n":"   "); } + if ($ShowHTTPErrorsStats) { print ($frame?"   \"...\" ":""); print "$Message[31]\n"; print ($frame?"\n":"   "); } } - if ($ShowSMTPErrorsStats) { print ($frame?"":""); print "$Message[147]"; print ($frame?"\n":"   "); } - if ($ShowClusterStats) { print ($frame?"":""); print "$Message[155]"; print ($frame?"\n":"   "); } + if ($ShowSMTPErrorsStats) { print ($frame?"":""); print "$Message[147]"; print ($frame?"\n":"   "); } + if ($ShowClusterStats) { print ($frame?"":""); print "$Message[155]"; print ($frame?"\n":"   "); } if ($linetitle) { print ($frame?"":"\n"); } # Extra/Marketing $linetitle=&AtLeastOneNotNull(@ExtraStatTypes); - if ($linetitle) { print "$Message[134]:\n"; } - if ($linetitle) { print ($frame?"\n":""); } + if ($linetitle) { print "$Message[134]:\n"; } + if ($linetitle) { print ($frame?"\n":""); } foreach (1..@ExtraName-1) { - print ($frame?"":""); print "$ExtraName[$_]\n"; print ($frame?"\n":"   "); + print ($frame?"":""); print "$ExtraName[$_]\n"; print ($frame?"\n":"   "); } if ($linetitle) { print ($frame?"":"\n"); } print "\n"; @@ -8544,6 +8545,13 @@ if (scalar keys %HTMLOutput) { $valdata[$xx++]=$avg_dayofweek_p[$_]||0; $valdata[$xx++]=$avg_dayofweek_h[$_]||0; $valdata[$xx++]=$avg_dayofweek_k[$_]||0; + # Round to be ready to show array + $avg_dayofweek_p[$_]=sprintf("%.2f",$avg_dayofweek_p[$_]); + $avg_dayofweek_h[$_]=sprintf("%.2f",$avg_dayofweek_h[$_]); + $avg_dayofweek_k[$_]=sprintf("%.2f",$avg_dayofweek_k[$_]); + # Remove decimal part that are .0 + if ($avg_dayofweek_p[$_] == int($avg_dayofweek_p[$_])) { $avg_dayofweek_p[$_]=int($avg_dayofweek_p[$_]); } + if ($avg_dayofweek_h[$_] == int($avg_dayofweek_h[$_])) { $avg_dayofweek_h[$_]=int($avg_dayofweek_h[$_]); } } ShowGraph_graphapplet("$title","daysofweek",$ShowDaysOfWeekStats,\@blocklabel,\@vallabel,\@valcolor,\@valmax,\@valtotal,\@valaverage,\@valdata); } @@ -8558,7 +8566,7 @@ if (scalar keys %HTMLOutput) { $avg_dayofweek_p[$_]=sprintf("%.2f",$avg_dayofweek_p[$_]); $avg_dayofweek_h[$_]=sprintf("%.2f",$avg_dayofweek_h[$_]); $avg_dayofweek_k[$_]=sprintf("%.2f",$avg_dayofweek_k[$_]); - # Remove decimal part if 0 + # Remove decimal part that are .0 if ($avg_dayofweek_p[$_] == int($avg_dayofweek_p[$_])) { $avg_dayofweek_p[$_]=int($avg_dayofweek_p[$_]); } if ($avg_dayofweek_h[$_] == int($avg_dayofweek_h[$_])) { $avg_dayofweek_h[$_]=int($avg_dayofweek_h[$_]); } print ""; diff --git a/wwwroot/css/awstats_bw.css b/wwwroot/css/awstats_bw.css index 81a64022..69188795 100644 --- a/wwwroot/css/awstats_bw.css +++ b/wwwroot/css/awstats_bw.css @@ -20,7 +20,8 @@ body { font: 11px verdana, arial, helvetica, sans-serif; background-color: #FFFF th { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font: 11px verdana, arial, helvetica, sans-serif; text-align:center; color: #000000; } th.aws { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font-size: 13px; font-weight: bold; } td { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font: 11px verdana, arial, helvetica, sans-serif; text-align:center; color: #000000; } -.aws { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font: 11px verdana, arial, helvetica, sans-serif; text-align:left; color: #000000; } +td.aws { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font: 11px verdana, arial, helvetica, sans-serif; text-align:left; color: #000000; } +td.awsm { border-left-width: 0px; border-right-width: 0px; border-top-width: 0px; border-bottom-width: 0px; padding: 0px 0px 0px 0px; font: 11px verdana, arial, helvetica, sans-serif; color: #000000; } b { font-weight: bold; } a { font: 11px verdana, arial, helvetica, sans-serif; } a:link { color: #001133; text-decoration: none; } diff --git a/wwwroot/css/awstats_default.css b/wwwroot/css/awstats_default.css index 3db0f3e9..8f87edc9 100644 --- a/wwwroot/css/awstats_default.css +++ b/wwwroot/css/awstats_default.css @@ -20,7 +20,8 @@ body { font: 11px verdana, arial, helvetica, sans-serif; background-color: #FFFF th { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font: 11px verdana, arial, helvetica, sans-serif; text-align:center; color: #000000; } th.aws { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font-size: 13px; font-weight: bold; } td { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font: 11px verdana, arial, helvetica, sans-serif; text-align:center; color: #000000; } -.aws { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font: 11px verdana, arial, helvetica, sans-serif; text-align:left; color: #000000; } +td.aws { border-color: #ECECEC; border-left-width: 0px; border-right-width: 1px; border-top-width: 0px; border-bottom-width: 0px; padding: 2px 2px 2px 2px; font: 11px verdana, arial, helvetica, sans-serif; text-align:left; color: #000000; } +td.awsm { border-left-width: 0px; border-right-width: 0px; border-top-width: 0px; border-bottom-width: 0px; padding: 0px 0px 0px 0px; font: 11px verdana, arial, helvetica, sans-serif; color: #000000; } b { font-weight: bold; } a { font: 11px verdana, arial, helvetica, sans-serif; } a:link { color: #0011BB; text-decoration: none; }