From 10369c9b5e4f4e6aaec8377757161e0347950de0 Mon Sep 17 00:00:00 2001 From: Peter Hedenskog Date: Wed, 8 Aug 2012 16:57:53 +0200 Subject: [PATCH] html cleanup --- report/velocity/footer.vm | 6 +- report/velocity/header.vm | 33 ++++--- report/velocity/page.vm | 26 ++---- report/velocity/pages.vm | 6 +- report/velocity/summary.logic.vm | 102 ++++++++++++++++++++++ report/velocity/summary.vm | 143 ++++++++++++++----------------- 6 files changed, 196 insertions(+), 120 deletions(-) create mode 100644 report/velocity/summary.logic.vm diff --git a/report/velocity/footer.vm b/report/velocity/footer.vm index 61c656b86..0c7ae02e8 100644 --- a/report/velocity/footer.vm +++ b/report/velocity/footer.vm @@ -1,7 +1,5 @@ - -
- - - diff --git a/report/velocity/header.vm b/report/velocity/header.vm index ed150d8be..0be8076cf 100644 --- a/report/velocity/header.vm +++ b/report/velocity/header.vm @@ -2,32 +2,40 @@ - $document.getRootElement().getAttribute("host").getValue() + + #if($!{document.getRootElement().getAttribute("host")}) + $document.getRootElement().getAttribute("host").getValue() - + #end + $pageTitle + - - - - + + + - +
-
-
-
diff --git a/report/velocity/page.vm b/report/velocity/page.vm index 1c65df149..4e6b7ccc0 100644 --- a/report/velocity/page.vm +++ b/report/velocity/page.vm @@ -1,5 +1,7 @@ #parse("report/velocity/header.vm") +
+

Page $document.getRootElement().getChild("u").getValue()

@@ -59,12 +61,6 @@ size - - expires - - - gzip - @@ -87,26 +83,14 @@ $asset.getChild("size").getValue() - - #if($!{asset.getChild("expires")}) - $asset.getChild("expires").getValue() - #else - 0 - #end - - - #if($!{asset.getChild("gzip")}) - $asset.getChild("gzip").getValue() - #else - - #end - + #end - +
+
#parse("report/velocity/footer.vm") diff --git a/report/velocity/pages.vm b/report/velocity/pages.vm index 5c1fba6fb..2545a701d 100644 --- a/report/velocity/pages.vm +++ b/report/velocity/pages.vm @@ -1,6 +1,9 @@ #parse("report/velocity/header.vm") +
+
+

Pages ($document.getRootElement().getChildren().size()) - $document.getRootElement().getAttribute("url").getValue()

