From a017ebff96d2cc12943801c933e5733b4e827b3b Mon Sep 17 00:00:00 2001
From: Christian Kollmann <christian.kollmann@a-sit.at>
Date: Tue, 7 Dec 2021 09:00:22 +0100
Subject: Use relative paths in templates to enable preview in browser

If Thymeleaf is active (i.e. the template is rendered by the Webapp),
the path gets replaced anyway.
---
 .../main/resources/templates/countrySelection.html | 56 +++++++++++-----------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'connector/src/main/resources/templates/countrySelection.html')
diff --git a/connector/src/main/resources/templates/countrySelection.html b/connector/src/main/resources/templates/countrySelection.html
index e196cd31..dfd00e18 100644
--- a/connector/src/main/resources/templates/countrySelection.html
+++ b/connector/src/main/resources/templates/countrySelection.html
@@ -6,8 +6,8 @@
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
-    <script type="text/javascript" src="$contextPath/static/js/js_country.js"
+    <link rel="stylesheet" href="../../webapp/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+    <script type="text/javascript" src="../../webapp/js/js_country.js"
             th:attr="src=@{/static/js/js_country.js}"></script>
     <title th:text="#{gui.countryselection.title}">eIDAS-Login Länderauswahl</title>
 </head>
@@ -43,7 +43,7 @@
 
     <div id="country">
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/germany-eu_.png" alt="Germany-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/germany-eu_.png" alt="Germany-eID"
                     th:attr="src=@{/img/countries/germany-eu_.png},alt=#{gui.countryselection.country.de.logo.alt}"/></a>
             <input type="submit" role="button" value="Deutschland / Germany"
                    th:attr="value=#{gui.countryselection.country.de}"/>
@@ -58,81 +58,81 @@
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Belgium-EU_gray.png" alt="Belgium-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Belgium-EU_gray.png" alt="Belgium-eID"
                     th:attr="src=@{img/countries/Belgium-EU_gray.png},alt=#{gui.countryselection.country.be.logo.alt}"/></a>
             <input type="submit" value="Belgium" th:attr="value=#{gui.countryselection.country.be}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Bulgaria-EU_gray.png"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Bulgaria-EU_gray.png"
                     alt="Bulgaria-eID"
                     th:attr="src=@{/img/countries/Bulgaria-EU_gray.png},alt=#{gui.countryselection.country.bg.logo.alt}"/></a>
             <input type="submit" value="Bulgaria" th:attr="value=#{gui.countryselection.country.bg}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Croatia-EU_gray.png" alt="Croatia-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Croatia-EU_gray.png" alt="Croatia-eID"
                     th:attr="src=@{/img/countries/Croatia-EU_gray.png},alt=#{gui.countryselection.country.hr.logo.alt}"/></a>
             <input type="submit" value="Croatia" th:attr="value=#{gui.countryselection.country.hr}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Cyprus-EU_gray.png" alt="Cyprus-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Cyprus-EU_gray.png" alt="Cyprus-eID"
                     th:attr="src=@{/img/countries/Cyprus-EU_gray.png},alt=#{gui.countryselection.country.cy.logo.alt}"/></a>
             <input type="submit" value="Cyprus" th:attr="value=#{gui.countryselection.country.cy}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/CzechRepublic-EU_gray.png"
+            <a><img class="countryimage" src="../../webapp/img/countries/CzechRepublic-EU_gray.png"
                     alt="CzechRepublic-eID"
                     th:attr="src=@{/img/countries/CzechRepublic-EU_gray.png},alt=#{gui.countryselection.country.cz.logo.alt}"/></a>
             <input type="submit" value="CzechRepublic" th:attr="value=#{gui.countryselection.country.cz}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Denmark-EU_gray.png" alt="Denmark-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Denmark-EU_gray.png" alt="Denmark-eID"
                     th:attr="src=@{/img/countries/Denmark-EU_gray.png},alt=#{gui.countryselection.country.dk.logo.alt}"/></a>
             <input type="submit" value="Denmark" th:attr="value=#{gui.countryselection.country.dk}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Estonia-EU_gray.png" alt="Estonia-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Estonia-EU_gray.png" alt="Estonia-eID"
                     th:attr="src=@{/img/countries/Estonia-EU_gray.png},alt=#{gui.countryselection.country.ee.logo.alt}"/></a>
             <input type="submit" value="Estonia" th:attr="value=#{gui.countryselection.country.ee}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Finland-EU_gray.png" alt="Finland-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Finland-EU_gray.png" alt="Finland-eID"
                     th:attr="src=@{/img/countries/Finland-EU_gray.png},alt=#{gui.countryselection.country.fi.logo.alt}"/></a>
             <input type="submit" value="Finland" th:attr="value=#{gui.countryselection.country.fi}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/France-EU_gray.png" alt="France-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/France-EU_gray.png" alt="France-eID"
                     th:attr="src=@{/img/countries/France-EU_gray.png},alt=#{gui.countryselection.country.fr.logo.alt}"/></a>
             <input type="submit" value="France" th:attr="value=#{gui.countryselection.country.fr}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Greece-EU_gray.png" alt="Greece-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Greece-EU_gray.png" alt="Greece-eID"
                     th:attr="src=@{/img/countries/Greece-EU_gray.png},alt=#{gui.countryselection.country.gr.logo.alt}"/></a>
             <input type="submit" value="Greece" th:attr="value=#{gui.countryselection.country.gr}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Hungary-EU_gray.png" alt="Hungary-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Hungary-EU_gray.png" alt="Hungary-eID"
                     th:attr="src=@{/img/countries/Hungary-EU_gray.png},alt=#{gui.countryselection.country.hu.logo.alt}"/></a>
             <input type="submit" value="Hungary" th:attr="value=#{gui.countryselection.country.hu}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Ireland-EU_gray.png" alt="Ireland-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Ireland-EU_gray.png" alt="Ireland-eID"
                     th:attr="src=@{/img/countries/Ireland-EU_gray.png},alt=#{gui.countryselection.country.ir.logo.alt}"/></a>
             <input type="submit" value="Ireland" th:attr="value=#{gui.countryselection.country.ir}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Italy-EU_gray.png" alt="Italy-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Italy-EU_gray.png" alt="Italy-eID"
                     th:attr="src=@{/img/countries/Italy-EU_gray.png},alt=#{gui.countryselection.country.it.logo.alt}"/></a>
             <input type="submit" value="Italy" th:attr="value=#{gui.countryselection.country.it}">
             <select id="testEnvironment" name="selectedEnvironment">
