chore(matching): re-oreder process steps in GUI releated matching

author: Thomas <> 2022-05-02 17:16:15 +0200
committer: Thomas <> 2022-05-02 17:16:15 +0200
commit: 69aa81016fe20e901a3be02bb6772c9185c0b9ef (patch)
tree: 94e86b91ed349c08524de0bb8669beffcf66eddb /basicConfig/templates
parent: d9a402c18755d47ad17283c5c52fc2311df56e85 (diff)
download: National_eIDAS_Gateway-69aa81016fe20e901a3be02bb6772c9185c0b9ef.tar.gz
National_eIDAS_Gateway-69aa81016fe20e901a3be02bb6772c9185c0b9ef.tar.bz2
National_eIDAS_Gateway-69aa81016fe20e901a3be02bb6772c9185c0b9ef.zip
3 files changed, 105 insertions, 54 deletions
diff --git a/basicConfig/templates/language_selection.html b/basicConfig/templates/language_selection.html
index a268eb17..8d34c73b 100644
--- a/basicConfig/templates/language_selection.html
+++ b/basicConfig/templates/language_selection.html
@@ -3,13 +3,13 @@
       xmlns:th="http://www.thymeleaf.org">
 
   <body>
-  
+
     <div th:fragment="selectlanguage">
-        <a th:href="@{|${submitEndpoint}?pendingid=${pendingid}|(lang='de')}" th:text="#{gui.general.language.selection.de}">Spache1</a>
+        <a th:href="@{|${submitEndpoint}?lang=de|(pendingid=${pendingid})}" th:text="#{gui.general.language.selection.de}">Spache1</a>
         <span>&nbsp; &nbsp; </span>
-        <a th:href="@{|${submitEndpoint}?pendingid=${pendingid}|(lang='en')}" th:text="#{gui.general.language.selection.en}">Spache2</a>
+        <a th:href="@{|${submitEndpoint}?lang=en|(pendingid=${pendingid})}" th:text="#{gui.general.language.selection.en}">Spache2</a>
     </div>
-  
+
   </body>
-  
-</html>
-\ No newline at end of file
+
+</html>
diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html
index 2165add2..6806dc05 100644
--- a/basicConfig/templates/other_login_method.html
+++ b/basicConfig/templates/other_login_method.html
@@ -49,73 +49,105 @@
         <h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
     </div>
 
-    <div id="matchingError"
-			   th:if="${advancedMatchingFailed != null} and ${advancedMatchingFailed}">
-		      <p   th:if="${advancedMatchingFailedReason != null}"
-			         th:text="#{${advancedMatchingFailedReason}}">Detailed
-          </p>
-		      <p   th:unless="${advancedMatchingFailedReason != null}"
-			         th:text="#{module.eidasauth.matching.29}">Generell
-          </p>
-    </div>
+    <div th:if="${createNewErnpEntry != null} and ${createNewErnpEntry}">
 
+      <div class="mainDescription">
+        <h3 th:text="#{gui.otherlogin.inserternp.header.selection}"> Generate new ERnP entry</h3>
 
-    <h3 th:text="#{gui.otherlogin.header.selection}"> Select an alternative login method </h3>
+        <p th:text="#{gui.otherlogin.inserternp.first}"> Insert ERnP first block </p>
+        <p th:text="#{gui.otherlogin.inserternp.second}"> Insert ERnP second block </p>
+        <p>
+          <span th:text="#{gui.otherlogin.inserternp.third.prefix}"> Insert ERnP third block / part 1 </span>
+          <span>bdquo;<a href="mailto:BMI-IKT-eIDAS-Betrieb@bmi.gv.at"> BMI-IKT-eIDAS-Betrieb@bmi.gv.at </a></span>
+          <span th:text="#{gui.otherlogin.inserternp.third.postfix}"> Insert ERnP third block / part 3 </span>
+        </p>
+      </div>
 
-    <div id="otherlogin" class="block">
-        <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <button type="submit" role="button" value="Handy-Signatur / Mobile Signature"
-                    th:text="#{gui.otherlogin.button.hs}">A
-            </button>
-            <input type="hidden" name="loginSelection" value="MOBILE_PHONE_SIGNATURE_LOGIN">
-            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
-        </form>
-        <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <button type="submit" role="button" value="Andere eIDAS ID"
-                    th:text="#{gui.otherlogin.button.eidas}">B
-            </button>
-            <input type="hidden" name="loginSelection" value="EIDAS_LOGIN">
-            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
-        </form>
-        <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+      <div  id="insertErnp" class="block">
+        <form class="block,singleButton" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
             <button type="submit" role="button" value="Keine weitere HS / eIDAS"
-            	    th:text="#{gui.otherlogin.button.none}">C
+                  th:text="#{gui.otherlogin.button.inserternp}">D
             </button>
-            <input type="hidden" name="loginSelection" value="NO_OTHER_LOGIN">
+            <input type="hidden" name="loginSelection" value="ADD_ME_AS_NEW">
             <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
         </form>
+      </div>
+
+      <div  id="stopMatching" class="block">
+        <!-- Abbrechen Button -->
+        <form class="block,singleButton" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+            <button type="submit" value="Abbrechen/Cancel" th:text="#{gui.otherlogin.cancel}"></button>
+            <input type="hidden" name="stopAuthProcess" value="true">
+            <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
+        </form>
+      </div>
 
-        <div  id="insertErnp" class="block"
-              th:if="${advancedMatchingFailed != null} and ${advancedMatchingFailed}">
+    </div>
+
+    <div th:unless="${createNewErnpEntry!= null} and ${createNewErnpEntry}">
 
-          <br>
+      <div class="mainDescription">
+        <h3 th:text="#{gui.otherlogin.header.selection}"> No person data found</h3>
 