@@ -138,7 +141,8 @@ #end
- +
+
#parse("report/velocity/footer.vm") diff --git a/report/velocity/summary.logic.vm b/report/velocity/summary.logic.vm new file mode 100644 index 000000000..0a8568c9c --- /dev/null +++ b/report/velocity/summary.logic.vm @@ -0,0 +1,102 @@ +## Collecting data needed for the summary page + +#set($nrOfPages = $document.getRootElement().getChildren().size()) + + +## Get the total objects + +#set($nrOfDecimals = 0) +#set($nrOfJs = 0) +#set($nrOfCss = 0) +#set($nrOfCssImages = 0) +#set($nrOfImages = 0) +#set($nrOfTotalRequests = 0) +#set($nrOfTotalRequestsPrimedCache = 0) +#set($totalPageWeight = 0) +#set($totalLoadTime = 0) +#set($totalScore = 0) + +#foreach ($results in $document.getRootElement().getChildren()) + + #if($!{results.getChild("stats").getChild("js").getChild("r")}) + #set ($nrOfJs = $math.add($nrOfJs, $results.getChild("stats").getChild("js").getChild("r").getValue())) + #end + + #if($!{results.getChild("stats").getChild("css").getChild("r")}) + #set ($nrOfCss = $math.add($nrOfCss,$results.getChild("stats").getChild("css").getChild("r").getValue())) + #end + + #if($!{results.getChild("stats").getChild("cssimage").getChild("r")}) + #set ($nrOfCssImages = $math.add($nrOfCssImages, $results.getChild("stats").getChild("cssimage").getChild("r").getValue())) + #end + + #if($!{results.getChild("stats").getChild("image").getChild("r")}) + #set ($nrOfImages = $math.add($nrOfImages, $results.getChild("stats").getChild("image").getChild("r").getValue())) + #end + + #if($!{results.getChild("r")}) + #set ($nrOfTotalRequests = $math.add($nrOfTotalRequests, $results.getChild("r").getValue())) + #end + + #if($!{results.getChild("r_c")}) + #set ($nrOfTotalRequestsPrimedCache = $math.add($nrOfTotalRequestsPrimedCache, $results.getChild("r_c").getValue())) + #end + + #if($!{results.getChild("w")}) + #set ($totalPageWeight = $math.add($totalPageWeight, $results.getChild("w").getValue())) + #end + + #if($!{results.getChild("lt")}) + #set ($totalLoadTime = $math.add($totalLoadTime, $results.getChild("lt").getValue())) + #end + + #if($!{results.getChild("o")}) + #set ($totalScore = $math.add($totalScore, $results.getChild("o").getValue())) + #end +#end + +## Create averages +#set ($scoreAverage = $math.roundTo($nrOfDecimals,$math.div($totalScore,$nrOfPages))) +#set ($jsAverage = $math.roundTo($nrOfDecimals,$math.div($nrOfJs,$nrOfPages))) +#set ($requestAverage = $math.roundTo($nrOfDecimals,$math.div($nrOfTotalRequests,$nrOfPages))) +#set ($cssAverage = $math.roundTo($nrOfDecimals,$math.div($nrOfCss,$nrOfPages))) +#set ($cssImageAverage = $math.roundTo($nrOfDecimals,$math.div($nrOfCssImages,$nrOfPages))) +#set ($imageAverage = $math.roundTo($nrOfDecimals,$math.div($nrOfImages,$nrOfPages))) +#set ($requestPrimedAverage = $math.roundTo($nrOfDecimals,$math.div($nrOfTotalRequestsPrimedCache,$nrOfPages))) +#set ($pageWeightAverage = $math.roundTo($nrOfDecimals,$math.div($totalPageWeight,$nrOfPages))) +#set ($loadTimeAverage = $math.roundTo($nrOfDecimals,$math.div($totalLoadTime,$nrOfPages))) + +## Limits and messages, should be made cleaner + +#if ($scoreAverage>90) + #set ($scoreType = "success") +#elseif ($scoreAverage>80) + #set ($scoreType = "warning") +#else + #set ($scoreType = "error") +#end + +#if ($jsAverage<3) + #set ($jsType = "success") +#elseif ($jsAverage<5) + #set ($jsType = "warning") +#else + #set ($jsType = "error") +#end + +#if ($cssAverage==1) + #set ($cssType = "success") +#elseif ($cssAverage<3) + #set ($cssType = "warning") +#else + #set ($cssType = "error") +#end + +#if ($requestAverage<25) + #set ($requestType = "success") +#elseif ($requestAverage<50) + #set ($requestType = "warning") +#else + #set ($requestType = "error") +#end + diff --git a/report/velocity/summary.vm b/report/velocity/summary.vm index a99dfd683..17edb8428 100644 --- a/report/velocity/summary.vm +++ b/report/velocity/summary.vm @@ -1,78 +1,61 @@ #parse("report/velocity/header.vm") +#parse("report/velocity/summary.logic.vm") -

Executive summary for $document.getRootElement().getAttribute("url").getValue()

- +
+
+ +

$nrOfPages pages analyzed for $document.getRootElement().getAttribute("url").getValue()