@@ -144,57 +144,57 @@
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Latvia-EU_gray.png" alt="Latvia-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Latvia-EU_gray.png" alt="Latvia-eID"
                     th:attr="src=@{/img/countries/Latvia-EU_gray.png},alt=#{gui.countryselection.country.lv.logo.alt}"/></a>
             <input type="submit" value="Latvia" th:attr="value=#{gui.countryselection.country.lv}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Luxembourg-EU_gray.png"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Luxembourg-EU_gray.png"
                     alt="Luxembourg-eID"
                     th:attr="src=@{/img/countries/Luxembourg-EU_gray.png},alt=#{gui.countryselection.country.lu.logo.alt}"/></a>
             <input type="submit" value="Luxembourg" th:attr="value=#{gui.countryselection.country.lu}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Malta-EU_gray.png" alt="Malta-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Malta-EU_gray.png" alt="Malta-eID"
                     th:attr="src=@{/img/countries/Malta-EU_gray.png},alt=#{gui.countryselection.country.mt.logo.alt}"/></a>
             <input type="submit" value="Malta" th:attr="value=#{gui.countryselection.country.mt}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Poland-EU_gray.png" alt="Poland-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Poland-EU_gray.png" alt="Poland-eID"
                     th:attr="src=@{/img/countries/Poland-EU_gray.png},alt=#{gui.countryselection.country.pl.logo.alt}"/></a>
             <input type="submit" value="Poland" th:attr="value=#{gui.countryselection.country.pl}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Portugal-EU_gray.png" alt="Portugal-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Portugal-EU_gray.png" alt="Portugal-eID"
                     th:attr="src=@{/img/countries/Portugal-EU_gray.png},alt=#{gui.countryselection.country.pt.logo.alt}"/></a>
             <input type="submit" value="Portugal" th:attr="value=#{gui.countryselection.country.pt}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Romania-EU_gray.png" alt="Romania-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Romania-EU_gray.png" alt="Romania-eID"
                     th:attr="src=@{/img/countries/Romania-EU_gray.png},alt=#{gui.countryselection.country.ro.logo.alt}"/></a>
             <input type="submit" value="Romania" th:attr="value=#{gui.countryselection.country.ro}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Slovakia-EU_gray.png"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Slovakia-EU_gray.png"
                     alt="Slovakia-eID"
                     th:attr="src=@{/img/countries/Slovakia-EU_gray.png},alt=#{gui.countryselection.country.sk.logo.alt}"/></a>
             <input type="submit" value="Slovakia" th:attr="value=#{gui.countryselection.country.sk}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Slovenia-EU_gray.png" alt="Slovenia-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Slovenia-EU_gray.png" alt="Slovenia-eID"
                     th:attr="src=@{/img/countries/Slovenia-EU_gray.png},alt=#{gui.countryselection.country.si.logo.alt}"/></a>
             <input type="submit" value="Slovenia" th:attr="value=#{gui.countryselection.country.si}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Spain-EU_gray.png" alt="Spain-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Spain-EU_gray.png" alt="Spain-eID"
                     th:attr="src=@{/img/countries/Spain-EU_gray.png},alt=#{gui.countryselection.country.es.logo.alt}"/></a>
             <input type="submit" value="Spain" th:attr="value=#{gui.countryselection.country.es}">
             <select id="testEnvironment" name="selectedEnvironment">
@@ -206,20 +206,20 @@
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Sweden-EU_gray.png" alt="Sweden-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Sweden-EU_gray.png" alt="Sweden-eID"
                     th:attr="src=@{/img/countries/Sweden-EU_gray.png},alt=#{gui.countryselection.country.se.logo.alt}"/></a>
             <input type="submit" value="Sweden" th:attr="value=#{gui.countryselection.country.se}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/TheNetherlands-EU_gray.jpg"
+            <a><img class="countryimage" src="../../webapp/img/countries/TheNetherlands-EU_gray.jpg"
                     alt="TheNetherlands-eID"
                     th:attr="src=@{/img/countries/TheNetherlands-EU_gray.jpg},alt=#{gui.countryselection.country.nl.logo.alt}"/></a>
             <input type="submit" value="Netherlands" th:attr="value=#{gui.countryselection.country.nl}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/UnitedKingdom-EU_gray.png"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/UnitedKingdom-EU_gray.png"
                     alt="UnitedKingdom-eID"
                     th:attr="src=@{/img/countries/UnitedKingdom-EU_gray.png},alt=#{gui.countryselection.country.uk.logo.alt}"/></a>
             <input type="submit" value="United Kingdom" th:attr="value=#{gui.countryselection.country.uk}" disabled>
-- 
cgit v1.2.3

