diff --git a/report/velocity/summary.logic.vm b/report/velocity/summary.logic.vm index 4972c8f6e..27995ffa9 100644 --- a/report/velocity/summary.logic.vm +++ b/report/velocity/summary.logic.vm @@ -13,6 +13,7 @@ #set($nrOfTotalRequests = 0) #set($nrOfTotalRequestsPrimedCache = 0) #set($totalPageWeight = 0) +#set($totalDocumentWeight = 0) #set($totalLoadTime = 0) #set($totalScore = 0) @@ -53,6 +54,11 @@ #if($!{results.getChild("o")}) #set ($totalScore = $math.add($totalScore, $results.getChild("o").getValue())) #end + + #if($!{results.getChild("stats").getChild("doc").getChild("w")}) + #set ($totalDocumentWeight = $math.add($totalDocumentWeight, $results.getChild("stats").getChild("doc").getChild("w").getValue())) + #end + #end ## Create averages @@ -64,6 +70,7 @@ #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 ($totalDocumentWeightAverage = $math.roundTo($nrOfDecimals,$math.div($totalDocumentWeight,$nrOfPages))) #set ($loadTimeAverage = $math.roundTo($nrOfDecimals,$math.div($totalLoadTime,$nrOfPages))) diff --git a/report/velocity/summary.vm b/report/velocity/summary.vm index b62aea8e6..a789a3d15 100644 --- a/report/velocity/summary.vm +++ b/report/velocity/summary.vm @@ -5,18 +5,33 @@
- -

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

+ +

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

+

Test performed: $document.getRootElement().getAttribute("date").getValue()

+ +
+
+
+ Average Yslow score
$scoreAverage
+
+ +
+
+
+ Average number of requests
$requestAverage
+
+
+
-
- Average Yslow score is
$scoreAverage
-
+
+ Total page weight (b)
$pageWeightAverage
+
-
- Average number of requests
$requestAverage
+
+ Document page weight (b)
$totalDocumentWeightAverage
@@ -44,20 +59,18 @@
-
+
Requests primed cache
$requestPrimedAverage
- Average load time
$loadTimeAverage
+ Average load time (ms)
$loadTimeAverage
- -