- #set($nrOfPages = $document.getRootElement().getChildren().size()) - $nrOfPages pages has been analyzed - - #set($nrOfDecimals = 0) - #set($nrOfJs = 0) - #set($nrOfCss = 0) - #set($nrOfCssImages = 0) - #set($nrOfImages = 0) - #set($nrOfTotalRequests = 0) - #set($nrOfTotalRequestsPrimedCache = 0) - #set($totalPageWeight = 0) - #set($totalLoadTime = 0) - #set($totalScore = 0) - - #foreach ($results in $document.getRootElement().getChildren()) - - #if($!{results.getChild("stats").getChild("js").getChild("r")}) - #set ($nrOfJs = $math.add($nrOfJs, $results.getChild("stats").getChild("js").getChild("r").getValue())) - #end - - #if($!{results.getChild("stats").getChild("css").getChild("r")}) - #set ($nrOfCss = $math.add($nrOfCss,$results.getChild("stats").getChild("css").getChild("r").getValue())) - #end - - #if($!{results.getChild("stats").getChild("cssimage").getChild("r")}) - #set ($nrOfCssImages = $math.add($nrOfCssImages, $results.getChild("stats").getChild("cssimage").getChild("r").getValue())) - #end - - #if($!{results.getChild("stats").getChild("image").getChild("r")}) - #set ($nrOfImages = $math.add($nrOfImages, $results.getChild("stats").getChild("image").getChild("r").getValue())) - #end - - #if($!{results.getChild("r")}) - #set ($nrOfTotalRequests = $math.add($nrOfTotalRequests, $results.getChild("r").getValue())) - #end - - #if($!{results.getChild("r_c")}) - #set ($nrOfTotalRequestsPrimedCache = $math.add($nrOfTotalRequestsPrimedCache, $results.getChild("r_c").getValue())) - #end - - #if($!{results.getChild("w")}) - #set ($totalPageWeight = $math.add($totalPageWeight, $results.getChild("w").getValue())) - #end - - #if($!{results.getChild("lt")}) - #set ($totalLoadTime = $math.add($totalLoadTime, $results.getChild("lt").getValue())) - #end - - #if($!{results.getChild("o")}) - #set ($totalScore = $math.add($totalScore, $results.getChild("o").getValue())) - #end - - #end - - - #if ($totalScore>90) - #set ($scoreType = "success") - #set ($scoreMessage = "Executive summary: Your site has good WPO

$totalScore

") - #elseif ($totalScore>80) - #set ($scoreType = "warning") - #set ($scoreMessage = "Executive summary: You need to lock into your site performance

$totalScore

") - #else - #set ($scoreType = "error") - #set ($scoreMessage = "Executive summary: You need to improve perfomance for your site

$totalScore

") - #end - -
- $scoreMessage +
+
+
+ Average Yslow score is
$scoreAverage
+
+
+
+ Average number of requests
$requestAverage
+
+
+
+
+ Average number of js
$jsAverage
+
+
+
+
+ Average number of css
$cssAverage
+
+
+ +
+ +
+
+
+ Average number of css images
$cssImageAverage
+
+
+
+
+ Average number of images
$imageAverage
+
+
+
+
+ Average number of requests primed
$requestPrimedAverage
+
+
+
+
+ Average load time
$loadTimeAverage
+
+
+ +
+ + @@ -86,53 +69,55 @@ - + - + - + - + - + - + - + - + - +
JS $nrOfJs$math.roundTo($nrOfDecimals,$math.div($nrOfJs,$nrOfPages))$jsAverage
CSS $nrOfCss$math.roundTo($nrOfDecimals,$math.div($nrOfCss,$nrOfPages))$cssAverage
CSS images $nrOfCssImages$math.roundTo($nrOfDecimals,$math.div($nrOfCssImages,$nrOfPages))$cssImageAverage
Image $nrOfImages$math.roundTo($nrOfDecimals,$math.div($nrOfImages,$nrOfPages))$imageAverage
Requests $nrOfTotalRequests$math.roundTo($nrOfDecimals,$math.div($nrOfTotalRequests,$nrOfPages))$requestAverage
Requests primed cache $nrOfTotalRequestsPrimedCache$math.roundTo($nrOfDecimals,$math.div($nrOfTotalRequestsPrimedCache,$nrOfPages))$requestPrimedAverage
Page weight $totalPageWeight$math.roundTo($nrOfDecimals,$math.div($totalPageWeight,$nrOfPages))$pageWeightAverage
Load time $totalLoadTime$math.roundTo($nrOfDecimals,$math.div($totalLoadTime,$nrOfPages))$loadTimeAverage
Score $totalScore$math.roundTo($nrOfDecimals,$math.div($totalScore,$nrOfPages))$scoreAverage
+
+
#parse("report/velocity/footer.vm")