Merge branch 'current_development' into development_preview

author: Thomas Lenz <tlenz@iaik.tugraz.at> 2020-07-07 15:25:58 +0200
committer: Thomas Lenz <tlenz@iaik.tugraz.at> 2020-07-07 15:25:58 +0200
commit: 0e6a03ffbc11d07ee2d00abcd573239a971f89b5 (patch)
tree: 8bce1f4fb963185ba7e36e63bd282199cccba840 /id/server/data/deploy/conf/moa-id/htmlTemplates
parent: aebaed0e889413491b5769babf39a200bd312992 (diff)
parent: f8a4ef47e8a2a37402a400ea83650738c5d5cf2a (diff)
download: moa-id-spss-0e6a03ffbc11d07ee2d00abcd573239a971f89b5.tar.gz
moa-id-spss-0e6a03ffbc11d07ee2d00abcd573239a971f89b5.tar.bz2
moa-id-spss-0e6a03ffbc11d07ee2d00abcd573239a971f89b5.zip
5 files changed, 256 insertions, 5 deletions
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css b/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css
index 86428fa06..e5f33b7f0 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css
@@ -44,8 +44,7 @@
         margin-bottom: 5%;
     }
     
-    #mandateLogin {
-        flex-direction: row;
+    #mandateLogin {        
         padding-bottom: 1%;
         padding-top: 2%;
         margin-left: 1%;
@@ -56,6 +55,10 @@
    .unvisible {
        display:none;
     }
