update handbook, readme, history, example configuration, ...

6 files changed, 459 insertions, 714 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 f95106c5a..fab541751 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
@@ -1,705 +1,394 @@
 @charset "utf-8";
-	@media screen and (min-width: 650px) {
-			
-				body {
-					margin:0;
-					padding:0;
-					color : #000;
-					background-color : #fff;
-			  	text-align: center;
-			  	background-color: #6B7B8B;
-				}
-                
-                .browserInfoButton{
-         color: rgb(128, 128, 128); 
-        }
-				
-        #localBKU p {
-          font-size: 0.7em;
-        } 
-        
-        #localBKU input{
-          font-size: 0.85em;
-          /*border-radius: 5px;*/
-        }
-        
-         #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit]{
-          font-size: 0.85em;
-          /*border-radius: 7px;*/
-          margin-bottom: 25px;
-          min-width: 80px;
-         }
-        
-        #mandateLogin {
-          font-size: 0.85em;
-        }
-        
-        #bku_header h2 {
-          font-size: 0.8em;
-        } 
-        
-        
-			  #page {
-			    display: block;
-			    border: 2px solid rgb(0,0,0);
-			    width: 650px;
-			    height: 460px;
-			    margin: 0 auto;
-			    margin-top: 5%;
-			    position: relative;
-			    border-radius: 25px;
-			    background: rgb(255,255,255);
-			  }
-			  
-			  #page1 {
-			    text-align: center;
-			  }
+    body {
+        margin:0;
+        padding:0;
+        color : #000;
+        background-color : #fff;
+        text-align: left;
+        background-color: #E6E6E6;
+    }
+
+    .browserInfoButton{
+        color: rgb(128, 128, 128); 
+    }	
+    
+    #page {
+        display: block;
+        margin: 0 auto;
+        margin-top: 5%;
+        position: relative;
+        background: rgb(255,255,255);
+    }
 			  
-			  #main {
-			    /*	clear:both; */
-				  position:relative;
-			    margin: 0 auto;
-			    /*width: 250px;*/
-			    text-align: center;
-			  }
+    #page1 {
+        padding-top: 1%;
+        text-align: center;
+    }
 			  
-			  .OA_header {
-			/*	  background-color: white;*/
-			    font-size: 20pt;
-			    margin-bottom: 25px;
-			    margin-top: 25px;
-			  }
-			 #alert_area {
-        width: 500px;
-        padding-left: 80px;
-        }
-			  #leftcontent {
-			    /*float:left; */
-				  width:250px;
-				  margin-bottom: 25px;
-			    text-align: left;
-			    border: 1px solid rgb(0,0,0);
-			  }
-			  			  
-			  #selectArea {
-				 font-size: 15px;
-				 padding-bottom: 65px;
-			  }
-			
-			  #leftcontent {
-				 width: 400px;
-				 /*margin-top: 30px;*/
-         margin: auto;
-			  }
-			
-        #bku_header {
-          height: 5%;
-          padding-bottom: 3px;
-          padding-top: 3px;
-        }
-      
-        #bkulogin {
-            overflow:hidden;	
-            min-width: 190px;
-            min-height: 180px;
-          /*height: 260px;*/	
-			  }
-      
-        h2#tabheader{
-				  font-size: 1.1em; 
-          padding-left: 2%;
-          padding-right: 2%;
-          position: relative;
-			  }
-      	
-        #stork h2 {
-          font-size: 1.0em;
-          margin-bottom: 2%;
-        }
-        		  
-			  .setAssertionButton_full {
-			  	background: #efefef;
-				  cursor: pointer;
-				  margin-top: 15px;
-			    width: 100px;
-			    height: 30px
-			  }
-			
-			  #leftbutton  {
-				 width: 30%; 
-				 float:left; 
-				 margin-left: 40px;
-			  }
-            #centerbutton {
-                width: 30%
-                float: middle; 
-            }
-			
-			
-			  #rightbutton {
-				 width: 30%; 
-				 float:right; 
-				 margin-right: 40px; 
-				 text-align: right;
-			  }
-        
-        button {
-          height: 25px;
-          width: 75px;
-          margin-bottom: 10px;
-        }
-        
-        
-        
-       #validation {
-        position: absolute;
-        bottom: 0px;
-        margin-left: 270px;
-        padding-bottom: 10px;
-      }
-			
-			}
+    #main {
+        float:left;
+        width: 100%;
+        text-align: center;
+    }
+    #bkulogin {	
+        min-width: 200px;
+        min-height: 155px;
+        margin-bottom: 5%;
+    }
 