-          <p th:text="#{gui.otherlogin.inserternp.infotext}"></p>
+        <p th:text="#{gui.otherlogin.info.first}"> Info text after MDS search with one or more results</p>
+        <p th:text="#{gui.otherlogin.info.second}"> Prefix for option list</p>
+        <ul>
+          <li th:text="#{gui.otherlogin.info.list.1}"> ID Austria or alterantive eIDAS Login </li>
+          <li th:text="#{gui.otherlogin.info.list.2}"> Search with Address </li>
+        </ul>
+      </div>
 
-          <br>
+      <div id="matchingError"
+  			   th:if="${advancedMatchingFailed != null} and ${advancedMatchingFailed}">
+  		      <p   th:if="${advancedMatchingFailedReason != null}"
+  			         th:text="#{${advancedMatchingFailedReason}}">Detailed
+            </p>
+  		      <p   th:unless="${advancedMatchingFailedReason != null}"
+  			         th:text="#{module.eidasauth.matching.29}">Generell
+            </p>
+      </div>
 
-        	<form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            	<button type="submit" role="button" value="Keine weitere HS / eIDAS"
-            		    th:text="#{gui.otherlogin.button.inserternp}">D
-            	</button>
-            	<input type="hidden" name="loginSelection" value="ADD_ME_AS_NEW">
-            	<input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
-        	</form>
+
+      <div id="otherlogin" class="block">
+        <div id="selectOtherMethodArea" class="block">
+          <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+              <button class="primaryButton" type="submit" role="button" value="Handy-Signatur / Mobile Signature"
+                      th:text="#{gui.otherlogin.button.hs}">A
+              </button>
+              <input type="hidden" name="loginSelection" value="MOBILE_PHONE_SIGNATURE_LOGIN">
+              <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
+          </form>
+          <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+              <button class="primaryButton" type="submit" role="button" value="Andere eIDAS ID"
+                      th:text="#{gui.otherlogin.button.eidas}">B
+              </button>
+              <input type="hidden" name="loginSelection" value="EIDAS_LOGIN">
+              <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
+          </form>
+          <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+              <button class="primaryButton" type="submit" role="button" value="Keine weitere HS / eIDAS"
+              	      th:text="#{gui.otherlogin.button.none}">C
+              </button>
+              <input type="hidden" name="loginSelection" value="NO_OTHER_LOGIN">
+              <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}"/>
+          </form>
         </div>
 
         <div  id="stopMatching" class="block">
           <!-- Abbrechen Button -->
-          <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+          <form class="block,singleButton" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
               <button type="submit" value="Abbrechen/Cancel" th:text="#{gui.otherlogin.cancel}"></button>
               <input type="hidden" name="stopAuthProcess" value="true">
               <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
           </form>
         </div>
+      </div>
+
     </div>
-</div>
-<footer>
+  </div>
+  <footer>
     <div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
     <div></div>
-</footer>
+  </footer>
 </body>
 </html>
diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html
index f8516945..26812ec0 100644
--- a/basicConfig/templates/residency.html
+++ b/basicConfig/templates/residency.html
@@ -173,7 +173,22 @@
         <h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
     </div>
 
-    <h1 th:text="#{gui.residency.header.selection}">Search your Austrian Residency</h1>
+    <div class="mainDescription">
+      <h3 th:text="#{gui.residency.header.selection}">Search your Austrian Residency </h3>
+
+      <p th:text="#{gui.residency.info.first}"> Info text for matching by address </p>
+      <p th:text="#{gui.residency.info.second}"> HowTo search by address </p>
+    </div>
+
+    <div id="matchingError"
+			   th:if="${advancedMatchingFailed != null} and ${advancedMatchingFailed}">
+		      <p   th:if="${advancedMatchingFailedReason != null}"
+			         th:text="#{${advancedMatchingFailedReason}}">Detailed
+          </p>
+		      <p   th:unless="${advancedMatchingFailedReason != null}"
+			         th:text="#{module.eidasauth.matching.29}">Generell
+          </p>
+    </div>
 
     <div id="residency">
         <form id="inputForm" method="post" action="$contextPath$submitEndpoint"
@@ -217,18 +232,22 @@
         </form>
     </div>
 
+
     <div id="backOrReturn" class="block">
-      <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+
+      <p th:text="#{gui.residency.info.third}"> Alternativ infos and back </p>
+      <br>
+      <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
           <button type="submit" value="Back" th:text="#{gui.residency.back}">Back</button>
           <input type="hidden" name="noResidence" value="true">
           <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
       </form>
 
-      <form method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
+      <!--form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
           <button type="submit" value="Abbrechen/Cancel" th:text="#{gui.residency.cancel}">Cancel</button>
           <input type="hidden" name="stopAuthProcess" value="true">
           <input type="hidden" name="pendingid" value="$pendingid" th:attr="value=${pendingid}">
-      </form>
+      </form-->
 
     </div>
author	Thomas <>	2022-05-02 17:16:15 +0200
committer	Thomas <>	2022-05-02 17:16:15 +0200
commit	69aa81016fe20e901a3be02bb6772c9185c0b9ef (patch)
tree	94e86b91ed349c08524de0bb8669beffcf66eddb /basicConfig/templates
parent	d9a402c18755d47ad17283c5c52fc2311df56e85 (diff)
download	National_eIDAS_Gateway-69aa81016fe20e901a3be02bb6772c9185c0b9ef.tar.gz National_eIDAS_Gateway-69aa81016fe20e901a3be02bb6772c9185c0b9ef.tar.bz2 National_eIDAS_Gateway-69aa81016fe20e901a3be02bb6772c9185c0b9ef.zip