Unify HTML templates across test, main, basicConfig

author: Christian Kollmann <christian.kollmann@a-sit.at> 2021-12-07 07:51:10 +0100
committer: Christian Kollmann <christian.kollmann@a-sit.at> 2021-12-07 11:01:13 +0100
commit: 8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6 (patch)
tree: 2b379387a1ac8c046b98860dd114abcd64227afb /basicConfig/templates
parent: ac56869c2a981e40d6cf4637fb8fd46c06207c9d (diff)
download: National_eIDAS_Gateway-8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6.tar.gz
National_eIDAS_Gateway-8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6.tar.bz2
National_eIDAS_Gateway-8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6.zip
2 files changed, 90 insertions, 213 deletions
diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html
index fffe3930..c233c5c4 100644
--- a/basicConfig/templates/other_login_method.html
+++ b/basicConfig/templates/other_login_method.html
@@ -4,224 +4,74 @@
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
 <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}"/>
-  <title th:text="#{gui.countryselection.title}">eIDAS-Login Länderauswahl</title>
-<script type="text/javascript">
-</script>
-<style>
-body {
-	background-image: none;
-	margin:		0px;
-	font-family:	"Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-div.header {
-	background-color: #e9ecef;
-	padding-top: 28px;
-	padding-left: 137px;
-	padding-right: 137px;
-	padding-bottom: 12px;
-}
-div.titlebar {
-	padding: 0px;
-}
-div.titlebar div {
-}
-.hidden {
-	display: none;
-}
-ul.nav_oben {
-	padding: 0px;
-	margin: 0px;
-	text-align: right;
-	text-transform: uppercase;
-}
-li {
-	display: inline-block;
-}
-div.header a {
-	text-decoration: none;
-	color: black;
-}
-a {
-	text-decoration: none;
-	color: #a22c1c;
-}
-.block {
-	/* override country.css */
-	padding-bottom: 20px;
-}
-@media only screen and (min-width: 1000px) {
-	div.header {
-		padding-left: 137px;
-		padding-right: 137px;
-	}
-	.content {
-		padding-left: 137px;
-		padding-right: 137px;
-	}
-	footer {
-		padding-left: 137px;
-		padding-right: 137px;
-	}
-}
-@media only screen and (max-width: 999px) {
-	div.header {
-		padding-left: 1em;
-		padding-right: 1em;
-	}
-	.content {
-		padding-left: 1em;
-		padding-right: 1em;
-	}
-	footer {
-		padding-left: 1em;
-		padding-right: 1em;
-	}
-}
-
-div.subtitle h1 {
-	padding: 0px;
-	margin: 0px;
-	font-size: 130%;
-	align: right;
-}
-div.subtitle h2 {
-	padding: 0px;
-	margin: 0px;
-	font-size: 115%;
-}
-footer {
-    left: 0;
-    padding-top: 1em;
-    bottom: 0;
-    width: 100%;
-    height: 2em;
-    background-color: rgb(162,44,28);
-    color: white;
-}
-.float {
-	float: left;
-}
-.floatright {
-	float: right;
-}
-.copyright {
-	width: 66%;
-	font-size: 80%;
-}
-#countries {
-	padding-bottom: 40px;
-}
-#country {
-	padding-bottom: 20px;
-}
-input[type=submit] {
-	width: inherit;
-/*	text-align: left; */
-}
-form {
-	justify-content: center;
-}
-</style>
+    <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}"/>
+    <title th:text="#{gui.otherlogin.title}">eIDAS-Login Other Login Methods</title>
 </head>
 <body>
-  <div class="header container">
+<div class="header container">
     <div class="titlebar">
-      <div>
-	     <a href="https://www.bmi.gv.at/" target="_blank" title="Home">
-	       <img class="toplogo img-responsive" src="/static/BMI.png" alt="Logo BMI"
-              th:attr="alt=#{gui.countryselection.logo.bmi.alt}">
-	       <h1 class="hidden" th:text="#{gui.countryselection.header1}"> Bundesministerium für Inneres </h1>
-	     </a>
-      </div>
-      <ul class="nav_oben">
-        <li>
-          <div class="languageselection" th:include="language_selection :: selectlanguage">
-            LanguageSelectionBlock
-          </div>
-        </li>
-        &nbsp; &nbsp;
-        <li><a href="https://www.bmi.gv.at/" target="_blank" th:text="#{gui.countryselection.link.bmi}" > Startseite BMI </a></li>
-      </ul>
+        <div>
+            <a href="https://www.bmi.gv.at/" target="_blank" title="Home">
+                <img class="toplogo img-responsive" src="/static/BMI.png" alt="Logo BMI"
+                     th:attr="alt=#{gui.countryselection.logo.bmi.alt}">
+                <h1 class="hidden" th:text="#{gui.countryselection.header1}"> Bundesministerium für Inneres </h1>
+            </a>
+        </div>
+        <ul class="nav_oben">
+            <li>
+                <div class="languageselection" th:include="language_selection :: selectlanguage">
+                    LanguageSelectionBlock
+                </div>
+            </li>
+            &nbsp; &nbsp;
+            <li>
+                <a href="https://www.bmi.gv.at/" target="_blank" th:text="#{gui.countryselection.link.bmi}">Startseite
+                    BMI </a>
+            </li>
+        </ul>
     </div>
