From 9e75e05583b9ae07e86438c63bcc2dc22be05fea Mon Sep 17 00:00:00 2001
From: Robert Zorko <robertz@gurucue.com>
Date: Thu, 15 Oct 2015 11:19:25 +0200
Subject: AAI login is moved to its own screen and js file

---
 index.html | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

(limited to 'index.html')

diff --git a/index.html b/index.html
index ae7ff38..31e6540 100644
--- a/index.html
+++ b/index.html
@@ -100,7 +100,7 @@
                             <div class="col-md-12">
                                 <span data-tkey="signin_via">Login via</span>
                                 <div class="ssa-buttons">
-                                    <a href="#" class="ssa-buttons" role="button" data-dismiss="modal" data-toggle="modal" data-target="#modalAAI">
+                                    <a href="" class="ssa-buttons" role="button" data-dismiss="modal" data-toggle="modal" data-target="#modalAAI" id="aai_login_button">
                                         <img src="res/gumb_aaiprijava.png" style="width: 49%">
                                     </a>
                                 </div>
@@ -139,6 +139,21 @@
             </div>
         </div>
 
+        <!-- AAI login -->
+        <div class="container" id="screen_aai_login" style="display: none;">
+            <div class="container">
+                <div class="row">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" data-toggle="modal" data-target="#modalLogIn" id="cancel_aai_login">×</button>
+                    <h3 class="text-center">Arnes AAI</h3>
+                </div>
+            </div>
+            <div class="container">
+                <div class="row" style="padding: 0; padding-top: 5px;">
+                    <iframe width="100%" height="850px"  frameborder="0" scrolling="no" allowtransparency="true" src="https://codeq.si/Shibboleth.sso/Login?forceAuthn=1"></iframe>
+                </div>
+            </div>
+        </div>
+
         <!--Sign up screen-->
         <div class="container" id="screen_signup" style="display: none;">
             <div class="modal-dialog modal-sm">
@@ -381,7 +396,7 @@
         </div><!--container-->
 
         <!-- Modals -->
-        <div id="modalAAI" class="modal fade in" tabindex="-1" role="dialog" aria-hidden="false" data-keyboard="false" data-backdrop="static" style="display: none;">
+        <!--div id="modalAAI" class="modal fade in" tabindex="-1" role="dialog" aria-hidden="false" data-keyboard="false" data-backdrop="static" style="display: none;">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
@@ -391,9 +406,9 @@
                     <div class="modal-body" style="padding: 0;">
                         <iframe width="100%" height="500px" frameborder="0" scrolling="no" allowtransparency="true" src="https://codeq.si/Shibboleth.sso/Login?forceAuthn=1"></iframe>
                     </div>
-                </div><!-- /.modal-content -->
-            </div><!-- /.modal-dialog -->
-        </div><!-- /.modal -->
+                </div>
+            </div>
+        </div-->
 
         <!-- Covers the whole screen with a semi-transparent block, so no input events can be triggered below.
              Used as a wait screen; must be the last element in the DOM.
@@ -431,6 +446,7 @@
         <script src="js/codeq/robot.js"></script>
         <script src="js/codeq/signup.js"></script>
         <script src="js/codeq/login.js"></script>
+        <script src="js/codeq/aaiLogin.js"></script>
         <script src="js/codeq/change_password.js"></script>
         <script src="js/codeq/profile.js"></script>
         <script src="js/codeq/language.js"></script>
-- 
cgit v1.2.1