Rework UI: present menus on the left, content on the right.

1 files changed, 6 insertions, 27 deletions

diff --git a/uploader/templates/login.html b/uploader/templates/login.html
index 6ebf72e..bbca42f 100644
--- a/uploader/templates/login.html
+++ b/uploader/templates/login.html
@@ -1,32 +1,11 @@
-{%extends "base.html"%}
-{%from "flash_messages.html" import flash_all_messages%}
+{%extends "index.html"%}
 
 {%block title%}Data Upload{%endblock%}
 
-{%block contents%}
-<div class="row">
-  {{flash_all_messages()}}
-
-  <h1 class="heading">log in</h1>
-
-  <div class="explainer">
-    <p>
-      This system enables you to upload data onto GeneNetwork. In order to do
-      that correctly, we need to know who you are.</p>
-    <p>
-      If you already have an account with GeneNetwork, you can simply click the
-      login button below, after which you can upload your data.<br />
-    </p>
-    <a href="{{authserver_authorise_uri()}}" class="btn btn-primary"
-       style="display:block;width:15em;align:center;margin:1em 3em;">
-          log in</a>
-    <p>
-      If you do not have an account with GeneNetwork, go to
-      <a href="{{gn2server_uri()}}"
-         title="GeneNetwork Service."
-         target="_blank">GeneNetwork</a>
-      and register for an account, then come back here to login and upload.</a>
-  </div>
-</div>
+{%block pagetitle%}log in{%endblock%}
 
+{%block extrapageinfo%}
+<p>
+  You <strong>do need to be logged in</strong> to upload data onto this system.
+  Please do that by clicking the "Log In" button at the top of the page.</p>
 {%endblock%}