-      @media screen and (max-width: 205px) {
-        #localBKU p {
-          font-size: 0.6em;
-        }
-       .browserInfoButton{
-         color: rgb(128, 128, 128); 
-        }
-        
-        #localBKU input {
-          font-size: 0.6em;
-          min-width: 60px;
-         /* max-width: 65px; */
-          min-height: 1.0em;
-         /* border-radius: 5px; */
-        }
-        
-        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit]{
-          font-size: 0.7em;
-          min-width: 55px;
-          /*min-height: 1.1em;
-          border-radius: 5px;*/
-          margin-bottom: 2%
-        }
-        
-        #mandateLogin {
-          font-size: 0.65em;
-        }
-        
-        #bku_header h2 {
-          font-size: 0.8em;
-          margin-top: -0.4em;
-          padding-top: 0.4em;
-        }
-        
-        #bkulogin {
-        min-height: 150px;
-        } 
+   .unvisible {
+       visibility: hidden;
       }
 
-      @media screen and (max-width: 249px) and (min-width: 206px) {
-        #localBKU p {
-          font-size: 0.7em;
-        } 
-        .browserInfoButton{
-         color: rgb(128, 128, 128); 
-        }
-        
-        #localBKU input {
-          font-size: 0.7em;
-          min-width: 70px;
-       /*    max-width: 75px;    */
-          min-height: 0.95em;
-        /*  border-radius: 6px;    */
-        }
-        
-        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit] {
-          font-size: 0.75em;
-          min-width: 60px;
-      /*    min-height: 0.95em;
-          border-radius: 6px;    */
-          margin-bottom: 5%
-        }
-        
-        #mandateLogin {
-          font-size: 0.75em;
-        }
-        
-        #bku_header h2 {
-          font-size: 0.9em;
-          margin-top: -0.45em;
-          padding-top: 0.45em;
-        }
-        
-        #bkulogin {
-          min-height: 180px;
-        }  
-      }
+    .OA_header {
+			/*	  background-color: white;*/
+        font-size: 2.1em;
+        margin-bottom: 1%;
+        margin-top: 1%;
+    }
 
-      @media screen and (max-width: 299px) and (min-width: 250px) {
-        #localBKU p {
-          font-size: 0.9em;
-        } 
-        .browserInfoButton{
-         color: rgb(128, 128, 128); 
-        }
-        
-        #localBKU input {
-          font-size: 0.8em;
-          min-width: 70px;
-       /*    max-width: 75px;      */
-      /*    border-radius: 6px;  */
-        }
-        
-        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit] {
-          font-size: 0.85em;
-     /*     min-height: 1.05em;
-          border-radius: 7px;        */
-          margin-bottom: 10%;
-        }
-        
-        #mandateLogin {
-          font-size: 1em;
-        }
-        
-        #bku_header h2 {
-          font-size: 1.0em;
-          margin-top: -0.50em;
-          padding-top: 0.50em;
-        } 
+    #ssoSessionTransferBlock {
+        font-size: 0.8em;
+        margin-left: 1%;
+        margin-bottom: 1%;
       }
 
-      @media screen and (max-width: 399px) and (min-width: 400px) {
-        #localBKU p {
-          font-size: 0.9em;
-        } 
-        .browserInfoButton{
-         color: rgb(128, 128, 128); 
-        }
-        #localBKU input {
-          font-size: 0.8em;
-          min-width: 70px;
-      /*     max-width: 75px;     */
-      /*    border-radius: 6px;       */
-        }
-        
-        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit] {
-          font-size: 0.9em;
-   /*       min-height: 1.2em;
-          border-radius: 8px;          */
-          margin-bottom: 10%;
-          max-width: 80px;
-        }
-        
-        #mandateLogin {
-          font-size: 1em;
-        }
-        
-        #bku_header h2 {
-          font-size: 1.1em;
-          margin-top: -0.55em;
-          padding-top: 0.55em;
-        } 
+    #processInfoArea {
+        margin-bottom: 4%;
+        margin-top: 4%;
+    }
+
+    #processSelectionArea {
+        width: 550px;
+        margin-left: 25px;
+        margin-top: 35px;
+    }
+
+    .processSelectionButtonArea {
+        float: none;
+        margin-bottom: 5%;
+        height: 35px;
+    }
+
+    .processSelectionButton {
+        background: #ababab;
+        cursor: pointer;
+        height: 40px;
+        width: 200px;
+        float: right;
+    }
+
+    .buttonDescription {
+        float: left;
+        margin-left: 10px;
+        padding-bottom: 0.4em;
+        text-align: left;
+        width: 60%;
+    }
+    
+    #processContent {
+        margin-top: 10%;
       }
