Conventions and formatting

This commit is contained in:
Jordan Stremming
2019-03-22 13:00:03 -05:00
parent f39f470f8a
commit 3a87e2ab56
5 changed files with 28 additions and 55 deletions

View File

@@ -27,7 +27,7 @@ def profile():
return render_template('main/profile.jinja2')
@main_blueprint.route('/signed-out')
@main_blueprint.route('/user/signed-out')
def signed_out():
"""Sign out landing page"""
return render_template('main/signed_out.jinja2')
return render_template('flask_user/signed_out.html')

View File

@@ -12,8 +12,6 @@
</style>
{% endblock %}
{% block content_before %}
<div class="container-fluid h-100">
<div class="row h-100 justify-content-center align-items-center">
@@ -27,7 +25,6 @@
</div>
<div class="card-body d-flex flex-column m-2">
{% with messages = get_flashed_messages() %}
<h3 {% if not messages %}class="mb-4"{% endif %}>
@@ -35,11 +32,13 @@
</h3>
{# Show any errors #}
{% for message in messages %}
<div class="alert alert-warning" role="alert">
{{ message }}
</div>
{% endfor %}
{% if not disable_messages %}
{% for message in messages %}
<div class="alert alert-warning" role="alert">
{{ message }}
</div>
{% endfor %}
{% endif %}
{% endwith %}

View File

@@ -1,8 +1,8 @@
{% extends 'flask_user/_public_base.html' %}
{% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %}
{% block title %}Login{% endblock %}
{% block form_title %}Login{% endblock %}
{% block title %}Sign in{% endblock %}
{% block form_title %}Sign in{% endblock %}
{% block form %}

View File

@@ -0,0 +1,17 @@
{% extends 'flask_user/_common_base.html' %}
{% block title %}Signed out{% endblock %}
{% block form_title %}{% endblock %}
{% set disable_messages = True %}
{% block form %}
<div class="text-center">
<h3>
You are now signed out
</h3>
<p class="mb-5">
Please close your browser.
</p>
</div>
{% endblock %}

View File

@@ -1,43 +0,0 @@
{% extends 'base.jinja2' %}
{% block title %}Logout{% endblock %}
{% block header %}{% endblock %}
{% block css %}
{{ super() }}
{# override the body and html css to force center #}
<style>
html, body {
height: 100%;
background-color: #777777;
}
</style>
{% endblock %}
{% block content_before %}
<div class="container-fluid h-100">
<div class="row h-100 justify-content-center align-items-center">
<div class="mx-auto" style="max-width: 30em;">
{# Splash card #}
<div class="card shadow rounded border-0 h-100">
<div class="card-header bg-primary pt-4 text-center text-white mb-4">
<img class="img-fluid mb-3" src="http://lib.msstate.edu/_assets/img/2015-header-logo-msstate.png"
alt=""/>
<h5>Electronic Thesis and Dissertation System</h5>
</div>
<div class="card-body d-flex flex-column text-center mb-2">
<h3>
You are now logged out
</h3>
<p class="mb-5">
Please close your browser.
</p>
</div>
</div>
</div>
</div>
</div>
{% endblock %}