diff options
Diffstat (limited to 'app/dispatch')
| -rw-r--r-- | app/dispatch/context_processors.py | 10 | ||||
| -rw-r--r-- | app/dispatch/templates/dispatch/base.html | 4 | ||||
| -rw-r--r-- | app/dispatch/templates/dispatch/login.html | 21 |
3 files changed, 31 insertions, 4 deletions
diff --git a/app/dispatch/context_processors.py b/app/dispatch/context_processors.py new file mode 100644 index 0000000..d6d50d5 --- /dev/null +++ b/app/dispatch/context_processors.py @@ -0,0 +1,10 @@ +from django.conf import settings + + +def additional_template_vars(request): + """ + A neat little hack to load up + additional variables into templates directly into the templates + """ + return {"template_vars": settings.TEMPLATE_VARS} + diff --git a/app/dispatch/templates/dispatch/base.html b/app/dispatch/templates/dispatch/base.html index efc9eb3..cac1b18 100644 --- a/app/dispatch/templates/dispatch/base.html +++ b/app/dispatch/templates/dispatch/base.html @@ -4,7 +4,7 @@ <html lang="en"> <head> <meta charset="UTF-8"> - <title>{% block title %}{% endblock %}</title> + <title>{% block title %}{{template_vars.app_name}}{% endblock %}</title> <!--Import Google Icon Font--> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <!--Import materialize.css--> @@ -34,7 +34,7 @@ <nav class="brown darken-3" role="navigation"> <div class="nav-wrapper container"> - <a id="logo-container" href="{% url 'home' %}" class="brand-logo">Dispatch Tracker</a> + <a id="logo-container" href="{% url 'home' %}" class="brand-logo">{{template_vars.app_name}}</a> <ul class="right hide-on-med-and-down"> {% include "dispatch/nav.html" %} </ul> diff --git a/app/dispatch/templates/dispatch/login.html b/app/dispatch/templates/dispatch/login.html index eb7f1a7..b3df716 100644 --- a/app/dispatch/templates/dispatch/login.html +++ b/app/dispatch/templates/dispatch/login.html @@ -4,11 +4,28 @@ <div class="container"> <br /> <div class="row"> - <div class="col s12 m8 push-m2 l6 push-l3"> + {% if template_vars.login_info %} + <div class="col s6"> + {% autoescape off %}{{template_vars.login_info}}{% endautoescape %} + </div> + <div class="col s6"> + {% else %} + <div class="col s12"> + {% endif %} + {% if template_vars.login_blurb %} + {% autoescape off %} + <div class="card"> + <div class="card-content"> + {{template_vars.login_blurb}} + </div> + </div> + {% endautoescape %} + {% endif %} + {% if form.errors %} <div class="card red lighten-5"> <div class="card-content red-text"> - Your username and password didn't match. Please try again. + Your username or password didn't match. Please try again. </div> </div> {% endif %} |