-      
-      @media screen and (max-width: 649px) and (min-width: 400px) {
-        #localBKU p {
-          font-size: 0.9em;
-        } 
-       .browserInfoButton{
-         color: rgb(128, 128, 128); 
-        } 
-        #localBKU input {
-          font-size: 0.8em;
-          min-width: 70px;
-      /*     max-width: 80px;       */
-     /*     border-radius: 6px;          */
-        }
-        
-        #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit] {
-          font-size: 1.0em;
-     /*      min-height: 1.3em;
-         border-radius: 10px;         */
-          margin-bottom: 10%;
-          max-width: 85px;
-        }
-        
-        #mandateLogin {
-          font-size: 1.2em;
-        }
-        
-        #bku_header h2 {
-          font-size: 1.3em;
-          margin-top: -0.65em;
-          padding-top: 0.65em;
-        } 
+
+    #eIDASSelection {
+        width: 120px; 
+        margin-right: 5px;        
       }
 
+     #bkukarte {
+        float:left;
+        width:33%;
+        text-align:center;
+        margin-top: 2%;
+    }
 
-			
-			@media screen and (max-width: 649px) {
-				
-        body {
-					margin:0;
-					padding:0;
-					color : #000;
-			  	text-align: center;
-          font-size: 100%;
-			  	background-color: $MAIN_BACKGOUNDCOLOR;
-				}
-        		.browserInfoButton{
-                    color: rgb(128, 128, 128); 
-                }		
-			  #page {
-			     visibility: hidden;
-			     margin-top: 0%;
-			  }
-			  
-			  #page1 {
-			    visibility: hidden;
-			  }
-			  
-			  #main {
-			    visibility: hidden;
-			  }
-        
-        #validation {
-          visibility: hidden;
-          display: none;
-        }
-			  
-			  .OA_header {
-			    margin-bottom: 0px;
-			    margin-top: 0px;
-			    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;
-			     text-align: left;
-			     border:none;
-                vertical-align: middle;
-                min-height: 173px;
-                min-width: 204px;
-			  }
-			  
-        #bku_header {
-          height: 10%;
-          min-height: 1.2em;
-          margin-top: 1%;
-        }
-        
-        h2#tabheader{
-          padding-left: 2%;
-          padding-right: 2%;
-          position: relative;
-          top: 50%;
-			  }
-        
-        #stork h2 {
-          font-size: 0.9em;
-          margin-bottom: 2%;
-        }
-        
-       	#bkulogin {	
-          min-width: 190px;
-          min-height: 155px;	
-			 }
-        
-			 .setAssertionButton_full {
-			     	background: #efefef;
-				    cursor: pointer;
-				    margin-top: 15px;
-			      width: 70px;
-			      height: 25px;
-			 }
-       
-        input[type=button],input[type=submit] {
-/*          height: 11%;  */
-          width: 70%;
-        }
-			}
-			      
-			* {
-				margin: 0;
-				padding: 0;
-				#if($FONTTYPE)
-        	font-family: $FONTTYPE;
-        #end
-			}
-							      			
-			#selectArea {
-				padding-top: 10px;
-				padding-bottom: 55px;
-				padding-left: 10px;
-			}
-			
-			.setAssertionButton {
-				background: #efefef;
-				cursor: pointer;
-				margin-top: 15px;
-			  width: 70px;
-			  height: 25px;
-			}
-			
-			#leftbutton  {
-				width: 30%; 
-				float:left; 
-				margin-left: 15px;
-			}
+    #bkuhandy {
+        float:left;
+        width:33%;
+        text-align:center;
+        margin-top: 2%;
+    }
+
+    #bkueulogin {
+        display:block;
+        float:left;
+        text-align:center;
+        width:33%;
+        margin-top: 2%;
+    }
+
+    .bkuimage {
+        width: 60%;
+    }
 
+    input {
+        cursor: pointer;
+    }
+
+  #localBKU input {
+    display: inline-block;
+
+  }
 			
-			#rightbutton {
-				width: 30%; 
-				float:right; 
-				margin-right: 25px; 
-				text-align: right;
-			}
+  #localBKU input:hover, #localBKU input:focus, #localBKU input:active {
+    /*text-decoration: underline;*/
+  }
+
+    #installJava, #BrowserNOK {
+        clear:both;
+        font-size:0.8em;
+        padding:4px;
+    }
+
 			
-      #ssoSessionTransferBlock {
+    #ssoSessionTransferBlock {
         clear: both;
-      }
-      
-			#stork {
-			    /*margin-bottom: 10px;*/
-			   /* margin-top: 5px; */
-         clear: both;
-			}
+  }
+
+    #stork {
+        clear: both;
+    }
       			
-      #mandateLogin {
-        padding-bottom: 4%;
-        padding-top: 4%;
-        height: 10%;
+    #mandateLogin {
+        padding-bottom: 2%;
+        padding-top: 2%;
         position: relative;
         text-align: left;
 			}
       