+    
+    .visible {
+      flex-direction: row;
+    }
 
     .OA_header {
         font-size: 2.1em;
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js b/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
index 15b82614c..805c078bf 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/javascript_tempalte.js
@@ -210,7 +210,7 @@ function isIE() {
           var localBKUForm = document.getElementById("moaidform");
           var button = localBKUForm.getElementsByTagName("input")[5];                     
           button.removeAttribute("class");;
-          button.setAttribute("title","Bürgerkarte mit localer Bürgerkartenumgebung.");
+          button.setAttribute("title","Bürgerkarte mit lokaler Bürgerkartenumgebung.");
           
           var image = document.getElementById("bkuimage");
           var srcatt = image.getAttribute("src");
@@ -223,7 +223,7 @@ function isIE() {
           var localBKUForm = document.getElementById("moaidform");
           var button = localBKUForm.getElementsByTagName("input")[5];                     
           button.setAttribute("class","browserInfoButton");
-          button.setAttribute("title","Es wurde keine Bürgerkartenumgebung gefunden. Sollte es sich hierbei um einen Fehler handeln können Sie den Prozess durch einen Klick auf den Button denoch fortsetzen.");
+          button.setAttribute("title","Es wurde keine Bürgerkartenumgebung gefunden. Sollte es sich hierbei um einen Fehler handeln können Sie den Prozess durch einen Klick auf den Button dennoch fortsetzen.");
           
           var image = document.getElementById("bkuimage");
           var srcatt = image.getAttribute("src");
@@ -288,4 +288,4 @@ function isIE() {
 			} else {
 				return false;
 			}
-		} */
-\ No newline at end of file
+		} */
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
new file mode 100644
index 000000000..4e548e58c
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+
+   <!-- MOA-ID 2.x BKUSelection Layout CSS -->               
+   <link rel="stylesheet" href="$contextPath/css/buildCSS?pendingid=$pendingReqID"/>
+   
+   <!-- MOA-ID 2.x BKUSelection JavaScript fucnctions-->
+   <script src="$contextPath/js/buildJS?pendingid=$pendingReqID"></script>
+   
+
+<title>Anmeldung mittels Bürgerkarte oder Handy-Signatur</title>
+</head>
+<!--body onload="onChangeChecks();checkIfBrowserSupportsJava();" onresize="onChangeChecks();"-->
+<body>
+	<div id="page">
+		<div id="page1" class="case selected-case" role="main">
+			<h2 class="OA_header" role="heading">Anmeldung an: $OAName</h2>
+			<div id="main">
+				<div id="leftcontent" class="hell" role="application">
+					<div id="bku_header" class="dunkel">
+						<h2 id="tabheader" class="dunkel" role="heading">$HEADER_TEXT</h2>
+					</div>
+					<div id="bkulogin" class="hell" role="form">
+						<div id="mandateLogin" class="$MANDATEVISIBLE">
+							<div>
+								<input tabindex="1" type="checkbox" name="Mandate"
+									id="mandateCheckBox" class="mandate" role="checkbox" $MANDATECHECKED>
+								<label for="mandateCheckBox" class="mandate">in
+									Vertretung anmelden</label>
+								<!--a      href="info_mandates.html" 
+                        target="_blank"
+                        class="infobutton verticalcenter" 
+                        tabindex="5">i</a-->
+							</div>
+						</div>
+						<div id="bkuselectionarea">
+							<div id="bkukarte">
+								<img id="bkuimage" class="bkuimage" src="$contextPath/img/karte.png" alt="OnlineBKU"/> 
+                
+                  <!-- Remove support for Online BKU and swith the card button to local BKU-->
+                  <!--input name="bkuButtonOnline" type="button" onClick="bkuOnlineClicked();" tabindex="2" role="button" value="Karte" /-->                
+                
+                  <form method="get" id="moaidform" action="$contextPath$submitEndpoint" class="verticalcenter" target="_parent">
+								    <input type="hidden" name="bkuURI" value="$bkuLocal" />
+								    <input type="hidden" name="useMandate" id="useMandate" /> 
+								    <input type="hidden" name="SSO" id="useSSO" /> 
+								    <input type="hidden" name="ccc" id="ccc" /> 
+								    <input type="hidden" name="pendingid" value="$pendingReqID" /> 
+                    <input type="submit" value=" Karte " tabindex="5" role="button" />
+                  </form>
+                
+                  <iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection?pendingid=$pendingReqID"></iframe>
+                
+                  <!-- BKU detection with static template-->
+                  <!--iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/iframeLBKUdetect.html"></iframe-->                                                            
+				        </div>
+                            
+				        <div id="bkuhandy">
+				            <img class="bkuimage" src="$contextPath/img/handysign.png" alt="HandyBKU" />         
+                            <input name="bkuButtonHandy" type="button" tabindex="3" role="button" value="HANDY" />
+				        </div>
+                
+            
+				        <div id="bkueulogin" class="$eIDASVisible">
+				            <img id="eIDASImage" class="bkuimage" src="$contextPath/img/eIDAS_small.png" alt="EULogin" />                                                        
+                    <form method="get" id="moaideIDASform" action="$contextPath$submitEndpoint" class="verticalcenter" target="_parent">
+								      <input type="hidden" name="useeIDAS" value="true" />
+								      <input type="hidden" name="useMandate" id="useMandate" />  
+								      <input type="hidden" name="pendingid" value="$pendingReqID" /> 
+                      <input id="buttonEULogin" name="bkuButtonEULogin" type="submit" role="button" value="EULogin" />
+                    </form>
+				        </div>
+						<!--div id="localBKU">
+							<form method="get" id="moaidform" action="$contextPath$submitEndpoint"
+								class="verticalcenter" target="_parent">
+								<input type="hidden" name="bkuURI" value="$bkuLocal" />
+								<input type="hidden" name="useMandate" id="useMandate" /> 
+								<input type="hidden" name="SSO" id="useSSO" /> 
+								<input type="hidden" name="ccc" id="ccc" /> 
+								<input type="hidden" name="pendingid" value="$pendingReqID" /> 
+                <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
+									     role="button" onclick="setMandateSelection();">
+                </form>
+                <iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/feature/bkuDetection?pendingid=$pendingReqID"><\/iframe>
+              </div-->
+              
+              <!-- Single Sign-On Session transfer functionality -->
+              <!--div id="ssoSessionTransferBlock">
+                <a href="$contextPath$submitEndpoint?pendingid=$pendingReqID&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
+              </div-->
+            
+                  
+                        
+            
+            <!-- 
+              <div id="stork" align="center" class="$STORKVISIBLE">
+                <h2 id="tabheader" class="dunkel">Home Country Selection</h2>
+                <p>
+                  <select id="eIDASSelection" name="cccSelection" id="cccSelection" size="1">
+                    $countryList
+                  </select>
+                  <button id="eIDASButton" name="bkuButton" type="button">Proceed</button>
+                  a href="info_stork.html" target="_blank" class="infobutton">i</a
+                </p>
+              </div>-->
+
+						<div id="metroDetected" class="unvisible">
+							<p>Anscheinend verwenden Sie Internet Explorer im
+								Metro-Modus. Wählen Sie bitte "Auf dem Desktop anzeigen" aus den
+								Optionen um die Karten-Anmeldung starten zu können.</p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/mandate-service-selection.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/mandate-service-selection.html
new file mode 100644
index 000000000..7fb0dd881
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/mandate-service-selection.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html> 
+<html>
+<head>
+	<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <!-- MOA-ID 2.x BKUSelection Layout CSS -->               
+    <link rel="stylesheet" href="$contextPath/css/buildCSS" />
+    
+    <title>Anmeldung an Online-Applikation</title>   
+</head>
+
+
+<body>
+		<div id="page">
+
+			<div id="page1" class="case selected-case" role="main">
+
+<!-- 					<h2 class="OA_header">Anmeldung an: #OAName#</h2> -->
+
+					<div id="main">
+					<!--div id="leftcontent" class="hell"-->
+            <div id=processContent>
+              <div id="bku_header" class="dunkel">
+						    <h2 id="tabheader" class="dunkel" role="heading">
+						      Anmeldeinformationen:							  
+						    </h2>
+              </div>
+					
+						  <div id="selectArea" class="hell" role="application">
+							  <h3>Anmeldung an: $OAName</h3>
+					    
+          
+                <div id="processInfoArea">
+                  <p>Für die Anmeldung 'in Vertretung' stehen Ihnen zwei Systeme zur Vollmachtenauswahl zur Verfügung. Bitte wählen Sie das gewünschte Service.</p> 
+                </div>
+              
+                <div id="processSelectionArea">
+							   <div id="elgaMandateButton" class="processSelectionButtonArea">
+							 		  <form method="post" id="moaidform_yes" action="$contextPath$submitEndpoint">
+										  <input type="hidden" name="useELGAMandate" value="true">
+                      <input type="hidden" name="pendingid" value="$pendingReqID">
+										  <input type="submit" value="Eltern-Kind Vertretung" class="processSelectionButton" role="button">
+									 </form>
+                    <div class="buttonDescription">
+                      <p>Eltern-Kind Vertretung</p>
+                    </div>
+							     </div>
+							     <div id="misMandateButton" class="processSelectionButtonArea">
+								    <form method="post" id="moaidform_no" action="$contextPath$submitEndpoint">
+									    <input type="hidden" name="useMISMandate" value="true">
+                      <input type="hidden" name="pendingid" value="$pendingReqID">
+								      <input type="submit" value="allgemeine Vertretung" class="processSelectionButton" role="button">
+								    </form>
+                    <div class="buttonDescription">
+                      <p>Vollmachtenservice der Österreichischen Datenschutzbehörde <a href="https://mms.stammzahlenregister.gv.at/mms/moaid.do">(MMS Service)</a></p>
+                    </div>
+							     </div>
+							     <div id="abortButton" class="processSelectionButtonArea">
+										<form method="post" id="moaidform_no" action="$contextPath$submitEndpoint">
+                      <input type="hidden" name="pendingid" value="$pendingReqID">
+										  <input type="submit" value="Abbrechen" class="processSelectionButton" role="button">
+									  </form>
+                    <div class="buttonDescription">
+                      <p>Den Anmeldevorgang abbrechen</p>
+                    </div>
+							     </div>
+						      </div>
+                  
+                </div>
+              </div>
+            
+						<!--/div-->												
+					</div>
+				</div>
+		</div>
+</body>
+</html>
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html
new file mode 100644
index 000000000..7ae4b3f92
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html> 
+<html>
+<head>
+	<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+    <!-- MOA-ID 2.x BKUSelection Layout CSS -->               
+    <link rel="stylesheet" href="$contextPath/css/buildCSS?pendingid=$pendingReqID" />
+    
+    <title>Anmeldung an Online-Applikation</title>   
+</head>
+
+
+<body>
+		<div id="page">
+
+			<div id="page1" class="case selected-case" role="main">
+
+<!-- 					<h2 class="OA_header">Anmeldung an: #OAName#</h2> -->
+
+					<div id="main">
+					<div id="leftcontent" class="hell">
+            <div id="bku_header" class="dunkel">
+						  <h2 id="tabheader" class="dunkel" role="heading">
+							 Anmeldeinformationen:							  
+						  </h2>
+            </div>
+					
+						<div id="selectArea" class="hell" role="application">
+							<h3>Anmeldung an: $OAName</h3>
+					
+<!-- 						<div class="hell"> -->
+							<div id="leftbutton">
+									<form method="post" id="moaidform_yes" action="$contextPath$submitEndpoint">
+										<input type="hidden" name="value" value="true">
+                    <input type="hidden" name="pendingid" value="$pendingReqID">
+										<input type="submit" value="Ja" class="setAssertionButton_full" role="button">
+									</form>
+							</div>
+							<div id="rightbutton">
+										<form method="post" id="moaidform_no" action="$contextPath$submitEndpoint">
+										<input type="hidden" name="value" value="false">
+                    <input type="hidden" name="pendingid" value="$pendingReqID">
+										<input type="submit" value="Nein" class="setAssertionButton_full" role="button">
+									</form>
+							</div>
+						
+						</div>												
+					</div>
+				</div>
+		</div>
+	</div>
+</body>
+</html>
author	Thomas Lenz <tlenz@iaik.tugraz.at>	2020-07-07 15:25:58 +0200
committer	Thomas Lenz <tlenz@iaik.tugraz.at>	2020-07-07 15:25:58 +0200
commit	0e6a03ffbc11d07ee2d00abcd573239a971f89b5 (patch)
tree	8bce1f4fb963185ba7e36e63bd282199cccba840 /id/server/data/deploy/conf/moa-id/htmlTemplates
parent	aebaed0e889413491b5769babf39a200bd312992 (diff)
parent	f8a4ef47e8a2a37402a400ea83650738c5d5cf2a (diff)
download	moa-id-spss-0e6a03ffbc11d07ee2d00abcd573239a971f89b5.tar.gz moa-id-spss-0e6a03ffbc11d07ee2d00abcd573239a971f89b5.tar.bz2 moa-id-spss-0e6a03ffbc11d07ee2d00abcd573239a971f89b5.zip