From 513d05d8b0b7fd233a925f44edc0349907c96047 Mon Sep 17 00:00:00 2001
From: Tobias Ollive <tobias.ollive@utc.fr>
Date: Fri, 10 Dec 2021 18:24:22 +0100
Subject: [PATCH] use relative links instead of absolute to allow  subpath
 installation

---
 server.js         | 6 +++++-
 views/layout.jade | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/server.js b/server.js
index f0f1c56..4bd4967 100644
--- a/server.js
+++ b/server.js
@@ -66,19 +66,23 @@ router.get("/", function (req, res) {
 })
 
 router.get("/demo", function (req, res) {
+  url = req.header("host") + req.baseUrl
   res.render("index.jade", {
     pageTitle: "Post-it - demo",
 	headerBarUrl: headerBarUrl,
     logoUrl: logoUrl,
+    url: url,
     demo: true
   })
 })
 
 router.get("/:id", function (req, res) {
+  url = req.header("host") + req.baseUrl
   res.render("index.jade", {
     pageTitle: "Post-it - " + req.params.id,
 	headerBarUrl: headerBarUrl,
-    logoUrl: logoUrl
+    logoUrl: logoUrl,
+    url: url
   })
 })
 
diff --git a/views/layout.jade b/views/layout.jade
index 5ae4b20..5c0cc55 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -35,11 +35,11 @@ html(lang="fr")
 		div#header-bar(data-url=locals.headerBarUrl)
 		header.container.main-header
 			div.title
-				a(href="/", title="Retour à la page d'accueil")
+				a(href="//" + locals.url, title="Retour à la page d'accueil")
 					if locals.logoUrl
 						img.logo(src=locals.logoUrl, alt="logo Post-it")
 					else
-						img.logo(src="/images/logo-Post-it.svg", alt="logo Post-it")
+						img.logo(src="images/logo-Post-it.svg", alt="logo Post-it")
 				div.base-line Organiser ses idées collectivement
 			block header
 		main
@@ -47,4 +47,4 @@ html(lang="fr")
 		div.clearfix
 		footer.container
 			block footer
-			div.credits Logiciel libre basé sur <a href="https://framagit.org/framasoft/framemo">Framemo</a> et <a href="https://github.com/aliasaria/scrumblr">Scrumblr</a> - <a href="https://framagit.org/colibris/framemo">Code source</a>
\ No newline at end of file
+			div.credits Logiciel libre basé sur <a href="https://framagit.org/framasoft/framemo">Framemo</a> et <a href="https://github.com/aliasaria/scrumblr">Scrumblr</a> - <a href="https://framagit.org/colibris/framemo">Code source</a>