From c4a5a0f4b668ab4ae075f6cee572d78e50dff7eb Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Fri, 26 Feb 2016 15:46:05 +0100
Subject: Reorder the login form

---
 index.html  | 15 ++++++++-------
 res/en.json |  3 +--
 res/sl.json |  3 +--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index 03c7614..0296f61 100644
--- a/index.html
+++ b/index.html
@@ -107,13 +107,6 @@
                             <h3 class="text-center" data-tkey="signin_header">Please sign in</h3>
                         </div>
                         <div class="panel-body"><!--class="modal-body"-->
-                            <span data-tkey="signin_via">Login via</span>
-                            <div class="ssa-buttons">
-                                <a href="" class="ssa-buttons" role="button" id="aai_login_button">
-                                    <img src="res/gumb_aaiprijava.png" style="width: 49%">
-                                </a>
-                            </div>
-                            <span data-tkey="signin_or">or</span>
                             <form class="form" role="form" method="post" action="login" accept-charset="UTF-8" id="login-form">
                                 <div class="form-group">
                                     <label class="sr-only" for="username" data-tkey="username">Username</label>
@@ -136,6 +129,14 @@
                                 <div class="login-failed" data-tkey="login_failed" style="display: none;">Login failed.</div>
                             </form>
                         </div>
+                        <div class="panel-body"><!--class="modal-body"-->
+                            <div class="text-center">
+                                <span data-tkey="signin_via">Or you can login via</span><br />
+                                <a href="" role="button" id="aai_login_button">
+                                    <img src="res/gumb_aaiprijava.png" style="width: 49%">
+                                </a>
+                            </div>
+                        </div>
                         <div class="panel-footer"><!-- class="modal-footer"-->
                             <div class="text-center">
                                 <span data-tkey="signin_footer">New here?</span> <a href="" role="button" id="signup_button"><b data-tkey="signin_footer_signup">Sign up!</b></a>
diff --git a/res/en.json b/res/en.json
index 364dfbd..be6c330 100644
--- a/res/en.json
+++ b/res/en.json
@@ -25,8 +25,7 @@
   "code": "Code",
   "console": "Console",
   "signin_header": "Please sign in",
-  "signin_via": "Login via",
-  "signin_or": "or",
+  "signin_via": "Or you can login via",
   "signin_button": "Sign in",
   "login_failed": "Login failed.",
   "signin_footer": "New here?",
diff --git a/res/sl.json b/res/sl.json
index a9032ef..78646f9 100644
--- a/res/sl.json
+++ b/res/sl.json
@@ -25,8 +25,7 @@
   "code": "Program",
   "console": "Konzola",
   "signin_header": "Prijava",
-  "signin_via": "Prijava prek",
-  "signin_or": "ali",
+  "signin_via": "Lahko pa se prijaviš prek",
   "signin_button": "Prijavi se",
   "login_failed": "Prijava ni uspela.",
   "signin_footer": "Nov tukaj?",
-- 
cgit v1.2.1