Qt Metrics 2 (v0.22): Navigation to testfunctions page

The testset testfunctions page is linked on testset
page, testset project page and build project page.
Page breadcrumb modified. Site map updated.

Change-Id: I024bfe9674f160c87da130af339207dc51ccd7f6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>

7 files changed, 17 insertions, 14 deletions

diff --git a/non-puppet/qtmetrics2/images/site_map.png b/non-puppet/qtmetrics2/images/site_map.png
index daa3a31..d38f835 100644
--- a/non-puppet/qtmetrics2/images/site_map.png
+++ b/non-puppet/qtmetrics2/images/site_map.png
diff --git a/non-puppet/qtmetrics2/images/site_map.xml b/non-puppet/qtmetrics2/images/site_map.xml
new file mode 100644
index 0000000..f6183ab
--- /dev/null
+++ b/non-puppet/qtmetrics2/images/site_map.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mxGraphModel dx="1434" dy="856" grid="0" gridSize="10" guides="1" tooltips="1" connect="0" fold="1" page="1" pageScale="1.5" pageWidth="826" pageHeight="1169" background="none" style="default-style2" math="0"><root><mxCell id="0" style=";html=1;"/><mxCell id="1" style=";html=1;" parent="0"/><mxCell id="141" value="" style="whiteSpace=wrap;html=1;labelBorderColor=none;labelBackgroundColor=none;fontColor=#999999;strokeColor=#999999;fillColor=none;" vertex="1" parent="1"><mxGeometry x="166" y="628" width="108" height="78" as="geometry"/></mxCell><mxCell id="66" value="Home" style="rounded=1;whiteSpace=wrap;html=1;blue;arcSize=14;fontSize=12;fontStyle=1" parent="1" vertex="1"><mxGeometry x="541" y="162" width="120" height="60" as="geometry"/></mxCell><mxCell id="68" value="Overview" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" parent="1" vertex="1"><mxGeometry x="422" y="283" width="120" height="60" as="geometry"/></mxCell><mxCell id="72" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="66" target="68" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="349" y="583" as="sourcePoint"/><mxPoint x="388" y="271" as="targetPoint"/><Array as="points"><mxPoint x="482" y="204"/></Array></mxGeometry></mxCell><mxCell id="73" value="&amp;nbsp;Qt5 state&amp;nbsp;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#0066CC;fontSize=12;fontColor=#FFFFFF;labelBorderColor=#0066CC;" parent="72" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="-27" y="33" as="offset"/></mxGeometry></mxCell><mxCell id="75" value="Testset Project&lt;div&gt;&lt;span style=&quot;font-weight: normal&quot;&gt;e.g. QtBase&lt;/span&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" parent="1" vertex="1"><mxGeometry x="541" y="411" width="120" height="60" as="geometry"/></mxCell><mxCell id="76" value="Platform&lt;div&gt;&lt;span style=&quot;font-weight: normal&quot;&gt;Qt5&lt;/span&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" parent="1" vertex="1"><mxGeometry x="166" y="283" width="120" height="60" as="geometry"/></mxCell><mxCell id="78" value="Testset&lt;div&gt;&lt;span style=&quot;font-weight: normal&quot;&gt;(configurations)&lt;/span&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" parent="1" vertex="1"><mxGeometry x="795" y="411" width="120" height="60" as="geometry"/></mxCell><mxCell id="79" value="Top Failures" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" parent="1" vertex="1"><mxGeometry x="675" y="283" width="120" height="60" as="geometry"/></mxCell><mxCell id="80" value="Flaky Testsets" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" parent="1" vertex="1"><mxGeometry x="915" y="283" width="120" height="60" as="geometry"/></mxCell><mxCell id="81" value="Build Project&lt;div&gt;&lt;span style=&quot;font-weight: normal&quot;&gt;Qt5&lt;/span&gt;&amp;nbsp;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" parent="1" vertex="1"><mxGeometry x="298" y="411" width="120" height="60" as="geometry"/></mxCell><mxCell id="82" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="66" target="76" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="389" y="168.304347826087" as="sourcePoint"/><mxPoint x="334.5652173913045" y="260" as="targetPoint"/><Array as="points"><mxPoint x="226" y="180"/></Array></mxGeometry></mxCell><mxCell id="83" value="&amp;nbsp;e.g. linux&amp;nbsp;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#0066CC;fontSize=12;fontColor=#FFFFFF;labelBorderColor=#0066CC;" parent="82" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="-215" y="56" as="offset"/></mxGeometry></mxCell><mxCell id="88" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="81" target="76" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="389" y="538" as="sourcePoint"/><mxPoint x="98" y="641" as="targetPoint"/><Array as="points"><mxPoint x="252" y="441"/></Array></mxGeometry></mxCell><mxCell id="89" value="&amp;nbsp;e.g. linux&amp;nbsp;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#0066CC;fontSize=12;fontColor=#FFFFFF;labelBorderColor=#0066CC;rotation=0;spacingLeft=0;spacingBottom=0;spacingRight=0;spacingTop=0;spacing=2;" parent="88" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="-12" y="-51" as="offset"/></mxGeometry></mxCell><mxCell id="90" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="68" target="81" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="407" y="257" as="sourcePoint"/><mxPoint x="353" y="336" as="targetPoint"/><Array as="points"><mxPoint x="455" y="374"/><mxPoint x="358" y="374"/></Array></mxGeometry></mxCell><mxCell id="91" value="Qt5" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=none;fontSize=12;fontColor=#0066CC;" parent="90" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="-61" y="-21" as="offset"/></mxGeometry></mxCell><mxCell id="92" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="68" target="75" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="559" y="351" as="sourcePoint"/><mxPoint x="457" y="419" as="targetPoint"/><Array as="points"><mxPoint x="508" y="374"/><mxPoint x="578" y="374"/></Array></mxGeometry></mxCell><mxCell id="93" value="e.g. QtBase" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=none;fontSize=12;fontColor=#0066CC;" parent="92" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="41" y="-12" as="offset"/></mxGeometry></mxCell><mxCell id="94" value="Configuration&lt;div&gt;&lt;span style=&quot;font-weight: normal&quot;&gt;for build project&lt;/span&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" parent="1" vertex="1"><mxGeometry x="298" y="530" width="120" height="60" as="geometry"/></mxCell><mxCell id="95" value="Configuration&lt;div&gt;&lt;span style=&quot;font-weight: normal&quot;&gt;for testset project&lt;/span&gt;&lt;/div&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" parent="1" vertex="1"><mxGeometry x="541" y="530" width="120" height="60" as="geometry"/></mxCell><mxCell id="96" value="" style="endArrow=classic;html=1;fontSize=12;" parent="1" source="81" target="94" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="437" y="442" as="sourcePoint"/><mxPoint x="437" y="500" as="targetPoint"/></mxGeometry></mxCell><mxCell id="100" value="" style="endArrow=classic;html=1;fontSize=12;" parent="1" source="75" target="95" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="722" y="496" as="sourcePoint"/><mxPoint x="772" y="446" as="targetPoint"/></mxGeometry></mxCell><mxCell id="101" value="configuration" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;fontSize=12;fontColor=#0066CC;" parent="1" vertex="1"><mxGeometry x="366" y="478" width="81" height="20" as="geometry"/></mxCell><mxCell id="102" value="configuration" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;fontSize=12;fontColor=#0066CC;" parent="1" vertex="1"><mxGeometry x="610" y="478" width="81" height="20" as="geometry"/></mxCell><mxCell id="103" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="95" target="75" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="724" y="558" as="sourcePoint"/><mxPoint x="774" y="508" as="targetPoint"/><Array as="points"><mxPoint x="731" y="560"/><mxPoint x="731" y="453"/></Array></mxGeometry></mxCell><mxCell id="104" value="project" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;fontSize=12;fontColor=#0066CC;" parent="1" vertex="1"><mxGeometry x="670" y="537" width="56" height="20" as="geometry"/></mxCell><mxCell id="106" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="95" target="135" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="757" y="636" as="sourcePoint"/><mxPoint x="807" y="586" as="targetPoint"/><Array as="points"><mxPoint x="601" y="619"/><mxPoint x="744" y="619"/><mxPoint x="744" y="546"/></Array></mxGeometry></mxCell><mxCell id="107" value="testset" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;fontSize=12;fontColor=#0066CC;" parent="1" vertex="1"><mxGeometry x="607" y="595" width="56" height="20" as="geometry"/></mxCell><mxCell id="108" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="94" target="75" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="437" y="661" as="sourcePoint"/><mxPoint x="437" y="554" as="targetPoint"/><Array as="points"><mxPoint x="490" y="560"/><mxPoint x="490" y="441"/></Array></mxGeometry></mxCell><mxCell id="109" value="project" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;fontSize=12;fontColor=#0066CC;" parent="1" vertex="1"><mxGeometry x="426" y="537" width="56" height="20" as="geometry"/></mxCell><mxCell id="110" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="94" target="135" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="659" y="627" as="sourcePoint"/><mxPoint x="793" y="498" as="targetPoint"/><Array as="points"><mxPoint x="358" y="638"/><mxPoint x="757" y="638"/><mxPoint x="757" y="565"/></Array></mxGeometry></mxCell><mxCell id="111" value="testset" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;fontSize=12;fontColor=#0066CC;" parent="1" vertex="1"><mxGeometry x="364" y="595" width="56" height="20" as="geometry"/></mxCell><mxCell id="112" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="78" target="75" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="809" y="570" as="sourcePoint"/><mxPoint x="859" y="520" as="targetPoint"/><Array as="points"><mxPoint x="731" y="434"/><mxPoint x="731" y="434"/></Array></mxGeometry></mxCell><mxCell id="113" value="project" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;fontSize=12;fontColor=#0066CC;" parent="1" vertex="1"><mxGeometry x="735" y="401" width="56" height="20" as="geometry"/></mxCell><mxCell id="114" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="78" target="135" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="820" y="617" as="sourcePoint"/><mxPoint x="850" y="561" as="targetPoint"/><Array as="points"/></mxGeometry></mxCell><mxCell id="115" value="configuration" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;fontSize=12;fontColor=#0066CC;" parent="1" vertex="1"><mxGeometry x="866" y="478" width="81" height="20" as="geometry"/></mxCell><mxCell id="116" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="66" target="79" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="804" y="162" as="sourcePoint"/><mxPoint x="745" y="241" as="targetPoint"/><Array as="points"><mxPoint x="735" y="204"/></Array></mxGeometry></mxCell><mxCell id="118" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="66" target="80" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="807" y="170" as="sourcePoint"/><mxPoint x="881" y="249" as="targetPoint"/><Array as="points"><mxPoint x="975" y="181"/></Array></mxGeometry></mxCell><mxCell id="119" value="&amp;nbsp;top failures&amp;nbsp;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#0066CC;fontSize=12;fontColor=#FFFFFF;labelBorderColor=#0066CC;" parent="118" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="-28" y="63" as="offset"/></mxGeometry></mxCell><mxCell id="121" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="79" target="78" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="791" y="251" as="sourcePoint"/><mxPoint x="865" y="330" as="targetPoint"/><Array as="points"><mxPoint x="823" y="313"/></Array></mxGeometry></mxCell><mxCell id="122" value="&lt;span style=&quot;line-height: 14.3999996185303px&quot;&gt;testset&lt;/span&gt;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=none;fontSize=12;fontColor=#0066CC;" parent="121" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="-7" y="-18" as="offset"/></mxGeometry></mxCell><mxCell id="123" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="80" target="78" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="855" y="313" as="sourcePoint"/><mxPoint x="886" y="411" as="targetPoint"/><Array as="points"><mxPoint x="886" y="313"/></Array></mxGeometry></mxCell><mxCell id="124" value="&lt;span style=&quot;line-height: 14.3999996185303px&quot;&gt;testset&lt;/span&gt;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=none;fontSize=12;fontStyle=0;fontColor=#0066CC;" parent="123" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="2" y="-18" as="offset"/></mxGeometry></mxCell><mxCell id="125" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="76" target="94" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="240" y="498" as="sourcePoint"/><mxPoint x="194" y="400" as="targetPoint"/><Array as="points"><mxPoint x="204" y="560"/></Array></mxGeometry></mxCell><mxCell id="126" value="configuration" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=none;fontSize=12;fontColor=#0066CC;" parent="125" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="43" y="70" as="offset"/></mxGeometry></mxCell><mxCell id="127" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="66" target="75" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="572" y="333" as="sourcePoint"/><mxPoint x="642" y="401" as="targetPoint"/><Array as="points"><mxPoint x="601" y="314"/><mxPoint x="628" y="314"/></Array></mxGeometry></mxCell><mxCell id="128" value="&amp;nbsp;project name...&amp;nbsp;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=12;labelBorderColor=#999999;fontColor=#999999;" parent="127" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="-5" y="-34" as="offset"/></mxGeometry></mxCell><mxCell id="129" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" parent="1" source="66" target="78" edge="1"><mxGeometry width="50" height="50" relative="1" as="geometry"><mxPoint x="808" y="62" as="sourcePoint"/><mxPoint x="836" y="160" as="targetPoint"/><Array as="points"><mxPoint x="855" y="192"/></Array></mxGeometry></mxCell><mxCell id="130" value="&lt;span style=&quot;line-height: 14.3999996185303px&quot;&gt;&amp;nbsp;testset name...&amp;nbsp;&lt;/span&gt;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=12;labelBorderColor=#999999;fontColor=#999999;" parent="129" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="93" y="52" as="offset"/></mxGeometry></mxCell><mxCell id="131" value="&amp;nbsp;button&amp;nbsp;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#0066CC;fontSize=12;fontColor=#FFFFFF;labelBorderColor=#0066CC;" parent="1" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="221" y="648" as="offset"/></mxGeometry></mxCell><mxCell id="132" value="&amp;nbsp;selection list&amp;nbsp;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=12;labelBorderColor=#999999;fontColor=#999999;" parent="1" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="221" y="670" as="offset"/></mxGeometry></mxCell><mxCell id="133" value="&lt;span style=&quot;line-height: 14.3999996185303px&quot;&gt;link&lt;/span&gt;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=none;fontSize=12;fontStyle=0;fontColor=#0066CC;" parent="1" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="221" y="689" as="offset"/></mxGeometry></mxCell><mxCell id="134" value="&lt;span style=&quot;line-height: 14.3999996185303px&quot;&gt;&amp;nbsp;flaky testsets&amp;nbsp;&lt;/span&gt;" style="text;html=1;resizable=0;;align=center;verticalAlign=middle;labelBackgroundColor=#0066CC;fontSize=12;fontColor=#FFFFFF;labelBorderColor=#0066CC;" parent="1" connectable="0" vertex="1"><mxGeometry x="-0.5163" y="4" relative="1" as="geometry"><mxPoint x="974" y="240" as="offset"/></mxGeometry></mxCell><mxCell id="135" value="&lt;div&gt;Testset&lt;/div&gt;&lt;span style=&quot;font-weight: normal&quot;&gt;(testfunctions)&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" vertex="1" parent="1"><mxGeometry x="795" y="527" width="120" height="60" as="geometry"/></mxCell><mxCell id="136" value="&lt;div&gt;Testfunction&lt;/div&gt;&lt;span style=&quot;font-weight: normal&quot;&gt;(testrows)&lt;/span&gt;" style="rounded=1;whiteSpace=wrap;html=1;fontSize=12;blue;fontStyle=1" vertex="1" parent="1"><mxGeometry x="795" y="643" width="120" height="60" as="geometry"/></mxCell><mxCell id="139" value="" style="edgeStyle=segmentEdgeStyle;endArrow=classic;html=1;fontSize=12;" edge="1" parent="1" source="135" target="136"><mxGeometry x="865" y="481" width="50" height="50" as="geometry"><mxPoint x="865" y="481" as="sourcePoint"/><mxPoint x="732" y="696" as="targetPoint"/><Array as="points"><mxPoint x="855" y="615"/><mxPoint x="855" y="615"/></Array></mxGeometry></mxCell><mxCell id="140" value="testfunction" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;overflow=hidden;fontSize=12;fontColor=#0066CC;" vertex="1" parent="1"><mxGeometry x="861" y="595" width="81" height="20" as="geometry"/></mxCell></root></mxGraphModel>
diff --git a/non-puppet/qtmetrics2/index.php b/non-puppet/qtmetrics2/index.php
index 10a4856..545d0e6 100644
--- a/non-puppet/qtmetrics2/index.php
+++ b/non-puppet/qtmetrics2/index.php
@@ -259,12 +259,12 @@ $app->get('/conf/:conf', function($conf) use($app)
         array('name' => 'overview', 'link' => Slim\Slim::getInstance()->urlFor('overview')),
         array('name' => $ini['master_build_project'], 'link' => $buildProjectRoute)
     );
