sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-24 10:34:17 +00:00
Code Issues Projects Releases Wiki Activity

Update page layout.

Browse Source
This commit is contained in:
Patrick Jentsch 2019-07-09 16:59:04 +02:00
parent c15ac55fe3
commit 93b67cb297
8 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/auth/views.py
View File

@ -105,7 +105,7 @@ def password_reset_request():
flash('An email with instructions to reset your password has been '
'sent to you.')
return redirect(url_for('auth.login'))
return render_template('auth/reset_password.html.j2', form=form,
return render_template('auth/reset_password_request.html.j2', form=form,
title='Password Reset')

2
app/main/views.py
View File

@ -6,7 +6,7 @@ from flask_login import login_required
@main.route('/')
def index():
return render_template('main/index.html.j2')
return render_template('main/index.html.j2', title='Portal')
@main.route('/admin')

28
app/templates/auth/login.html.j2
View File

@ -1,30 +1,20 @@
{% extends "base.html.j2" %}
{% block page_content %}
<div class="col s12 m6">
<div class="card medium">
<div class="card-image">
<img src="{{ url_for('static', filename='images/favicon.png') }}" alt="">
<span class="card-title grey-text text-darken-4">Welcome to Opaque!</span>
</div>
<div class="card-content">
<p>Sign in into an exisiting account or register a new one!</p>
</div>
<div class="card-action">
<a class="btn" href="{{url_for('auth.register')}}">Register</a>
</div>
</div>
<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><a href="{{ url_for('auth.register') }}" class="waves-effect waves-light btn">Registration</a>
</div>
<div class="col s12 m6">
<div class="card medium">
<div class="col s12 m8">
<div class="card small">
<form method="POST">
<div class="card-content">
<span class="card-title">Log In</span>
{{ form.hidden_tag() }}
<div class="input-field">
<i class="material-icons prefix">person</i>
{{ form.login(class='validate') }}
{{ form.login(class='validate', placeholder='Email address or username') }}
{{ form.login.label }}
{% for error in form.login.errors %}
<span class="helper-text" style="color:red;">{{ error }}</span>
@ -38,14 +28,14 @@
<span class="helper-text" style="color:red;">{{ error }}</span>
{% endfor %}
</div>
<div class="switch left">
<a href="{{ url_for('auth.password_reset_request') }}" class="left">Forgot Password?</a>
<div class="switch right">
<label>
Remember me
{{ form.remember_me() }}
<span class="lever"></span>
</label>
</div>
<a href="{{ url_for('auth.password_reset_request') }}" class="right">Forgot Password?</a>
</div>
<div class="card-action">
{{ form.submit(class='btn right') }}

10
app/templates/auth/register.html.j2
View File

@ -1,14 +1,18 @@
{% extends "base.html.j2" %}
{% block page_content %}
<div class="col s12">
<div class="col s12 m4">
<h3>&nbsp;</h3>
<img src="{{ url_for('static', filename='images/logo_sfb_1288.png') }}" class="responsive-img">
</div>
<div class="col s12 m8">
<div class="card">
<form method="POST">
<div class="card-content">
<span class="card-title">Register</span>
{{ form.hidden_tag() }}
<div class="input-field">
<i class="material-icons prefix">account_circle</i>
<i class="material-icons prefix">person</i>
{{ form.username(class='validate') }}
{{ form.username.label }}
{% for error in form.username.errors %}

1
app/templates/auth/reset_password.html.j2
View File

@ -5,7 +5,6 @@
<div class="card">
<form method="POST">
<div class="card-content">
<span class="card-title">Reset Your Password</span>
{{ form.hidden_tag() }}
<div class="input-field">
{{ form.email(class='validate', type='email') }}

23
app/templates/auth/reset_password_request.html.j2 Normal file
View File

@ -0,0 +1,23 @@
{% extends "base.html.j2" %}
{% block page_content %}
<div class="col s12">
<div class="card small">
<form method="POST">
<div class="card-content">
{{ form.hidden_tag() }}
<div class="input-field">
{{ form.email(class='validate', type='email') }}
{{ form.email.label }}
{% for error in form.email.errors %}
<span class="helper-text" style="color:red;">{{ error }}</span>
{% endfor %}
</div>
</div>
<div class="card-action">
{{ form.submit(class='btn right') }}
</div>
</form>
</div>
</div>
{% endblock %}

7
app/templates/auth/settings.html.j2
View File

@ -1,14 +1,9 @@
{% extends "base.html.j2" %}
{% block page_content %}
<div class="col s12">
<h2>Settings</h2>
<p>&nbsp;</p>
</div>
<div class="col s12 m4">
<h3>Account</h3>
<p>Lo-fi you probably haven't heard of them etsy leggings raclette kickstarter four dollar toast. Raw denim fingerstache food truck chia health goth synth. Forage man bun intelligentsia freegan PBR&B banh mi asymmetrical chambray.</p>
<p>Lorem ipsum 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">

14
app/templates/base.html.j2
View File

@ -28,9 +28,7 @@
</ul>
<nav>
<div class="nav-wrapper">
<a href="#!" class="brand-logo">
{% if title %}{{ title }}{% else %}Opaque{% endif %}
</a>
<a href="{{ url_for('main.index') }}" class="brand-logo"><i class="material-icons">cloud</i> Opaque</a>
<a href="#" data-target="slide-out" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<ul class="right hide-on-med-and-down">
<li><a id="nav-notifications" class="dropdown-trigger" href="#!" data-target="nav-notifications-dropdown"><i class="material-icons">notifications</i></a></li>
@ -48,6 +46,16 @@
<main class="grey lighten-5">
<div class="container">
<div class="row">
<div class="col s12">
<h2>
{% if title %}
{{ title }}
{% else %}
Unnamed page
{% endif %}
</h2>
<p>&nbsp;</p>
</div>
{% block page_content %}
{% endblock %}
</div>