From a3ca0f27acf98669a8350de411fb4eeca40a0ff9 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 10 Jul 2019 09:47:29 +0200
Subject: [PATCH] Use new common Layout for all pages now.

---
 app/static/images/logo_dfg.png                   | Bin 0 -> 2701 bytes
 app/templates/auth/login.html.j2                 |   4 ++--
 app/templates/auth/reset_password.html.j2        |   9 +++++++--
 .../auth/reset_password_request.html.j2          |   7 ++++++-
 4 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 app/static/images/logo_dfg.png

diff --git a/app/static/images/logo_dfg.png b/app/static/images/logo_dfg.png
new file mode 100644
index 0000000000000000000000000000000000000000..410208cc34480ef6d0b35e4fb215e62f1fd8f6fd
GIT binary patch
literal 2701
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
Hu0mjfc}X_s

literal 0
HcmV?d00001

diff --git a/app/templates/auth/login.html.j2 b/app/templates/auth/login.html.j2
index 45569d22..09d995d4 100644
--- a/app/templates/auth/login.html.j2
+++ b/app/templates/auth/login.html.j2
@@ -3,7 +3,7 @@
 {% block page_content %}
 <div class="col s12 m4">
   <h3>New to Opaque?</h3>
-  <p>In case you are new to Opaque, you can create a free account at our register page.</p>
+  <p>It's free to join and easy to use. Continue on to our registration page to create your Opaque account.</p>
   <p><a href="{{ url_for('auth.register') }}" class="waves-effect waves-light btn">Registration</a>
 </div>
 
@@ -28,7 +28,7 @@
             <span class="helper-text" style="color:red;">{{ error }}</span>
           {% endfor %}
         </div>
-        <a href="{{ url_for('auth.password_reset_request') }}" class="left">Forgot Password?</a>
+        <a href="{{ url_for('auth.password_reset_request') }}" class="left">Forgot your password?</a>
         <div class="switch right">
           <label>
             Remember me
diff --git a/app/templates/auth/reset_password.html.j2 b/app/templates/auth/reset_password.html.j2
index 5a3ad381..c4c155b4 100644
--- a/app/templates/auth/reset_password.html.j2
+++ b/app/templates/auth/reset_password.html.j2
@@ -1,8 +1,13 @@
 {% extends "base.html.j2" %}
 
 {% block page_content %}
-<div class="col s12 m8 offset-m2">
-  <div class="card">
+<div class="col s12 m4">
+  <h3>Lorem ipsum</h3>
+  <p>dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,</p>
+</div>
+
+<div class="col s12 m8">
+  <div class="card small">
     <form method="POST">
       <div class="card-content">
         {{ form.hidden_tag() }}
diff --git a/app/templates/auth/reset_password_request.html.j2 b/app/templates/auth/reset_password_request.html.j2
index 23bfdfc2..e28ac3eb 100644
--- a/app/templates/auth/reset_password_request.html.j2
+++ b/app/templates/auth/reset_password_request.html.j2
@@ -1,7 +1,12 @@
 {% extends "base.html.j2" %}
 
 {% block page_content %}
-<div class="col s12">
+<div class="col s12 m4">
+  <h3>Lost password?</h3>
+  <p>After entering your email address you will get an email with instruchtions about how to reset your password.</p>
+</div>
+
+<div class="col s12 m8">
   <div class="card small">
     <form method="POST">
       <div class="card-content">