-  </div>
-  <div class="content">
+</div>
+<div class="content">
     <div class="subtitle">
-      <h1 th:text="#{gui.countryselection.header2}" > Zentraler eIDAS Knoten der Republik Österreich </h1>
-      <h2 th:text="#{gui.countryselection.header3}" > Betrieben durch das Bundesministerium für Inneres </h2>
+        <h1 th:text="#{gui.countryselection.header2}"> Zentraler eIDAS Knoten der Republik Österreich </h1>
+        <h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
     </div>
 
-    <h1 th:text="#{gui.matching.otherloginmethod.header}"> Zuordnung Ihrer Anmeldeinformationen </h1>
-
-    <p th:text="#{gui.matching.otherloginmethod.info.text}" >Ihre Anmeldeinformationen konnten nicht eindeutig in das österreichische eID System integriert werden.
-      Für eine eindeutig Integration sind weitere Informationen erforderlich. </p>
-
-
-    <div  th:if="${advancedMatchingFailed != null} and ${advancedMatchingFailed}">
-      <b th:text="#{gui.matching.otherloginmethod.error.title}">Info</b> <span th:text="#{gui.matching.otherloginmethod.error.msg}"></span></p>
+    <h1 th:text="#{gui.otherlogin.header.selection}"> Select an alternative login method </h1>
+
+    <div id="otherlogin">
+        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+            <input type="submit" role="button" value="Handy-Signatur / Mobile Signature"
+                   th:attr="value=#{gui.otherlogin.hs}"/>
+            <input type="hidden" name="loginSelection" value="MOBILE_PHONE_SIGNATURE_LOGIN">
+            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
+        </form>
+        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+            <input type="submit" role="button" value="Andere eIDAS ID" th:attr="value=#{gui.otherlogin.eidas}"/>
+            <input type="hidden" name="loginSelection" value="EIDAS_LOGIN">
+            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
+        </form>
+        <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+            <input type="submit" role="button" value="Keine weitere HS / eIDAS" th:attr="value=#{gui.otherlogin.none}"/>
+            <input type="hidden" name="loginSelection" value="NO_OTHER_LOGIN">
+            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
+        </form>
     </div>
 
-    <div id="country">
-            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <input type="submit" role="button" value="Sie verfügen über einen ID Austria" th:attr="value=#{gui.matching.otherloginmethod.ida}" />
-                <input type="hidden" name="loginSelection" value="MOBILE_PHONE_SIGNATURE_LOGIN">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
-            </form>
-
-            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <input type="submit" role="button" value="Sie können zusätzliche Informationen via eIDAS bereitstellen" th:attr="value=#{gui.matching.otherloginmethod.eidas}" />
-                <input type="hidden" name="loginSelection" value="EIDAS_LOGIN">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
-            </form>
-
-            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <input type="submit" role="button" value="Sie waren bereits einmal in Österreich wohnhaft" th:attr="value=#{gui.matching.otherloginmethod.residence}" />
-                <input type="hidden" name="loginSelection" value="NO_OTHER_LOGIN">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
-            </form>
-
-            <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <input type="submit" role="button" value="Neuregistrierung im österreichischen eID System" th:attr="value=#{gui.matching.otherloginmethod.addmeasnew}" />
-                <input type="hidden" name="loginSelection" value="ADD_ME_AS_NEW">
-                <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}" />
-            </form>
-    </div>
-
-
     <!-- Abbrechen Button -->
-    <form   class="block" method="post"  action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-      <input  type="submit" class="btn btn-outline-primary btn-block" value="Abbrechen/Cancel" th:attr="value=#{gui.countryselection.cancel}">
-      <input  type="hidden" name="stopAuthProcess" value="true" >
-      <input  type="hidden" name="pendingid"  value="$pendingid" th:attr="value=${pendingid}">
+    <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+        <input type="submit" class="btn btn-outline-primary btn-block" value="Abbrechen/Cancel"
+               th:attr="value=#{gui.otherlogin.cancel}">
+        <input type="hidden" name="stopAuthProcess" value="true">
+        <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
     </form>
 
