From 0d72f6b9876e1519d790bbe62e5d3ef4d9ccccf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= <gael.metais@gmail.com>
Date: Thu, 29 Dec 2016 18:57:03 +0800
Subject: [PATCH] Fix remaining issues with subfolder hosting

---
 front/src/views/dashboard.html          | 4 ++--
 front/src/views/rule.html               | 8 ++++----
 lib/server/controllers/apiController.js | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/front/src/views/dashboard.html b/front/src/views/dashboard.html
index ba8346e..da8b25a 100644
--- a/front/src/views/dashboard.html
+++ b/front/src/views/dashboard.html
@@ -17,7 +17,7 @@
             </div>
         </div>
         <div>
-            <a href="/result/{{result.runId}}/screenshot">
+            <a href="result/{{result.runId}}/screenshot">
                 <div class="screenshotWrapper" ng-class="result.params.options.device || 'desktop'">
                     <div>
                         <img ng-if="result.screenshotUrl" class="screenshotImage" ng-src="{{result.screenshotUrl}}"/>
@@ -36,7 +36,7 @@
             <div class="criteria">
                 <div class="table" title="Click to see details">
                     <a ng-repeat="ruleName in category.rules" ng-if="result.rules[ruleName]" ng-init="rule = result.rules[ruleName]"
-                         ng-class="{'warning': rule.abnormal}" href="/result/{{runId}}/rule/{{ruleName}}">
+                         ng-class="{'warning': rule.abnormal}" href="result/{{runId}}/rule/{{ruleName}}">
                         <div class="grade">
                             <grade score="rule.score"></grade>
                         </div>
diff --git a/front/src/views/rule.html b/front/src/views/rule.html
index c71f58c..1291d43 100644
--- a/front/src/views/rule.html
+++ b/front/src/views/rule.html
@@ -374,22 +374,22 @@
 
     <div ng-if="policyName === 'DOMaccesses'">
         <h3>{{rule.value}} offenders</h3>
-        Please open the <a href="/result/{{runId}}/timeline">JS timeline</a>
+        Please open the <a href="result/{{runId}}/timeline">JS timeline</a>
     </div>
 
     <div ng-if="policyName === 'queriesWithoutResults'">
         <h3>{{rule.value}} offenders</h3>
-        Please open the <a href="/result/{{runId}}/timeline#filter=queryWithoutResults">JS timeline, filtered by "Queries without results"</a>
+        Please open the <a href="result/{{runId}}/timeline#filter=queryWithoutResults">JS timeline, filtered by "Queries without results"</a>
     </div>
 
     <div ng-if="policyName === 'jQueryCallsOnEmptyObject'">
         <h3>{{rule.value}} offenders</h3>
-        Please open the <a href="/result/{{runId}}/timeline#filter=jQueryCallOnEmptyObject">JS timeline, filtered by "jQuery calls on empty object"</a>
+        Please open the <a href="result/{{runId}}/timeline#filter=jQueryCallOnEmptyObject">JS timeline, filtered by "jQuery calls on empty object"</a>
     </div>
 
     <div ng-if="policyName === 'jQueryNotDelegatedEvents'">
         <h3>{{rule.value}} offenders</h3>
-        Please open the <a href="/result/{{runId}}/timeline#filter=eventNotDelegated">JS timeline, filtered by "Events not delegated"</a>
+        Please open the <a href="result/{{runId}}/timeline#filter=eventNotDelegated">JS timeline, filtered by "Events not delegated"</a>
     </div>
 
     <div ng-if="policyName === 'cssBreakpoints'">
diff --git a/lib/server/controllers/apiController.js b/lib/server/controllers/apiController.js
index e0ac803..fc272d6 100644
--- a/lib/server/controllers/apiController.js
+++ b/lib/server/controllers/apiController.js
@@ -109,7 +109,7 @@ var ApiController = function(app) {
                             data.screenshotBuffer = screenshotBuffer;
 
                             // Official path to get the image
-                            data.screenshotUrl = '/api/results/' + data.runId + '/screenshot.jpg';
+                            data.screenshotUrl = 'api/results/' + data.runId + '/screenshot.jpg';
                         }
 
                     })