restructure page layout

OpenConext · Sep 17, 2015 · b0ca6ef · b0ca6ef
1 parent c57126d
commit b0ca6ef
Showing 1 changed file with 25 additions and 19 deletions.
diff --git a/www/tiqr/views/index.html b/www/tiqr/views/index.html
@@ -41,34 +41,40 @@
 {% include "localeform.html" %}
     <h2>{{ 'login.title' | trans }}</h2>
 
-<p>
     {% if id %}
         <!-- logging in with tiqr id {{ id }}-->
         {{ 'login.push.message' | trans }}
         <ul>
             <li>{{ 'login.push.instructions.1' | trans }}</li>
             <li>{{ 'login.push.instructions.2' | trans }}</li>
-    </ul>
-    <br/>
-    <img class="qr" src='qr' style="cursor: none; display: none" />
+        </ul>
+        <br/>
+        {{ 'login.push.fail' | trans({'%link_start%': '<a class="scan" href="#">', '%link_end%': '</a>'}) | raw  }}
+    {% else %}
+        {{ 'login.qr.message' | trans }}
+        <br/>
+    {% endif %}
+
     <br/>
-    {{ 'login.push.fail' | trans({'%link_start%': '<a class="scan" href="#">', '%link_end%': '</a>'}) | raw  }}
-{% else %}
-    {{ 'login.qr.message' | trans }}
-            <br/>
-            <a href="{{authUrl}}"><img class="qr" src='qr' style="cursor: none;" /></a>
-            <p>{{ 'login.qr.manual.message' | trans({'%link_start%': '<a href="#" onClick="javascript:jQuery(\'#otpform\').slideToggle();">', '%link_end%': '</a>'}) | raw }}</p>
-            <div id="otpform" style="display:none">
-            <form method=POST>
-            <p>{{ 'login.qr.manual.userid' | trans }}: <input type=text name=userID>
-            {{ 'login.qr.manual.otp' | trans }}: <input type=text name=otp>
-            <input type=submit value="{{ 'login.qr.manual.button' | trans }}"></p>
-            </form>
-            </div>
+    <a href="{{authUrl}}">
+        <img class="qr" src='qr' style="cursor: none;" />
+    </a>
+
+    <p>
+        {{ 'login.qr.manual.message' | trans({'%link_start%': '<a href="#" onClick="javascript:jQuery(\'#otpform\').slideToggle();">', '%link_end%': '</a>'}) | raw }}
+    </p>
+    <div id="otpform" style="display:none">
+        <form method=POST>
             <p>
+                {% if not id %}
+                {{ 'login.qr.manual.userid' | trans }}: <input type="text" tabindex="2" name="userID"/>
+                {% endif %}
+                {{ 'login.qr.manual.otp' | trans }}: <input type="text" name="otp" tabindex="3"/>
+                <input type="submit" value="{{ 'login.qr.manual.button' | trans }}"/>
+            </p>
+        </form>
+    </div>
 
-{% endif %}
-</p>
     <script>
         $(function(){
             $('a.scan').click(function(){