-
-<h2 th:text="#{gui.countryselection.infos.general.header}" > Information zur Anmeldung über Europäische eIDs </h2>
-<p>
-  <span th:text="#{gui.countryselection.infos.general.part.1}"> first part </span>
-  <a href="https://www.bmi.gv.at/" target="_blank" th:text="#{gui.countryselection.header1}" > Bundesministerium für Inneres </a>
-  <span th:text="#{gui.countryselection.infos.general.part.2}"> second part </span>
-</p>
-
-<p>
-  <span th:text="#{gui.countryselection.infos.general.part.3}"> third part </span>
-  <a href="https://eur-lex.europa.eu/legal-content/DE/TXT/HTML/?uri=CELEX:32014R0910&from=DE" target="_blank" th:text="#{gui.countryselection.infos.general.link.1}"> eIDAS-Verordnung der Europäischen Union </a>
-  <span th:text="#{gui.countryselection.infos.general.part.4}"> fourth part </span>
-</p>
-
-<p
-  <span th:text="#{gui.countryselection.infos.general.part.5}"> fived part </span>
-  <a href="https://www.dsb.gv.at/-/das-erganzungsregister-fur-naturliche-personen-ernp-" target="_blank" th:text="#{gui.countryselection.infos.general.link.2}" ></a>
-  <span th:text="#{gui.countryselection.infos.general.part.6}"> sixed part </span>
-</p>
-
-  </div>
-  <footer>
-	<div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
-	<div></div>
- </footer>
+</div>
+<footer>
+    <div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
+    <div></div>
+</footer>
 </body>
 </html>
diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html
index b434b9f9..8192a068 100644
--- a/basicConfig/templates/residency.html
+++ b/basicConfig/templates/residency.html
@@ -3,7 +3,6 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
-
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -102,17 +101,41 @@
 </head>
 
 <body>
-<div id="page">
-    <div class="languageselection" th:include="language_selection :: selectlanguage">
-        LanguageSelectionBlock
+<div class="header container">
+    <div class="titlebar">
+        <div>
+            <a href="https://www.bmi.gv.at/" target="_blank" title="Home">
+                <img class="toplogo img-responsive" src="/static/BMI.png" alt="Logo BMI"
+                     th:attr="alt=#{gui.countryselection.logo.bmi.alt}">
+                <h1 class="hidden" th:text="#{gui.countryselection.header1}"> Bundesministerium für Inneres </h1>
+            </a>
+        </div>
+        <ul class="nav_oben">
+            <li>
+                <div class="languageselection" th:include="language_selection :: selectlanguage">
+                    LanguageSelectionBlock
+                </div>
+            </li>
+            &nbsp; &nbsp;
+            <li>
+                <a href="https://www.bmi.gv.at/" target="_blank" th:text="#{gui.countryselection.link.bmi}">Startseite
+                    BMI </a>
+            </li>
+        </ul>
+    </div>
+</div>
+<div class="content">
+    <div class="subtitle">
+        <h1 th:text="#{gui.countryselection.header2}"> Zentraler eIDAS Knoten der Republik Österreich </h1>
+        <h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
     </div>
 
-    <h2 th:text="#{gui.residency.header.selection}">Search your Austrian Residency</h2>
+    <h1 th:text="#{gui.residency.header.selection}">Search your Austrian Residency</h1>
 
     <div id="residency">
         <form id="inputForm" method="post" action="$contextPath$submitEndpoint"
               th:attr="action=@{${submitEndpoint}}">
-            <div th:text="#{gui.residency.header.help}">Please enter a Municipality or Village first</div>
+            <div th:text="#{gui.residency.header.help}">Please enter a postcode, municipality or village first</div>
             <div>
                 <label for="inputPostleitzahl" th:text="#{gui.residency.input.postleitzahl}">Postleitzahl</label>
                 <input type="text" id="inputPostleitzahl" name="postleitzahl" value=""/>
@@ -181,5 +204,9 @@
     </form>
 
 </div>
+<footer>
+    <div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
+    <div></div>
+</footer>
 </body>
 </html>
author	Christian Kollmann <christian.kollmann@a-sit.at>	2021-12-07 07:51:10 +0100
committer	Christian Kollmann <christian.kollmann@a-sit.at>	2021-12-07 11:01:13 +0100
commit	8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6 (patch)
tree	2b379387a1ac8c046b98860dd114abcd64227afb /basicConfig/templates
parent	ac56869c2a981e40d6cf4637fb8fd46c06207c9d (diff)
download	National_eIDAS_Gateway-8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6.tar.gz National_eIDAS_Gateway-8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6.tar.bz2 National_eIDAS_Gateway-8d2aa68bc18c04c2b03cbdd01f008a89e4c8c1c6.zip