-      .verticalcenter {
+    .verticalcenter {
         vertical-align: middle;
       }
 
     .mandate{
         float: left;
-        margin-left: 4%;
+        margin-left: 2%;
+        font-size: 1.3em;
     }
       
-      #mandateLogin div {
+    #mandateLogin div {
         clear: both;
         margin-top: -1%;
         position: relative;
         top: 50%;
-      }
-      
-      #bkuselectionarea {
-          position: relative;
-          display: block;
-      }
-      
-      #localBKU {
+    }
+         
+    #localBKU {
         padding-bottom: 4%;
         /*padding-top: 4%;*/
         position: relative;
         clear: both;     
         text-align: center;
-			}
-          			
-			#bkukarte {
-				float:left;
-				text-align:center;
-				width:33%;
-                min-height: 90px;
-
-                padding-top: 2%;
-			}
-			
-			#bkuhandy {
-				float:left;
-				text-align:center;
-				width:33%;
-                min-height: 90px;
+    }
+    
+    #selectArea {
+        float:left;
+        width:90%;
+        padding-left: 4%
+    }
 
-                padding-top: 2%;
-			}
-            #bkueulogin {
-            float:left;
-            text-align:center;
-            width:33%;
-            min-height: 90px;
-            padding-top: 2%;
-         
-        }
-			
-            .bkuimage {
-            width: 55%;
-            height: auto;
-            margin-bottom: 10%;
-            }
-      
-			#mandate{
-				text-align:left;
-				padding : 5px 5px 5px 5px;
-			}
-      
-/*		input[type=button], .sendButton {
-				background: $BUTTON_BACKGROUNDCOLOR;
-        color: $BUTTON_COLOR;
-/*				border:1px solid #000;  */
-/*				cursor: pointer;
-/*        box-shadow: 3px 3px 3px #222222;  */
-/*			}
+    .setAssertionButton {
+        background: #efefef;
+        cursor: pointer;
+        margin-top: 15px;
+        width: 70px;
+        height: 25px;
+    }
+    #leftcontent {
+        width: 70%;
+        margin-bottom: 4%;
+        text-align: left;
+        border: 1px solid rgb(0,0,0);
+        margin:auto;
+    }
+    .hell {
+        background-color : $MAIN_BACKGOUNDCOLOR;
+        color: $MAIN_COLOR;	
+    }
 			
-/*      button:hover, button:focus, button:active, 
-      .sendButton:hover , .sendButton:focus, .sendButton:active,
-      #mandateCheckBox:hover, #mandateCheckBox:focus, #mandateCheckBox:active {
-				background: $BUTTON_BACKGROUNDCOLOR_FOCUS;
-        color: $BUTTON_COLOR;
-/*				border:1px solid #000;                */
-/*				cursor: pointer;
-/*        box-shadow: -1px -1px 3px #222222;  */
-/*			}
-      
-*/      
-			input {
-				/*border:1px solid #000;*/
-				cursor: pointer;
-			}
-      
-      #localBKU input {
-/*        color: $BUTTON_COLOR;  */
-        /*border: 0px;*/
-        display: inline-block;
+    .dunkel {
+        background-color: $HEADER_BACKGROUNDCOLOR;
+        color: $HEADER_COLOR;
+    }
+    h2#tabheader{
+        font-size: 2.0em; 
+        padding-left: 2%;
+        padding-right: 2%;
+        position: relative;
+    }
+
+
+@media screen and (min-width: 650px) {
+			        
+    #page {
+         width: 650px;
+         height: 460px;		    
+    }
         
+    #localBKU p {
+        font-size: 0.7em;
+    } 
+        
+    #localBKU input{
+        font-size: 0.85em;
+        /*border-radius: 5px;*/
+    }
+
+    #bkuselectionarea input[type=button],#bkuselectionarea input[type=submit]{
+        font-size: 0.85em;
+    }
+
+    #mandateLogin {
+        font-size: 0.85em;
+    }    
+
+    #bku_header h2 {
+        font-size: 0.8em;
+    } 
+
+    #alert_area {
+        width: 500px;
+        padding-left: 80px;
+    }
+
+      #selectArea {
+         font-size: 15px;
+         padding-bottom: 65px;
       }
 			
