aboutsummaryrefslogtreecommitdiff
path: root/connector/src/test
diff options
context:
space:
mode:
authorChristian Kollmann <christian.kollmann@a-sit.at>2021-12-07 09:00:22 +0100
committerChristian Kollmann <christian.kollmann@a-sit.at>2021-12-07 11:01:13 +0100
commita017ebff96d2cc12943801c933e5733b4e827b3b (patch)
tree3016eed0fe5491e6dd7a377d7b3684298d12d80b /connector/src/test
parent514f99284299882ce9b3e7741094eb55561b503e (diff)
downloadNational_eIDAS_Gateway-a017ebff96d2cc12943801c933e5733b4e827b3b.tar.gz
National_eIDAS_Gateway-a017ebff96d2cc12943801c933e5733b4e827b3b.tar.bz2
National_eIDAS_Gateway-a017ebff96d2cc12943801c933e5733b4e827b3b.zip
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.
Diffstat (limited to 'connector/src/test')
-rw-r--r--connector/src/test/resources/config/templates/countrySelection.html4
-rw-r--r--connector/src/test/resources/config/templates/eidas_node_forward.html2
-rw-r--r--connector/src/test/resources/config/templates/error.html2
-rw-r--r--connector/src/test/resources/config/templates/error_message.html20
-rw-r--r--connector/src/test/resources/config/templates/other_login_method.html2
-rw-r--r--connector/src/test/resources/config/templates/pvp2_post_binding.html4
-rw-r--r--connector/src/test/resources/config/templates/residency.html2
-rw-r--r--connector/src/test/resources/config/webcontent/autocommit.js5
-rw-r--r--connector/src/test/resources/config/webcontent/css/css_error.css26
9 files changed, 49 insertions, 18 deletions
diff --git a/connector/src/test/resources/config/templates/countrySelection.html b/connector/src/test/resources/config/templates/countrySelection.html
index e196cd31..bac2bb9c 100644
--- a/connector/src/test/resources/config/templates/countrySelection.html
+++ b/connector/src/test/resources/config/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="../webcontent/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+ <script type="text/javascript" src="../webcontent/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>
diff --git a/connector/src/test/resources/config/templates/eidas_node_forward.html b/connector/src/test/resources/config/templates/eidas_node_forward.html
index 186937d7..6dffa34b 100644
--- a/connector/src/test/resources/config/templates/eidas_node_forward.html
+++ b/connector/src/test/resources/config/templates/eidas_node_forward.html
@@ -4,7 +4,7 @@
layout:decorator="fragments/base"
th:with="lang=${#locale.language}" th:lang="${lang}">
<head>
- <script src="$contextPath/autocommit.js"
+ <script src="../webcontent/autocommit.js"
th:attr="src=@{/autocommit.js}"></script>
</head>
<body>
diff --git a/connector/src/test/resources/config/templates/error.html b/connector/src/test/resources/config/templates/error.html
index e2c605c7..21f589cd 100644
--- a/connector/src/test/resources/config/templates/error.html
+++ b/connector/src/test/resources/config/templates/error.html
@@ -5,7 +5,7 @@
th:with="lang=${#locale.language}" th:lang="${lang}">
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-<link rel="stylesheet" href="$contextPath/css/css_error.css" th:href="@{/css/css_error.css}"/>
+<link rel="stylesheet" href="../webcontent/css/css_error.css" th:href="@{/css/css_error.css}"/>
<title th:text="#{gui.errorpage.msg.title}">An error arise ... </title>
</head>
diff --git a/connector/src/test/resources/config/templates/error_message.html b/connector/src/test/resources/config/templates/error_message.html
index 86f9d29d..caaf7136 100644
--- a/connector/src/test/resources/config/templates/error_message.html
+++ b/connector/src/test/resources/config/templates/error_message.html
@@ -3,10 +3,10 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="fragments/base"
th:with="lang=${#locale.language}" th:lang="${lang}">
-
+
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
- <link rel="stylesheet" href="$contextPath/css/css_error.css" th:href="@{/css/css_error.css}" />
-
+ <link rel="stylesheet" href="../webcontent/css/css_error.css" th:href="@{/css/css_error.css}" />
+
<title th:text="#{gui.errorpage.msg.title}">An error arise ... </title>
</head>
@@ -14,21 +14,21 @@
<div id="page">
<div id="page1" class="case selected-case" role="main">
<h2 class="OA_header" role="heading">Authentication error arise</h2>
-
+
<div class="hell" role="application" >
<h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2>
-
+
<div id="alert_area" class="hell" role="application" >
<p th:text="#{gui.errorpage.msg.information}">Error Information</p>
<br/>
- <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${errorCode}"></span></p>
+ <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${errorCode}"></span></p>
<p><b th:text="#{gui.errorpage.msg.errormsg}">Msg :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p>
- </div>
- <!-- errorMsg -->
- </div>
+ </div>
+ <!-- errorMsg -->
+ </div>
<div th:if="${stacktrace}">
- <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p>
+ <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p>
</div>
</div>
diff --git a/connector/src/test/resources/config/templates/other_login_method.html b/connector/src/test/resources/config/templates/other_login_method.html
index ea15864e..8f846f84 100644
--- a/connector/src/test/resources/config/templates/other_login_method.html
+++ b/connector/src/test/resources/config/templates/other_login_method.html
@@ -6,7 +6,7 @@
<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}"/>
+ <link rel="stylesheet" href="../webcontent/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
<title th:text="#{gui.otherlogin.title}">eIDAS-Login Other Login Methods</title>
<style>
.block {
diff --git a/connector/src/test/resources/config/templates/pvp2_post_binding.html b/connector/src/test/resources/config/templates/pvp2_post_binding.html
index 90858237..06b9b494 100644
--- a/connector/src/test/resources/config/templates/pvp2_post_binding.html
+++ b/connector/src/test/resources/config/templates/pvp2_post_binding.html
@@ -6,7 +6,7 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
- <script src="$contextPath/autocommit.js"></script>
+ <script src="/autocommit.js"></script>
</head>
<body>
<noscript>
@@ -21,7 +21,7 @@
<form action="${action}" method="post" target="_parent">
<div>
- #if($RelayState) <input type="hidden" name="RelayState" value="${RelayState}"/> #end
+ #if($RelayState) <input type="hidden" name="RelayState" value="${RelayState}"/> #end
#if($SAMLRequest) <input type="hidden" name="SAMLRequest" value="${SAMLRequest}" /> #end
#if($SAMLResponse) <input type="hidden" name="SAMLResponse" value="${SAMLResponse}" /> #end
</div>
diff --git a/connector/src/test/resources/config/templates/residency.html b/connector/src/test/resources/config/templates/residency.html
index 79c620ea..9a277a16 100644
--- a/connector/src/test/resources/config/templates/residency.html
+++ b/connector/src/test/resources/config/templates/residency.html
@@ -218,7 +218,7 @@
</form>
<div>
- <img id="loading" src="$contextPath/static/img/ajax-loader.gif"
+ <img id="loading" src="../webcontent/img/ajax-loader.gif"
th:attr="src=@{/static/img/ajax-loader.gif}" style="display: none"/>
</div>
diff --git a/connector/src/test/resources/config/webcontent/autocommit.js b/connector/src/test/resources/config/webcontent/autocommit.js
new file mode 100644
index 00000000..d21a5651
--- /dev/null
+++ b/connector/src/test/resources/config/webcontent/autocommit.js
@@ -0,0 +1,5 @@
+function autoCommmit() {
+ document.forms[0].submit();
+}
+
+document.addEventListener('DOMContentLoaded', autoCommmit); \ No newline at end of file
diff --git a/connector/src/test/resources/config/webcontent/css/css_error.css b/connector/src/test/resources/config/webcontent/css/css_error.css
new file mode 100644
index 00000000..d772df43
--- /dev/null
+++ b/connector/src/test/resources/config/webcontent/css/css_error.css
@@ -0,0 +1,26 @@
+@charset "utf-8";
+ body {
+ padding-left: 5%;
+ background-color: #F9F9F9;
+ }
+ #page {
+ padding-top: 2%;
+ padding-right: 10%;
+ padding-left: 5%;
+ }
+
+ .OA_header {
+ font-size: 2.1em;
+ padding-top:1%;
+ margin-bottom: 1%;
+ margin-top: 1%;
+
+ }
+
+ #alert_area {
+ float:left;
+ width: 100%;
+ }
+
+
+