update default templates for BKU-Selection, sendAssertion, and Single LogOut

5 files changed, 45 insertions, 39 deletions

diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
index a29b1d7bb..95effa348 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/loginFormFull.html
@@ -616,6 +616,12 @@
 			    top: 40px;
 				
 			}
+      
+      #ssoSessionTransferBlock {
+        font-size: 0.8em;
+        margin-left: 5px;
+        margin-bottom: 5px;
+      }
       			                        
     </style>       
 <!-- MOA-ID 2.x BKUSelection JavaScript fucnctions-->
@@ -656,7 +662,6 @@
 			if (isMetro())
 				document.getElementById("metroDetected").style.display="block";
 			document.getElementById("localBKU").style.display="block";
-      document.getElementById("bkuButtonOnlineId").disabled = "true";
 /* 			if (checkMandateSSO())
 				return; */
 			
@@ -673,7 +678,6 @@
 			generateIFrame(iFrameURL);
 		}
 		function bkuHandyClicked() {
-      document.getElementById("bkuButtonHandyId").disabled = "true";
 			document.getElementById("localBKU").style.display="none";
 /* 			if (checkMandateSSO())
 				return; */
@@ -854,15 +858,13 @@
 								<img id="bkuimage" class="bkuimage" src="#CONTEXTPATH#/img/online-bku.png"
 									alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
 									onClick="bkuOnlineClicked();" tabindex="2" role="button"
-									value="Karte"
-                  id="bkuButtonOnlineId"/>
+									value="Karte" />
 							</div>
 							<div id="bkuhandy">
 								<img class="bkuimage" src="#CONTEXTPATH#/img/mobile-bku.png"
 									alt="HandyBKU" /> <input name="bkuButtonHandy" type="button"
 									onClick="bkuHandyClicked();" tabindex="3" role="button"
-									value="HANDY"
-                  id="bkuButtonHandyId"/>
+									value="HANDY" />
 							</div>
 						</div>
 						<div id="localBKU">
@@ -871,17 +873,18 @@
 								<input type="hidden" name="bkuURI" value="#LOCAL#"> <input
 									type="hidden" name="useMandate" id="useMandate"> <input
 									type="hidden" name="SSO" id="useSSO"> <input
-									type="hidden" name="CCC" id="ccc"> <input type="hidden"
+									type="hidden" name="ccc" id="ccc"> <input type="hidden"
 									name="MODUL" value="#MODUL#"> <input type="hidden"
 									name="ACTION" value="#ACTION#"> <input type="hidden"
 									name="MOASessionID" value="#SESSIONID#"> 
                   <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
-									role="button" onclick="setMandateSelection();"
-                  >
-								<!--p>
-                    <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>								                                  
-                  </p-->								                                  
-                </form>								                                                          
+									role="button" onclick="setMandateSelection();">
+                </form>
+              </div>
+              
+              <!-- Single Sign-On Session transfer functionality -->
+              <div id="ssoSessionTransferBlock">
+                <a href="#AUTH_URL#?MOASessionID=#SESSIONID#&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
               </div>
               
               <div id="stork" align="center" style="#STORKVISIBLE#">
@@ -904,7 +907,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="validation">
+		<!--div id="validation">
 			<a href="http://validator.w3.org/check?uri="> <img
 				style="border: 0; width: 88px; height: 31px"
 				src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
@@ -913,7 +916,7 @@
 				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
-		</div>
+		</div-->
 	</div>
 </body>
 </html>
diff --git a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html
index 1a3e683de..07d018a94 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html
+++ b/id/server/data/deploy/conf/moa-id-configuration/htmlTemplates/sendAssertionFormFull.html
@@ -600,7 +600,7 @@
 					</div>
 				</div>
 		</div>
-    <div id="validation">
+    <!--div id="validation">
         <a href="http://validator.w3.org/check?uri=">
           <img   style="border:0;width:88px;height:31px"
                  src="#CONTEXTPATH#/img/valid-html5-blue.png"
@@ -608,10 +608,10 @@
         </a>
         <a href="http://jigsaw.w3.org/css-validator/">
           <img   style="border:0;width:88px;height:31px"
-                 src="https://jigsaw.w3.org/css-validator/images/vcss-blue"
+                 src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
                  alt="CSS ist valide!" />
         </a>
-    </div>
+    </div-->
 	</div>
 </body>
 </html>
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
index a29b1d7bb..95effa348 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -616,6 +616,12 @@
 			    top: 40px;
 				
 			}
