use old ConfigTool

3 files changed, 89 insertions, 41 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 d0af6401b..123a23837 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
@@ -15,13 +15,17 @@
 			  	text-align: center;
 			  	background-color: #6B7B8B;
 				}
+                
+                .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
 				
         #localBKU p {
           font-size: 0.7em;
         } 
         
         #localBKU input{
-          font-size: 0.7em;
+          font-size: 0.85em;
           /*border-radius: 5px;*/
         }
         
@@ -142,6 +146,8 @@
           margin-bottom: 10px;
         }
         
+        
+        
        #validation {
         position: absolute;
         bottom: 0px;
@@ -154,7 +160,10 @@
       @media screen and (max-width: 205px) {
         #localBKU p {
           font-size: 0.6em;
-        } 
+        }
+       .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
         
         #localBKU input {
           font-size: 0.6em;
@@ -191,6 +200,9 @@
         #localBKU p {
           font-size: 0.7em;
         } 
+        .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
         
         #localBKU input {
           font-size: 0.7em;
@@ -227,6 +239,9 @@
         #localBKU p {
           font-size: 0.9em;
         } 
+        .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
         
         #localBKU input {
           font-size: 0.8em;
@@ -257,7 +272,9 @@
         #localBKU p {
           font-size: 0.9em;
         } 
-        
+        .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        }
         #localBKU input {
           font-size: 0.8em;
           min-width: 70px;
@@ -288,7 +305,9 @@
         #localBKU p {
           font-size: 0.9em;
         } 
-        
+       .browserInfoButton{
+         color: rgb(128, 128, 128); 
+        } 
         #localBKU input {
           font-size: 0.8em;
           min-width: 70px;
@@ -327,7 +346,9 @@
           font-size: 100%;
 			  	background-color: #MAIN_BACKGOUNDCOLOR#;
 				}
-        				
+        		.browserInfoButton{
+                    color: rgb(128, 128, 128); 
+                }		
 			  #page {
 			     visibility: hidden;
 			     margin-top: 0%;
@@ -464,12 +485,11 @@
       }
       
       #localBKU {
-        padding-left: 5%;
-        padding-right: 2%;
         padding-bottom: 4%;
         /*padding-top: 4%;*/
         position: relative;
-        clear: both;        
+        clear: both;     
+        text-align: center;
 			}
           			
 			#bkukarte {
@@ -526,13 +546,13 @@
       
       #localBKU input {
 /*        color: #BUTTON_COLOR#;  */
-        border: 0px;
+        /*border: 0px;*/
         display: inline-block;
         
       }
 			
       #localBKU input:hover, #localBKU input:focus, #localBKU input:active {
-        text-decoration: underline;
+        /*text-decoration: underline;*/
       }
       
 			#installJava, #BrowserNOK {
@@ -727,6 +747,56 @@
       }
       
     }
