Move Events block before user rename/id block

Events block will probably be used more often, so this will result in
less scrolling.

diff --git a/templates/user.html b/templates/user.html
index 0a8597bd70a2f100889caabeba985ca8a4751427..f878f0c7607ded6888595360dcc8f34f8ed5fca9 100644 (file)
--- a/templates/user.html
+++ b/templates/user.html
@@ -31,6 +31,9 @@
 }
 </style>
 
+{###############}
+{# Graphs etc. #}
+{###############}
 {% if name %}
     <form style="position: absolute; right: 15%; width: 15%; height: 15%;">
         <button type="button" id="logout_button" onclick="logout()" style="width: 100%; height: 100%;">logout</button>
@@ -77,34 +80,6 @@
         </form>
         {% endif %}
     </p>
-    <br />
-    <p>
-        <form>
-            <label for="username">Username:</label>
-            <input id="username" type="text" name="name">
-            <input type="button" value="rename" onclick="renameUser()">
-        </form>
-    </p>
-    <form>
-        <table style="padding: 2px">
-            <tr>
-                <td colspan="4" align="center"><b>Identifiers:</b></td>
-            </tr>
-            {% for id in identifiers %}
-            <tr>
-                <td><input type="text" id="identifier_name_{{ loop.index }}" value="{{ id[2] }}" /></td>
-                <td {% if iid == id[1] %} style="font-weight: bold" {% endif %}>#<span id="identifier_{{ loop.index }}">{{ id[1] }}</span></td>
-                <td><input type="button" value="rename" onclick="renameIdentifier({{ loop.index }})" /></td>
-                <td><input type="button" value="remove" onclick="disableIdentifier('{{ id[1] }}')" /></td>
-            </tr>
-            {% endfor %}
-            <tr>
-                <td><input type="button" id="addIdentifier" value="add identifier" onclick="addIdentifier_start()" /></td>
-                <td colspan="2" style="visibility: hidden" id="labelIdentifier"><b>Use your identifier.</b></td>
-                <td><input type="button" id="abortIdentifier" value="abort" disabled onclick="addIdentifier_finish()" /></td>
-            </tr>
-        </table>
-    </form>
 {% else %}
     <p>Use your card/token to log in...</p>
 
@@ -112,6 +87,9 @@
     <img src="{{ url_for('coffee_graph_flavors', _external=True, stamp=stamp, days=7) }}">
 {% endif %}
 
+{##########}
+{# Events #}
+{##########}
     <br />
     <form>
       {%- macro event_box(title, events) -%}
@@ -153,3 +131,37 @@
         {{ event_box('milk container', ['MILK_CONTAINER_CLEANED', 'MILK_CONTAINER_CLEANED_WITH_TABLET'] ) }}
       </div>
     </form>
+
+{##################################}
+{# User name and chip idnetifiers #}
+{##################################}
+{% if name %}
+    <br />
+    <p>
+        <form>
+            <label for="username">Username:</label>
+            <input id="username" type="text" name="name">
+            <input type="button" value="rename" onclick="renameUser()">
+        </form>
+    </p>
+    <form>
+        <table style="padding: 2px">
+            <tr>
+                <td colspan="4" align="center"><b>Identifiers:</b></td>
+            </tr>
+            {% for id in identifiers %}
+            <tr>
+                <td><input type="text" id="identifier_name_{{ loop.index }}" value="{{ id[2] }}" /></td>
+                <td {% if iid == id[1] %} style="font-weight: bold" {% endif %}>#<span id="identifier_{{ loop.index }}">{{ id[1] }}</span></td>
+                <td><input type="button" value="rename" onclick="renameIdentifier({{ loop.index }})" /></td>
+                <td><input type="button" value="remove" onclick="disableIdentifier('{{ id[1] }}')" /></td>
+            </tr>
+            {% endfor %}
+            <tr>
+                <td><input type="button" id="addIdentifier" value="add identifier" onclick="addIdentifier_start()" /></td>
+                <td colspan="2" style="visibility: hidden" id="labelIdentifier"><b>Use your identifier.</b></td>
+                <td><input type="button" id="abortIdentifier" value="abort" disabled onclick="addIdentifier_finish()" /></td>
+            </tr>
+        </table>
+    </form>
+{% endif %}