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>

4 files changed, 8 insertions, 6 deletions

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">