+    
+     function checkIfBrowserSupportsJava(){
+        console.log("Browser is Chrome: "+checkIfBrowserIsChrome());
+        console.log("Browser is Safari: "+checkIfBrowserIsSafari());
+        console.log("Browser is Edge: "+checkIfBrowserIsEdge());
+        
+        var cnt = 0;
+        
+        if(checkIfBrowserIsChrome())cnt++;
+        if(checkIfBrowserIsEdge())cnt++;
+        if(checkIfBrowserIsSafari())cnt++;
+           
+        if(cnt==0 || cnt>1)//cnt>1 means perhaps wrong detection
+            return true;
+        
+        var image = document.getElementById("bkuimage");
+        var srcatt = image.getAttribute("src");
+        var last = srcatt.substring(srcatt.lastIndexOf('/')+1);
+        srcatt = srcatt.replace(last,'online-bku-deactivated.png');    
+        image.setAttribute("src",srcatt);
+         
+         
+        var button = document.getElementsByName("bkuButtonOnline")[0];               
+        button.setAttribute("class","browserInfoButton");
+        button.setAttribute("title","Java wird nicht unterstützt, klicken für mehr Informationen.");
+        button.setAttribute("onClick","alert('Java wird von Ihrem Browser nicht unterstützt, ist jedoch für den Betrieb der Online Bürgerkartenumgebung notwendig.\\nWollen Sie dennoch die Online Bürgerkartenumgebung verwenden, wird zur Zeit Java noch von Firefox und MS Internet Explorer unterstützt. \\nAlternativ koennen Sie auch eine lokale Bürgerkartenumgebung verwenden, verfügbar unter www.buergerkarte.at.');");
+         
+        return false;
+   
+    }
+    function checkIfBrowserIsChrome(){
+        var chrome_defined = !!window.chrome;//chrome object defined
+        var webstore_defined = false;
+        if(window.chrome){
+            webstore_defined = !!window.chrome.webstore;
+           }
+        return chrome_defined && webstore_defined;
+    }
+    function checkIfBrowserIsEdge(){//edge also defines the chrome object, but not the webapp
+        var chrome_defined = !!window.chrome;//chrome object defined
+        var webstore_defined = true;
+        if(window.chrome){
+            webstore_defined = !!window.chrome.webstore;
+           }
+        return chrome_defined && !webstore_defined;
+    }
+    function checkIfBrowserIsSafari(){
+        var cond1 = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0;
+        return cond1;
+    }
 /* 		function setSSOSelection() {
 			document.getElementById("useSSO").value = "false";
 			var checkbox = document.getElementById("SSOCheckBox");
@@ -754,7 +824,7 @@
 	</script>
 <title>Anmeldung mittels Bürgerkarte oder Handy-Signatur</title>
 </head>
-<body onload="onChangeChecks();" onresize="onChangeChecks();">
+<body onload="onChangeChecks();checkIfBrowserSupportsJava();" onresize="onChangeChecks();">
 	<div id="page">
 		<div id="page1" class="case selected-case" role="main">
 			<h2 class="OA_header" role="heading">Anmeldung an: #OAName#</h2>
@@ -779,7 +849,7 @@
 						</div>
 						<div id="bkuselectionarea">
 							<div id="bkukarte">
-								<img class="bkuimage" src="#CONTEXTPATH#/img/online-bku.png"
+								<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" />
@@ -801,9 +871,8 @@
 									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" class="hell"
-                  onclick="setMandateSelection();"
+                  <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>								                                  
@@ -837,7 +906,7 @@
 				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>
diff --git a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
index 192f03598..9a3b3675a 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
+++ b/id/server/data/deploy/conf/moa-id-configuration/moa-id-configtool.properties
@@ -4,7 +4,10 @@
 *
 ******
 
-
+#General config
+general.login.deaktivate=false
+general.publicURLContext=https://localhost:8443/moa-id-configuration
+general.moaid.instance.url=https://localhost:8443/moa-id-auth
 
 general.defaultlanguage=de 
 general.ssl.certstore=certs/certstore
@@ -33,16 +36,6 @@ dbcp.testOnBorrow=true
 dbcp.testOnReturn=false
 dbcp.testWhileIdle=false
 
-
-
-############################################################################
-####                             Deprecated                            #####
-############################################################################
-#General config
-general.login.deaktivate=false
-general.publicURLContext=https://localhost:8443/moa-id-configuration
-general.moaid.instance.url=https://localhost:8443/moa-id-auth
-
 ##Mail
 general.mail.host=smtp.localhost...
 #general.mail.host.port=
diff --git a/id/server/data/deploy/conf/moa-id-configuration/userdatabase.properties b/id/server/data/deploy/conf/moa-id-configuration/userdatabase.properties
index 6e03d3c12..e69de29bb 100644
--- a/id/server/data/deploy/conf/moa-id-configuration/userdatabase.properties
+++ b/id/server/data/deploy/conf/moa-id-configuration/userdatabase.properties
@@ -1,14 +0,0 @@
-#Auto generated configuration file.
-#Fri Jul 17 11:09:29 CEST 2015
-users.0.surname=Administrator
-users.0.roles.0.id=0
-roles.0.name=Administrators
-users=User List
-users.0.__LI.0=users
-users.0.roles.0.isMember=true
-roles.0.id=0
-roles=Role List
-users.0.id=0
-users.0.roles.0.name=Administrators
-users.0.firstname=Administrator
-roles.0.__LI.0=roles