diff options
| author | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2019-03-18 16:16:58 +0000 |
|---|---|---|
| committer | Gertjan van den Burg <gertjanvandenburg@gmail.com> | 2019-03-18 16:16:58 +0000 |
| commit | ce1fe100a2dc0aa0baada3c8f214d787333148ea (patch) | |
| tree | ea5924fb67dd24bebab03a56d372df4692936e24 /app/templates | |
| parent | add errors, email, and reset password (diff) | |
| download | AnnotateChange-ce1fe100a2dc0aa0baada3c8f214d787333148ea.tar.gz AnnotateChange-ce1fe100a2dc0aa0baada3c8f214d787333148ea.zip | |
use bootstrap
Diffstat (limited to 'app/templates')
| -rw-r--r-- | app/templates/404.html | 2 | ||||
| -rw-r--r-- | app/templates/500.html | 2 | ||||
| -rw-r--r-- | app/templates/base.html | 59 | ||||
| -rw-r--r-- | app/templates/index.html | 2 | ||||
| -rw-r--r-- | app/templates/login.html | 2 | ||||
| -rw-r--r-- | app/templates/register.html | 42 | ||||
| -rw-r--r-- | app/templates/reset_password.html | 28 | ||||
| -rw-r--r-- | app/templates/reset_password_request.html | 20 |
8 files changed, 67 insertions, 90 deletions
diff --git a/app/templates/404.html b/app/templates/404.html index 7dde47e..51295c4 100644 --- a/app/templates/404.html +++ b/app/templates/404.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block content %} +{% block app_content %} <h1>Page Not Found</h1> <p><a href="{{ url_for('index') }}">Home</p> {% endblock %} diff --git a/app/templates/500.html b/app/templates/500.html index ca8830c..adda72b 100644 --- a/app/templates/500.html +++ b/app/templates/500.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block content %} +{% block app_content %} <h1>An unexpected error has occurred</h1> <p>The administrator has been notified, apologies for the inconvenience.</p> <p><a href="{{ url_for('index') }}">Home</p> diff --git a/app/templates/base.html b/app/templates/base.html index 3070587..ee03e3d 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -1,21 +1,39 @@ -<html> - <head> - {% if title %} - <title>{{ title }} - Annotate Change</title> - {% else %} - <title>Welcome to Annotate Change</title> - {% endif %} - </head> - <body> - <div>Annotate Change: - <a href="{{ url_for('index') }}">Home</a> - {% if current_user.is_anonymous %} - <a href="{{ url_for('login') }}">Login</a> - {% else %} - <a href="{{ url_for('logout') }}">Logout</a> - {% endif %} +{% extends 'bootstrap/base.html' %} + +{% block title %} + {% if title %}{{ title }} -- AnnotateChange{% else %}Welcome to AnnotateChange{% endif %} +{% endblock %} + +{% block navbar %} + <nav class="navbar navbar-default"> + <div class="container"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand" href="{{ url_for('index') }}">AnnotateChange</a> + </div> + <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> + <ul class="nav navbar-nav"> + <li><a href="{{ url_for('index') }}">Home</a></li> + </ul> + <ul class="nav navbar-nav navbar-right"> + {% if current_user.is_anonymous %} + <li><a href="{{ url_for('login') }}">Login</a></li> + {% else %} + <li><a href="{{ url_for('logout') }}">Logout</a></li> + {% endif %} + </ul> + </div> </div> - <hr> + </nav> +{% endblock %} + +{% block content %} + <div class="container"> {% with messages = get_flashed_messages() %} {% if messages %} <ul> @@ -25,7 +43,8 @@ </ul> {% endif %} {% endwith %} - {% block content %} + + {% block app_content %} {% endblock %} - </body> -</html> + </div> +{% endblock %} diff --git a/app/templates/index.html b/app/templates/index.html index 3cf36ee..7c6793a 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block content %} +{% block app_content %} <h1>Hi, {{ current_user.username }}!</h1> {% endblock %} diff --git a/app/templates/login.html b/app/templates/login.html index 4d5181b..9b862f6 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block content %} +{% block app_content %} <h1>Sign In</h1> <form action="" method="post" novalidate> {{ form.hidden_tag() }} diff --git a/app/templates/register.html b/app/templates/register.html index 487b860..c430b38 100644 --- a/app/templates/register.html +++ b/app/templates/register.html @@ -1,37 +1,11 @@ {% extends "base.html" %} +{% import 'bootstrap/wtf.html' as wtf %} -{% block content %} - <h1>Register</h1> - <form action="" method="post"> - {{ form.hidden_tag() }} - <p> - {{ form.username.label }}<br> - {{ form.username(size=32) }}<br> - {% for error in form.username.errors %} - <span style="color: red;">[{{ error }}]</span> - {% endfor %} - </p> - <p> - {{ form.email.label }}<br> - {{ form.email(size=64) }}<br> - {% for error in form.email.errors %} - <span style="color: red;">[{{ error }}]</span> - {% endfor %} - </p> - <p> - {{ form.password.label }}<br> - {{ form.password(size=32) }}<br> - {% for error in form.password.errors %} - <span style="color: red;">[{{ error }}]</span> - {% endfor %} - </p> - <p> - {{ form.password2.label }}<br> - {{ form.password2(size=32) }}<br> - {% for error in form.password2.errors %} - <span style="color: red;">[{{ error }}]</span> - {% endfor %} - </p> - <p>{{ form.submit() }}</p> - </form> +{% block app_content %} +<h1>Register</h1> +<div class="row"> + <div class="col-md-4"> + {{ wtf.quick_form(form) }} + </div> +</div> {% endblock %} diff --git a/app/templates/reset_password.html b/app/templates/reset_password.html index da3aa95..cab00c9 100644 --- a/app/templates/reset_password.html +++ b/app/templates/reset_password.html @@ -1,23 +1,11 @@ {% extends "base.html" %} +{% import 'bootstrap/wtf.html' as wtf %} -{% block content %} - <h1>Reset Your Password</h1> - <form action="" method="post"> - {{ form.hidden_tag() }} - <p> - {{ form.password.label }}<br> - {{ form.password(size=32) }}<br> - {% for error in form.password.errors %} - <span stle="color: red;">[{{ error }}]</span> - {% endfor %} - </p> - <p> - {{ form.password2.label }}<br> - {{ form.password2(size=32) }}<br> - {% for error in form.password2.errors %} - <span stle="color: red;">[{{ error }}]</span> - {% endfor %} - </p> - <p>{{ form.submit() }}</p> - </form> +{% block app_content %} +<h1>Reset Your Password</h1> +<div class="row"> + <div class="col-md-4"> + {{ wtf.quick_form(form) }} + </div> +</div> {% endblock %} diff --git a/app/templates/reset_password_request.html b/app/templates/reset_password_request.html index 914c593..c516141 100644 --- a/app/templates/reset_password_request.html +++ b/app/templates/reset_password_request.html @@ -1,15 +1,11 @@ {% extends "base.html" %} +{% import 'bootstrap/wtf.html' as wtf %} -{% block content %} - <h1>Reset Password</h1> - <form action="" method="post"> - {{ form.hidden_tag() }} - <p> - {{ form.email.label }}<br> - {{ form.email(size=64) }}<br> - {% for error in form.email.errors %} - <span style="color: red;">[{{ error }}]</span> - {% endfor %} - </p> - </form> +{% block app_content %} +<h1>Reset Password</h1> +<div class="row"> + <div class="col-md-4"> + {{ wtf.quick_form(form) }} + </div> +</div> {% endblock %} |