-      #localBKU input:hover, #localBKU input:focus, #localBKU input:active {
-        /*text-decoration: underline;*/
-      }
-      
-			#installJava, #BrowserNOK {
-				clear:both;
-				font-size:0.8em;
-				padding:4px;
-			}
-						
-			.selectText{
-			
-			}
-			
+    #bku_header {
+        height: 5%;
+        padding-bottom: 2%;
+        padding-top: 2%;
+    }
+              
+    h2#tabheader{
+        font-size: 1.1em; 
+        padding-left: 2%;
+        padding-right: 2%;
+        position: relative;
+    }
+      	
+    #stork h2 {
+        font-size: 1.0em;
+        margin-bottom: 2%;
+    }
+        		  
+    .setAssertionButton_full {
+        background: #efefef;
+        cursor: pointer;
+        margin-top: 15px;
+        width: 100px;
+        height: 30px
+    }
+        
+        button {
+          height: 25px;
+          width: 75px;
+          margin-bottom: 4%;
+        }      
+        
+    #validation {
+        position: absolute;
+        bottom: 0px;
+        margin-left: 270px;
+        padding-bottom: 10px;
+    }			
+}
 
-			.selectTextHeader{
-			
-			}
-			
-			.sendButton {
-        width: 30%;
-        margin-bottom: 1%;	
-			}
-			
-			#leftcontent a {
-				text-decoration:none; 
-				color: #000;
-			/*	display:block;*/
-				padding:4px;	
-			}
-			
-			#leftcontent a:hover, #leftcontent a:focus, #leftcontent a:active {
-				text-decoration:underline;
-				color: #000;	
-			}
-						
-			.infobutton {
-				background-color: #005a00;
-				color: white;
-				font-family: serif;
-				text-decoration: none;
-				padding-top: 2px;
-				padding-right: 4px;
-				padding-bottom: 2px;
-				padding-left: 4px;
-				font-weight: bold;
-			}
-			
-			.hell {
-				background-color : $MAIN_BACKGOUNDCOLOR;
-        color: $MAIN_COLOR;	
-			}
-			
-			.dunkel {
-				background-color: $HEADER_BACKGROUNDCOLOR;
-        color: $HEADER_COLOR;
-			}
-			      
-			.main_header {
-			   color: black;
-			    font-size: 32pt;
-			    position: absolute;
-			    right: 10%;
-			    top: 40px;
+
+
+@media screen and (max-width: 649px) {
 				
-			}
+    body {
+        background-color:#fff;
+    }
+                	  
+    #page {
+        visibility: hidden;
+        margin-top: 0%;
+    }
+			  
+    #page1 {
+        visibility: hidden;
+    }
+			  
+    #main {
+        visibility: hidden;
+    }
+        
+    #validation {
+        visibility: hidden;
+        display: none;
+    }
+			  
+    .OA_header {
+        margin-bottom: 0%;
+        margin-top: 0%;
+        font-size: 0pt;
+        visibility: hidden;
+    }
+			  
+    #alert_area {
+        visibility: visible;
+        width: 250px;
+    }
+    
+    #alert_area > p:first-child {
+        display: none;
+        visibility: hidden;
+    }
+    
+    .mandate{
+        font-size: 1.0em;
+    }
+        
+    #leftcontent {
+        float: left;
+        width:auto;
+        border:none;
+        visibility:visible;
+        margin-bottom: 2%;
+    }
+    .bkuimage {
       
-      #ssoSessionTransferBlock {
-        font-size: 0.8em;
-        margin-left: 5px;
-        margin-bottom: 5px;
-      }
-      #processInfoArea {
-        margin-bottom: 15px;
+        
+    }
+    
+    #bkukarte {
+        box-sizing: border-box;
+    }
+
+    #bkuhandy {
+        box-sizing: border-box;
+    }
+
+    #bkueulogin {
+        box-sizing: border-box;
+    }
+			  
+    #bku_header {
+        height: 10%;
+        min-height: 1.2em;
+        margin-top: 1%;
+    }
+        
+    h2#tabheader{
+        padding-left: 2%;
+        padding-right: 2%;
+        font-size: 1.5em;
+        position: relative;
+    }
+        
+    .setAssertionButton_full {
+        background: #efefef;
+        cursor: pointer;
         margin-top: 15px;
-      }
-      #processSelectionArea {
-        width: 550px;
-        margin-left: 25px;
-        margin-top: 35px;
-      }
-      .processSelectionButtonArea {
-        float: none;
-        margin-bottom: 20px;
-        height: 35px;
-      }
-      .processSelectionButton {
-        background: #ababab;
-				cursor: pointer;
-        height: 30px;
-        width: 200px;
-        float: right;
-        border-style: solid;
-        border-bottom-width: 2px;
-        border-right-width: 2px;
-        border-left-width: 1px;
-        border-top-width: 1px;
-        border-color: #000000;
-      }
-      .buttonDescription {
-        float: left;
-        margin-left: 10px;
-        padding-top: 4px;
-        text-align: left;
-        width: 330px;
-      }
-      #processContent {
-        margin-top: 25px;
-      }
-      #eIDASButton {
-         /*color:#FFF;*/
-      }
-      #eIDASSelection {
-        width: 120px; 
-        margin-right: 5px;        
-      }
-      .unvisible {
-        display: none;
-      }
\ No newline at end of file
+        width: 70px;
+        height: 25px;
+    }
+       
+    input[type=button],input[type=submit] {
+        width: 70%;
+    }
+}      
\ 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
index 01249537f..62f954ada 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -63,7 +63,7 @@
 				        </div>
                 
             
