From 7315bd2e79fe16cf13059408489050ca3450e578 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 5 Dec 2013 12:13:39 +0100
Subject: reactivated stork in default login template

---
 id/server/auth/src/main/webapp/info_stork.html     |  4 +-
 .../resources/templates/loginFormFull.html         | 51 +++++++++-------------
 2 files changed, 21 insertions(+), 34 deletions(-)

(limited to 'id')

diff --git a/id/server/auth/src/main/webapp/info_stork.html b/id/server/auth/src/main/webapp/info_stork.html
index 3bd88300c..2bdf62711 100644
--- a/id/server/auth/src/main/webapp/info_stork.html
+++ b/id/server/auth/src/main/webapp/info_stork.html
@@ -28,16 +28,14 @@
                 </div>
             </div>
             <div id="main">
-                <div id="centercontent">
                     <h2 id="contentheader" class="dunkel">
                         Information using STORK for secure authentication
                     </h2>
                     <div id="content" class="hell">
                         
                         <p>The STORK project makes it easier for citizens to access online public services across borders by implementing Europe-wide interoperable cross border platforms for the mutual recognition of national electronic identity (eID) between participating countries.</p>
-                        <p>For more information, please consult the STORK website:</p><a href="https://www.eid-stork.eu/">https://www.eid-stork.eu/</a>
+                        <p>For more information, please consult the STORK website:</p><a href="https://www.eid-stork2.eu/">https://www.eid-stork2.eu/</a>
 					</div>
-                </div>
             </div>
 		</div>
 	</body>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
index 801a2dbf1..f25e7129a 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
@@ -424,11 +424,6 @@
 				text-align: right;
 			}
 			
-			#stork {
-			    margin-bottom: 10px;
-			    margin-top: 5px;
-			}
-			
       #mandateLogin {
         padding-bottom: 4%;
         padding-top: 4%;
@@ -812,32 +807,26 @@
                   </p-->								                                  
                 </form>								                                                          
               </div>
-                                                 
-              <!--							<div id="stork" align="center">
-                                          								<div id="leftcontent" style="margin-bottom:10px">
-                                          									<h2 id="tabheader" class="dunkel">
-                                          										Home Country Selection
-                                          									</h2>
-                                          								</div>
-                                          								<p>
-                                          									<select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
-                                          										<option value="BE">Belgi&euml;/Belgique</option>
-                                          										<option value="EE">Eesti</option>
-                                          										<option value="ES">Espa&ntilde;a</option>
-                                          										<option value="IS">&Iacute;sland</option>
-                                          										<option value="IT">Italia</option>
-                                          										<option value="LI">Liechtenstein</option>
-                                          										<option value="LT">Lithuania</option>
-                                          										<option value="PT">Portugal</option>
-                                          										<option value="SI">Slovenija</option>
-                                          										<option value="FI">Suomi</option>
-                                          										<option value="SE">Sverige</option>
-                                          									</select>
-                                          									<button name="bkuButton" type="button" onClick="storkClicked();">Send</button>
-                                          									<a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>								
-                                          								</p>
-                                          							</div>
-                                          						</div>  -->
+              <div id="stork" align="center">
+                <h2 id="tabheader" class="dunkel">Home Country Selection</h2>
+                <p>
+                  <select name="cccSelection" id="cccSelection" size="1" style="width: 120px; margin-right: 5px;" >
+                    <option value="BE">Belgi&euml;/Belgique</option>
+                    <option value="EE">Eesti</option>
+                    <option value="ES">Espa&ntilde;a</option>
+                    <option value="IS">&Iacute;sland</option>
+                    <option value="IT">Italia</option>
+                    <option value="LI">Liechtenstein</option>
+                    <option value="LT">Lithuania</option>
+                    <option value="PT">Portugal</option>
+                    <option value="SI">Slovenija</option>
+                    <option value="FI">Suomi</option>
+                    <option value="SE">Sverige</option>
+                  </select>
+                  <button name="bkuButton" type="button" onClick="storkClicked();">Proceed</button>
+                  <a href="info_stork.html" target="_blank" class="infobutton" style="color:#FFF">i</a>
+                </p>
+              </div>
                                                          						                              
                 <div id="metroDetected" style="display:none">							                                  
                 <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. 							                                  
-- 
cgit v1.2.3