update default BKU selection templates to remove OnlineBKU

3 files changed, 63 insertions, 27 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 aa1242371..691166911 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
@@ -23,7 +23,7 @@
           /*border-radius: 5px;*/
         }
         
-         #bkuselectionarea input[type=button] {
+         #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit]{
           font-size: 0.85em;
           /*border-radius: 7px;*/
           margin-bottom: 25px;
@@ -69,7 +69,10 @@
 			    margin-bottom: 25px;
 			    margin-top: 25px;
 			  }
-			
+			 #alert_area {
+        width: 500px;
+        padding-left: 80px;
+        }
 			  #leftcontent {
 			    /*float:left; */
 				  width:250px;
@@ -168,7 +171,7 @@
          /* border-radius: 5px; */
         }
         
-        #bkuselectionarea input[type=button] {
+        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit]{
           font-size: 0.7em;
           min-width: 55px;
           /*min-height: 1.1em;
@@ -207,7 +210,7 @@
         /*  border-radius: 6px;    */
         }
         
-        #bkuselectionarea input[type=button] {
+        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit] {
           font-size: 0.75em;
           min-width: 60px;
       /*    min-height: 0.95em;
@@ -245,7 +248,7 @@
       /*    border-radius: 6px;  */
         }
         
-        #bkuselectionarea input[type=button] {
+        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit] {
           font-size: 0.85em;
      /*     min-height: 1.05em;
           border-radius: 7px;        */
@@ -277,7 +280,7 @@
       /*    border-radius: 6px;       */
         }
         
-        #bkuselectionarea input[type=button] {
+        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit] {
           font-size: 0.9em;
    /*       min-height: 1.2em;
           border-radius: 8px;          */
@@ -310,7 +313,7 @@
      /*     border-radius: 6px;          */
         }
         
-        #bkuselectionarea input[type=button] {
+        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit] {
           font-size: 1.0em;
      /*      min-height: 1.3em;
          border-radius: 10px;         */
@@ -368,7 +371,16 @@
 			    font-size: 0pt;
 			    visibility: hidden;
 			  }
-			
+			  
+        #alert_area {
+          visibility: visible;
+          width: 250px;
+        }
+        #alert_area > p:first-child {
+          display: none;
+          visibility: hidden;
+        }
+        
 			  #leftcontent {
 			    visibility: visible;
 			    margin-bottom: 0px;
@@ -411,7 +423,7 @@
 			      height: 25px;
 			 }
        
-        input[type=button] {
+        input[type=button],input[type=submit] {
 /*          height: 11%;  */
           width: 70%;
         }
@@ -452,9 +464,14 @@
 				text-align: right;
 			}
 			
+      #ssoSessionTransferBlock {
+        clear: both;
+      }
+      
 			#stork {
 			    /*margin-bottom: 10px;*/
 			   /* margin-top: 5px; */
+         clear: both;
 			}
       			
       #mandateLogin {
@@ -563,6 +580,7 @@
 			
 			}
 			
+
 			.selectTextHeader{
 			
 			}
@@ -620,12 +638,6 @@
         margin-left: 5px;
         margin-bottom: 5px;
       }
-      
-      #alert_area {
-        width: 500px;
-        padding-left: 80px;
-      }
-      
       #processInfoArea {
         margin-bottom: 15px;
         margin-top: 15px;
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 daa60ac11..ca920f63b 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
@@ -191,7 +191,7 @@ function isIE() {
         return cond1;
     }    
     function setBKUAvailable(available) {
-		  login = document.getElementById("localBKU");
+		  //login = document.getElementById("localBKU");
 			//active = (login.className.indexOf("lokalebkuaktiv") != -1);
       try {
 			  if (available) {
@@ -201,12 +201,26 @@ function isIE() {
           var button = localBKUForm.getElementsByTagName("input")[5];                     
           button.removeAttribute("class");;
           button.setAttribute("title","Bürgerkarte mit localer Bürgerkartenumgebung.");
+          
+          var image = document.getElementById("bkuimage");
+          var srcatt = image.getAttribute("src");
+          var last = srcatt.substring(srcatt.lastIndexOf('/')+1);
+          srcatt = srcatt.replace(last,'karte.png');    
+          image.setAttribute("src",srcatt);
+          
 			  } else if (!available) {
 				  //login.className = login.className.replace("lokalebkuaktiv", "lokalebkuinaktiv");
           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.");
+          
+          var image = document.getElementById("bkuimage");
+          var srcatt = image.getAttribute("src");
+          var last = srcatt.substring(srcatt.lastIndexOf('/')+1);
+          srcatt = srcatt.replace(last,'karte_deactivated.png');    
+          image.setAttribute("src",srcatt);
+          
           console.log("Local BKU NOT available")     
 			  }
       } catch(e) {console.log("Local BKU detection is not possible! Msg: "+e);}
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 794145a2d..53c4f0d5d 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -12,7 +12,8 @@
 
 <title>Anmeldung mittels Bürgerkarte oder Handy-Signatur</title>
 </head>
-<body onload="onChangeChecks();checkIfBrowserSupportsJava();" onresize="onChangeChecks();">
+<!--body onload="onChangeChecks();checkIfBrowserSupportsJava();" onresize="onChangeChecks();"-->
+<body onload="onChangeChecks();" onresize="onChangeChecks();">
 	<div id="page">
 		<div id="page1" class="case selected-case" role="main">
 			<h2 class="OA_header" role="heading">Anmeldung an: $OAName</h2>
@@ -37,19 +38,28 @@
 						</div>
 						<div id="bkuselectionarea">
 							<div id="bkukarte">
-								<img id="bkuimage" class="bkuimage" src="$contextPath/img/karte.png"
-									alt="OnlineBKU" /> <input name="bkuButtonOnline" type="button"
-									onClick="bkuOnlineClicked();" tabindex="2" role="button"
-									value="Karte" />
+								<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="4" role="button" onclick="setMandateSelection();">
+                </form>
+                <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"
-									onClick="bkuHandyClicked();" tabindex="3" role="button"
-									value="HANDY" />
+								<img class="bkuimage" src="$contextPath/img/handysign.png" alt="HandyBKU" />         
+                <input name="bkuButtonHandy" type="button" onClick="bkuHandyClicked();" tabindex="3" role="button" value="HANDY" />
 							</div>
 						</div>
-						<div id="localBKU">
+						<!--div id="localBKU">
 							<form method="get" id="moaidform" action="$contextPath$submitEndpoint"
 								class="verticalcenter" target="_parent">
 								<input type="hidden" name="bkuURI" value="$bkuLocal" />
@@ -61,7 +71,7 @@
 									     role="button" onclick="setMandateSelection();">
                 </form>
                 <iframe name="bkudetect" width="0" height="0" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" src="$contextPath/iframeLBKUdetect.html"><\/iframe>
-              </div>
+              </div-->
               
               <!-- Single Sign-On Session transfer functionality -->
               <!--div id="ssoSessionTransferBlock">