-				        <div id="bkueulogin" style="$STORKVISIBLE">
+				        <div id="bkueulogin" class="$eIDASVisible">
 				            <img class="bkuimage" src="$contextPath/img/eIDAS_small.png" alt="EULogin" />                                                        
                     <form method="get" id="moaidform" action="$contextPath$submitEndpoint" class="verticalcenter" target="_parent">
 								      <input type="hidden" name="useeIDAS" value="true" />
@@ -72,6 +72,7 @@
                       <input name="bkuButtonEULogin" onclick="setMandateSelection();" type="submit" role="button" value="EULogin" />
                     </form>
 				        </div>
+                
 						<!--div id="localBKU">
 							<form method="get" id="moaidform" action="$contextPath$submitEndpoint"
 								class="verticalcenter" target="_parent">
@@ -90,10 +91,7 @@
               <!--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>
diff --git a/id/server/data/deploy/conf/moa-id/keys/sl20.jks b/id/server/data/deploy/conf/moa-id/keys/sl20.jks
new file mode 100644
index 000000000..e1896b9e5
--- /dev/null
+++ b/id/server/data/deploy/conf/moa-id/keys/sl20.jks
diff --git a/id/server/data/deploy/conf/moa-id/log4j.properties b/id/server/data/deploy/conf/moa-id/log4j.properties
index 2c3b8a311..2914fcff1 100644
--- a/id/server/data/deploy/conf/moa-id/log4j.properties
+++ b/id/server/data/deploy/conf/moa-id/log4j.properties
@@ -5,6 +5,7 @@ org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.Log4jFacto
 log4j.rootLogger=warn,stdout
 
 ### MOA-ID process log ###
+log4j.logger.at.gv.egiz.eaaf=info,moaid
 log4j.logger.at.gv.egovernment.moa.id=info,moaid
 log4j.logger.at.gv.egovernment.moa.spss=info,moaid
 
diff --git a/id/server/data/deploy/conf/moa-id/logback_config.xml b/id/server/data/deploy/conf/moa-id/logback_config.xml
index c00e62e52..fa221fbc2 100644
--- a/id/server/data/deploy/conf/moa-id/logback_config.xml
+++ b/id/server/data/deploy/conf/moa-id/logback_config.xml
@@ -8,14 +8,11 @@
 <!--    http://www.qos.ch/shop/products/professionalSupport         -->
 <!--                                                                -->
 <configuration>
-  <!-- Errors were reported during translation. -->
-  <!-- No class found for appender CONFIGTOOL R -->
-  <!-- Could not find transformer for null -->
-  <appender name="R" class="ch.qos.logback.core.rolling.RollingFileAppender">
+  <appender name="moaid" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
     <File>${catalina.base}/logs/moa-id.log</File>
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
+      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} | %t | %m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>1</maxIndex>
@@ -25,14 +22,25 @@
       <MaxFileSize>10000KB</MaxFileSize>
     </triggeringPolicy>
   </appender>
-  <appender name="CONFIGTOOL R">
-    <!--No layout specified for appender named [CONFIGTOOL R] of class [null]-->
+  <appender name="moaspss" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+    <File>${catalina.base}/logs/moa-spss.log</File>
+    <encoder>
+      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} | %t | %m%n</pattern>
+    </encoder>
+    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <maxIndex>1</maxIndex>
+      <FileNamePattern>${catalina.base}/logs/moa-spss.log.%i</FileNamePattern>
+    </rollingPolicy>
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <MaxFileSize>10000KB</MaxFileSize>
+    </triggeringPolicy>
   </appender>
   <appender name="CONFIGTOOL" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
     <File>${catalina.base}/logs/moa-id-webgui.log</File>
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
+      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} | %t | %m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>1</maxIndex>
@@ -42,30 +50,56 @@
       <MaxFileSize>10000KB</MaxFileSize>
     </triggeringPolicy>
   </appender>
+  <appender name="reversion" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+    <File>${catalina.base}/moa-id-reversion.log</File>
+    <encoder>
+      <pattern>%5p | %d{ISO8601} | %t | %m%n</pattern>
+    </encoder>
+    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+      <maxIndex>9999</maxIndex>
+      <FileNamePattern>${catalina.base}/moa-id-reversion.log.%i</FileNamePattern>
+    </rollingPolicy>
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+      <MaxFileSize>10000KB</MaxFileSize>
+    </triggeringPolicy>
+  </appender>
   <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} |%20.20c | %10t | %m%n</pattern>