-    $testsetRoute = str_replace('/:testset/:project', '', Slim\Slim::getInstance()->urlFor('testset'));
+    $testsetTestfunctionsRoute = str_replace('/:testset/:project/:conf', '', Slim\Slim::getInstance()->urlFor('testset_testfunctions'));
     $testsetProjectRoute = str_replace('/:project', '', Slim\Slim::getInstance()->urlFor('testsetproject'));
     $app->render('conf.html', array(
         'root' => Slim\Slim::getInstance()->urlFor('root'),
         'breadcrumb' => $breadcrumb,
-        'testsetRoute' => $testsetRoute,
+        'testsetTestfunctionsRoute' => $testsetTestfunctionsRoute,
         'testsetProjectRoute' => $testsetProjectRoute,
         'refreshed' => Factory::db()->getDbRefreshed() . ' (GMT)',
         'masterProject' => $ini['master_build_project'],
@@ -309,11 +309,11 @@ $app->get('/conf/:conf/:testsetproject', function($conf, $testsetProject) use($a
         array('name' => 'overview', 'link' => Slim\Slim::getInstance()->urlFor('overview')),
         array('name' => $testsetProject, 'link' => $testsetProjectRoute . '/' . $testsetProject)
     );
-    $testsetRoute = str_replace('/:testset/:project', '', Slim\Slim::getInstance()->urlFor('testset'));
+    $testsetTestfunctionsRoute = str_replace('/:testset/:project/:conf', '', Slim\Slim::getInstance()->urlFor('testset_testfunctions'));
     $app->render('conf.html', array(
         'root' => Slim\Slim::getInstance()->urlFor('root'),
         'breadcrumb' => $breadcrumb,
-        'testsetRoute' => $testsetRoute,
+        'testsetTestfunctionsRoute' => $testsetTestfunctionsRoute,
         'testsetProjectRoute' => $testsetProjectRoute,
         'refreshed' => Factory::db()->getDbRefreshed() . ' (GMT)',
         'masterProject' => $ini['master_build_project'],
@@ -431,12 +431,12 @@ $app->get('/testset/:testset/:project', function($testset, $project) use($app)
         $breadcrumb = array(
             array('name' => 'home', 'link' => Slim\Slim::getInstance()->urlFor('root'))
         );
-        $confProjectRoute = str_replace('/:conf/:testsetproject', '', Slim\Slim::getInstance()->urlFor('conf_testsetproject'));
+        $testsetTestfunctionsRoute = str_replace('/:testset/:project/:conf', '', Slim\Slim::getInstance()->urlFor('testset_testfunctions'));
         $testsetProjectRoute = str_replace('/:project', '', Slim\Slim::getInstance()->urlFor('testsetproject'));
         $app->render('testset.html', array(
             'root' => Slim\Slim::getInstance()->urlFor('root'),
             'breadcrumb' => $breadcrumb,
-            'confProjectRoute' => $confProjectRoute,
+            'testsetTestfunctionsRoute' => $testsetTestfunctionsRoute,
             'testsetProjectRoute' => $testsetProjectRoute,
             'refreshed' => Factory::db()->getDbRefreshed() . ' (GMT)',
             'lastDaysFailures' => $ini['top_failures_last_days'],
@@ -486,8 +486,7 @@ $app->get('/testset/:testset/:project/:conf', function($testset, $project, $conf
             array('name' => 'home', 'link' => Slim\Slim::getInstance()->urlFor('root')),
             array('name' => 'overview', 'link' => Slim\Slim::getInstance()->urlFor('overview')),
             array('name' => $project, 'link' => $testsetProjectRoute . '/' . $project),
-            array('name' => $conf, 'link' => $confProjectRoute . '/' . urlencode($conf) . '/' . $project),
-            array('name' => $testset, 'link' => $testsetRoute . '/' . $testset. '/' . $project)
+            array('name' => $conf, 'link' => $confProjectRoute . '/' . urlencode($conf) . '/' . $project)
         );
         $confProjectRoute = str_replace('/:conf/:testsetproject', '', Slim\Slim::getInstance()->urlFor('conf_testsetproject'));
         $testfunctionRoute = 'testfunction';                // TODO: Replace later with $testfunctionRoute = str_replace('/:testfunction', '', Slim\Slim::getInstance()->urlFor('testfunction'));
diff --git a/non-puppet/qtmetrics2/templates/about.html b/non-puppet/qtmetrics2/templates/about.html
index 9eb5d0e..7c37008 100644
--- a/non-puppet/qtmetrics2/templates/about.html
+++ b/non-puppet/qtmetrics2/templates/about.html
@@ -34,7 +34,7 @@
 
 /**
  * About window content
- * @since     08-09-2015
+ * @since     09-09-2015
  * @author    Juha Sippola
  */
 
@@ -43,4 +43,4 @@
 <p>This is Qt Metrics revision 2 with redesigned UI and database.</p>
 <p>These pages are still <strong>under construction</strong> and therefore the views and functionality is limited.</p>
 <p>See the <a href="https://wiki.qt.io/Qt_Metrics_2_Backlog" target="_blank">backlog</a> for development items currently identified or in progress.</p>
-<p><small>Version 0.21 (8-Sep-2015)</small></p>
+<p><small>Version 0.22 (9-Sep-2015)</small></p>
diff --git a/non-puppet/qtmetrics2/templates/conf.html b/non-puppet/qtmetrics2/templates/conf.html
index cf96dd8..4d35ac2 100644
--- a/non-puppet/qtmetrics2/templates/conf.html
+++ b/non-puppet/qtmetrics2/templates/conf.html
@@ -499,8 +499,10 @@ title="<table>
 {%                      endif %}
 <tr>
 {# Testset and project name #}
-<td><a href="{{ testsetRoute }}/{{ run.getName|url_encode }}/{{ run.getTestsetProjectName|url_encode }}"><small>{{ run.getName }}</small></a></td>
-<td><a href="{{ testsetProjectRoute }}/{{ run.getTestsetProjectName|url_encode }}"><small>{{ run.getTestsetProjectName }}</small></a></td>
+{%                      set link = testsetTestfunctionsRoute ~ '/' ~ run.getName|url_encode ~ '/' ~ run.getTestsetProjectName|url_encode ~ '/' ~ run.getConfName|url_encode %}
+<td><a href="{{ link }}"><small>{{ run.getName }}</small></a></td>
+{%                      set link = testsetProjectRoute ~ '/' ~ run.getTestsetProjectName|url_encode %}
+<td><a href="{{ link }}"><small>{{ run.getTestsetProjectName }}</small></a></td>
 {# Flags for the latest build #}
 <td class="center rightBorder">
 {%                      if run.getInsignificant %}
diff --git a/non-puppet/qtmetrics2/templates/testset.html b/non-puppet/qtmetrics2/templates/testset.html
index 932846b..f7aba31 100644
--- a/non-puppet/qtmetrics2/templates/testset.html
+++ b/non-puppet/qtmetrics2/templates/testset.html
@@ -292,7 +292,7 @@ and their configuration on <strong>{{ masterProject }} {{ masterState }}</strong
 </tr>
 {%                      endif %}
 <tr>
-{%                      set link = confProjectRoute ~ '/' ~ run.getConfName|url_encode ~ '/' ~ testset.getProjectName|url_encode %}
+{%                      set link = testsetTestfunctionsRoute ~ '/' ~ run.getName|url_encode ~ '/' ~ run.getTestsetProjectName|url_encode ~ '/' ~ run.getConfName|url_encode %}
 <td class="rightBorder"><a href="{{ link }}"><small>{{ run.getConfName }}</small></a></td>
 {# Flags for the latest build #}
 <td class="center rightBorder">
diff --git a/non-puppet/qtmetrics2/templates/testset_testfunctions.html b/non-puppet/qtmetrics2/templates/testset_testfunctions.html
index 6f6317c..11bc50f 100644
--- a/non-puppet/qtmetrics2/templates/testset_testfunctions.html
+++ b/non-puppet/qtmetrics2/templates/testset_testfunctions.html
@@ -64,7 +64,7 @@
 {% for link in breadcrumb %}
 <li><a href="{{ link.link }}">{{ link.name }}</a></li>
 {% endfor %}
-<li class="active">testfunctions</li>
+<li class="active">{{ testset.getName }}</li>
 </ol>
 
 <div class="container-fluid">