+      
+      #ssoSessionTransferBlock {
+        font-size: 0.8em;
+        margin-left: 5px;
+        margin-bottom: 5px;
+      }
       			                        
     </style>       
 <!-- MOA-ID 2.x BKUSelection JavaScript fucnctions-->
@@ -656,7 +662,6 @@
 			if (isMetro())
 				document.getElementById("metroDetected").style.display="block";
 			document.getElementById("localBKU").style.display="block";
-      document.getElementById("bkuButtonOnlineId").disabled = "true";
 /* 			if (checkMandateSSO())
 				return; */
 			
@@ -673,7 +678,6 @@
 			generateIFrame(iFrameURL);
 		}
 		function bkuHandyClicked() {
-      document.getElementById("bkuButtonHandyId").disabled = "true";
 			document.getElementById("localBKU").style.display="none";
 /* 			if (checkMandateSSO())
 				return; */
@@ -854,15 +858,13 @@
 								<img id="bkuimage" class="bkuimage" src="#CONTEXTPATH#/img/online-bku.png"
 									alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
 									onClick="bkuOnlineClicked();" tabindex="2" role="button"
-									value="Karte"
-                  id="bkuButtonOnlineId"/>
+									value="Karte" />
 							</div>
 							<div id="bkuhandy">
 								<img class="bkuimage" src="#CONTEXTPATH#/img/mobile-bku.png"
 									alt="HandyBKU" /> <input name="bkuButtonHandy" type="button"
 									onClick="bkuHandyClicked();" tabindex="3" role="button"
-									value="HANDY"
-                  id="bkuButtonHandyId"/>
+									value="HANDY" />
 							</div>
 						</div>
 						<div id="localBKU">
@@ -871,17 +873,18 @@
 								<input type="hidden" name="bkuURI" value="#LOCAL#"> <input
 									type="hidden" name="useMandate" id="useMandate"> <input
 									type="hidden" name="SSO" id="useSSO"> <input
-									type="hidden" name="CCC" id="ccc"> <input type="hidden"
+									type="hidden" name="ccc" id="ccc"> <input type="hidden"
 									name="MODUL" value="#MODUL#"> <input type="hidden"
 									name="ACTION" value="#ACTION#"> <input type="hidden"
 									name="MOASessionID" value="#SESSIONID#"> 
                   <input type="submit" value=" Lokale Bürgerkartenumgebung " tabindex="4"
-									role="button" onclick="setMandateSelection();"
-                  >
-								<!--p>
-                    <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>								                                  
-                  </p-->								                                  
-                </form>								                                                          
+									role="button" onclick="setMandateSelection();">
+                </form>
+              </div>
+              
+              <!-- Single Sign-On Session transfer functionality -->
+              <div id="ssoSessionTransferBlock">
+                <a href="#AUTH_URL#?MOASessionID=#SESSIONID#&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
               </div>
               
               <div id="stork" align="center" style="#STORKVISIBLE#">
@@ -904,7 +907,7 @@
 				</div>
 			</div>
 		</div>
-		<div id="validation">
+		<!--div id="validation">
 			<a href="http://validator.w3.org/check?uri="> <img
 				style="border: 0; width: 88px; height: 31px"
 				src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
@@ -913,7 +916,7 @@
 				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
-		</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
index 1a3e683de..07d018a94 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/sendAssertionFormFull.html
@@ -600,7 +600,7 @@
 					</div>
 				</div>
 		</div>
-    <div id="validation">
+    <!--div id="validation">
         <a href="http://validator.w3.org/check?uri=">
           <img   style="border:0;width:88px;height:31px"
                  src="#CONTEXTPATH#/img/valid-html5-blue.png"
@@ -608,10 +608,10 @@
         </a>
         <a href="http://jigsaw.w3.org/css-validator/">
           <img   style="border:0;width:88px;height:31px"
-                 src="https://jigsaw.w3.org/css-validator/images/vcss-blue"
+                 src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
                  alt="CSS ist valide!" />
         </a>
-    </div>
+    </div-->
 	</div>
 </body>
 </html>
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html
index 9a621998c..a9d73e0d3 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/slo_template.html
@@ -444,16 +444,16 @@
 				</div>
 			</div>
 		</div>
-		<div id="validation">
+		<!--div id="validation">
 			<a href="http://validator.w3.org/check?uri="> <img
 				style="border: 0; width: 88px; height: 31px"
 				src="$contextpath/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
 			</a> <a href="http://jigsaw.w3.org/css-validator/"> <img
 				style="border: 0; width: 88px; height: 31px"
-				src="https://jigsaw.w3.org/css-validator/images/vcss-blue"
+				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
 				alt="CSS ist valide!" />
 			</a>
-		</div>
+		</div-->
 	</div>