+      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{sessionId} | %X{transactionId} | %X{oaId} |%20.20c | %10t | %m%n</pattern>
     </encoder>
   </appender>
-  <logger name="eu.stork" level="info"/>
-  <logger name="iaik.server" level="info"/>
-  <logger name="at.gv.egovernment.moa.id" level="info">
-    <appender-ref ref="R"/>
+  <logger name="at.gv.egiz.eaaf" level="info">
+    <appender-ref ref="moaid"/>
+  </logger>
+  <logger name="at.gv.egovernment.moa.spss" level="info">
+    <appender-ref ref="moaspss"/>
+  </logger>
+  <logger name="pki" level="info">
+    <appender-ref ref="moaspss"/>
   </logger>
   <logger name="at.gv.egovernment.moa.id.commons" level="info">
-    <appender-ref ref="CONFIGTOOL R"/>
+    <appender-ref ref="CONFIGTOOL"/>
   </logger>
-  <logger name="org.hibernate" level="warn"/>
-  <logger name="at.gv.egiz.components.configuration" level="info">
+  <logger name="at.gv.egovernment.moa.id.configuration" level="info">
     <appender-ref ref="CONFIGTOOL"/>
   </logger>
-  <logger name="at.gv.egovernment.moa.id.proxy" level="info"/>
+  <logger name="at.gv.egiz.eventlog.plain.all" level="info">
+    <appender-ref ref="reversion"/>
+  </logger>
   <logger name="at.gv.egovernment.moa.id.config.webgui" level="info">
     <appender-ref ref="CONFIGTOOL"/>
   </logger>
-  <logger name="at.gv.egovernment.moa.spss" level="info"/>
-  <logger name="at.gv.egovernment.moa" level="info"/>
-  <root level="info">
+  <logger name="at.gv.egiz.components.configuration" level="info">
+    <appender-ref ref="CONFIGTOOL"/>
+  </logger>
+  <logger name="at.gv.egovernment.moa.id" level="info">
+    <appender-ref ref="moaid"/>
+  </logger>
+  <logger name="iaik.server" level="info">
+    <appender-ref ref="moaspss"/>
+  </logger>
+  <root level="warn">
     <appender-ref ref="stdout"/>
   </root>
 </configuration>
diff --git a/id/server/data/deploy/conf/moa-id/moa-id.properties b/id/server/data/deploy/conf/moa-id/moa-id.properties
index 1db01ba9b..614696628 100644
--- a/id/server/data/deploy/conf/moa-id/moa-id.properties
+++ b/id/server/data/deploy/conf/moa-id/moa-id.properties
@@ -27,11 +27,27 @@ configuration.monitoring.test.identitylink.url=$PATH_TO_CONFIG$/conf/moa-id/moni
 #MOA-ID 3.x Advanced Logging
 configuration.advancedlogging.active=false
 
-#Online mandates webservice (MIS)
+######################## Externe Services ############################################
+
+######## Online mandates webservice (MIS) ######## 
 service.onlinemandates.acceptedServerCertificates=
 service.onlinemandates.clientKeyStore=keys/....
 service.onlinemandates.clientKeyStorePassword=
 
+######## central eIDAS-node connector module ##########
+modules.eidascentralauth.keystore.path=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp[password].p12
+modules.eidascentralauth.keystore.password=password
+modules.eidascentralauth.metadata.sign.alias=pvp_metadata
+modules.eidascentralauth.metadata.sign.password=password
+modules.eidascentralauth.request.sign.alias=pvp_assertion 
+modules.eidascentralauth.request.sign.password=password
+modules.eidascentralauth.response.encryption.alias=pvp_assertion 
+modules.eidascentralauth.response.encryption.password=password 
+modules.eidascentralauth.node.trustprofileID=centralnode_metadata
+
+
+######################## Protokolle am IDP ############################################
+
 ##Protocol configuration##
 #PVP2
 protocols.pvp2.idp.ks.file=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp[password].p12
@@ -51,29 +67,9 @@ protocols.oauth20.jwt.ks.key.name=oauth
 protocols.oauth20.jwt.ks.key.password=password
 
 
-
-######## central eIDAS-node connector module ##########
-modules.eidascentralauth.keystore.path=file:$PATH_TO_CONFIG$/conf/moa-id/keys/moa_idp[password].p12
-modules.eidascentralauth.keystore.password=password
-modules.eidascentralauth.metadata.sign.alias=pvp_metadata
-modules.eidascentralauth.metadata.sign.password=password
-modules.eidascentralauth.request.sign.alias=pvp_assertion 
-modules.eidascentralauth.request.sign.password=password
-modules.eidascentralauth.response.encryption.alias=pvp_assertion 
-modules.eidascentralauth.response.encryption.password=password
- 
-modules.eidascentralauth.node.trustprofileID=centralnode_metadata
-
-##########################################################
-
-
-
-
-
-##Database configuration##
+######################## Datenbankkonfiguration ############################################
 configuration.database.byteBasedValues=false
 
-
 #Hibnerate configuration for MOA-ID 3.x session store 
 moasession.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
 moasession.hibernate.connection.url=jdbc:mysql://localhost/moa-id-session?charSet=utf-8&serverTimezone=UTC
@@ -154,11 +150,38 @@ advancedlogging.dbcp.testWhileIdle=false
 advancedlogging.dbcp.validationQuery=select 1
 
 
-################ Additonal eID-modul configuration ####################################
-##  This additional eID moduls add special functionality to MOA-ID-Auth.
-##  The configuration of this modules is only needed if this modules are in use.
-########
-### eIDAS protocol configuration ###
+################ Additonal eID-modul configuration ################################
+##  This additional eID moduls add special functionality to MOA-ID-Auth.          #
+##  The configuration of this modules is only needed if this modules are in use.  #
+###################################################################################
+
+######## SL2.0 authentication module ######## 
+modules.sl20.vda.urls.qualeID.endpoint.default=https://www.handy-signatur.at/securitylayer2
+modules.sl20.vda.urls.qualeID.endpoint.1=https://hs-abnahme.a-trust.at/securitylayer2
+modules.sl20.vda.urls.qualeID.endpoint.2=https://test1.a-trust.at/securitylayer2
+modules.sl20.security.keystore.path=keys/sl20.jks
+modules.sl20.security.keystore.password=password
+modules.sl20.security.sign.alias=signing
+modules.sl20.security.sign.password=password
+modules.sl20.security.encryption.alias=encryption
+modules.sl20.security.encryption.password=password
+modules.sl20.vda.authblock.id=default
+modules.sl20.vda.authblock.transformation.id=SL20Authblock_v1.0,SL20Authblock_v1.0_SIC
+modules.sl20.security.eID.validation.disable=false
+modules.sl20.security.eID.signed.result.required=true
+modules.sl20.security.eID.encryption.enabled=true
+modules.sl20.security.eID.encryption.required=true
+
+######## user-restriction ##########
+configuration.restrictions.sp.entityIds=
+configuration.restrictions.sp.users.url=
+configuration.restrictions.sp.users.sector=
+
+####### Direkte Fremd-bPK Berechnung ######## 
+configuration.foreignsectors.pubkey.xxxxTargetxxx= xxx BASE64-Cert xxx
+
+######## eIDAS protocol configuration ########
+######## This is ONLY required, if MOA-ID operates as an eIDAS node!!! ########
 moa.id.protocols.eIDAS.samlengine.config.file=eIDAS/SamlEngine_basics.xml
 moa.id.protocols.eIDAS.samlengine.sign.config.file=eIDAS/SignModule.xml
 moa.id.protocols.eIDAS.samlengine.enc.config.file=eIDAS/EncryptModule.xml
@@ -167,7 +190,7 @@ moa.id.protocols.eIDAS.node.country=Austria
 moa.id.protocols.eIDAS.node.countrycode=AT
 moa.id.protocols.eIDAS.node.LoA=http://eidas.europa.eu/LoA/high
 
-### HBV Mandate-Service client module ###
+######## HBV Mandate-Service client module ########
 modules.elga_mandate.nameID.target=urn:publicid:gv.at:cdid+GH
 modules.elga_mandate.service.metadata.trustprofileID=
 modules.elga_mandate.service.mandateprofiles=
@@ -180,7 +203,7 @@ modules.elga_mandate.request.sign.password=password
 modules.elga_mandate.response.encryption.alias=pvp_assertion
 modules.elga_mandate.response.encryption.password=password
 
-### SSO Interfederation client module ###
+######## SSO Interfederation client module ########
 modules.federatedAuth.keystore.path=keys/moa_idp[password].p12
 modules.federatedAuth.keystore.password=password
 modules.federatedAuth.metadata.sign.alias=pvp_metadata
@@ -190,8 +213,8 @@ modules.federatedAuth.request.sign.password=password
 modules.federatedAuth.response.encryption.alias=pvp_assertion
 modules.federatedAuth.response.encryption.password=password
 
-#Redis Settings, if Redis is used as a backend for session data.
-#has to be enabled with the following parameter
+######## Redis Settings, if Redis is used as a backend for session data.
+#        has to be enabled with the following parameter
 #redis.active=true
 redis.use-pool=true
 redis.host-name=localhost