From 4fb4b390be6e241d3aa95ffe61a8c624fbc5a108 Mon Sep 17 00:00:00 2001 From: Alan Mitchell Date: Fri, 27 Mar 2020 17:37:00 -0800 Subject: [PATCH] Made Lockdown form extend base.html instead of secure.html. Also show or hide Logout button as appropriate. --- bmsapp/templates/bmsapp/base.html | 15 ++-- bmsapp/templates/bmsapp/secure.html | 115 ---------------------------- bmsapp/templates/lockdown/form.html | 12 ++- bmsapp/views.py | 4 + 4 files changed, 20 insertions(+), 126 deletions(-) delete mode 100644 bmsapp/templates/bmsapp/secure.html diff --git a/bmsapp/templates/bmsapp/base.html b/bmsapp/templates/bmsapp/base.html index 73443b4..6557b0c 100644 --- a/bmsapp/templates/bmsapp/base.html +++ b/bmsapp/templates/bmsapp/base.html @@ -123,16 +123,13 @@
-
-
-

-
+ {% if logout_show %} +
+
+ Logout +
-
-
- Logout -
-
+ {% endif %}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% block head %}{% endblock %} - {{ bmsapp_title_text }} - {%block pagetitle %}{% endblock %} - - - - - - -
-
-

- {{ bmsapp_header|safe }} -

-
-
- -
- -

{% block title %}{% endblock %}

- - {% block content %}{% endblock %} -
- -
- {% block fullwidth %}{% endblock %} -
- -
-
-
-
- AHFC Logo -
-
-

Thanks to the Alaska Housing Finance Corporation for funding development of most - of this application.

-
-
-
-
- -
- -
- - - {% block scripts %}{% endblock %} - - - - \ No newline at end of file diff --git a/bmsapp/templates/lockdown/form.html b/bmsapp/templates/lockdown/form.html index 073a06a..5a38027 100644 --- a/bmsapp/templates/lockdown/form.html +++ b/bmsapp/templates/lockdown/form.html @@ -1,4 +1,4 @@ -{% extends "bmsapp/secure.html" %} +{% extends "bmsapp/base.html" %} {% block content %}
@@ -14,4 +14,12 @@ {% endif %}
-{% endblock %} \ No newline at end of file +{% endblock %} +{% block scripts %} + +{% endblock %} diff --git a/bmsapp/views.py b/bmsapp/views.py index be1190a..2912324 100644 --- a/bmsapp/views.py +++ b/bmsapp/views.py @@ -52,6 +52,10 @@ def base_context(): ctx['orgs_html'] = orgs_html ctx['orgs_hide'] = orgs_hide ctx['bmsapp_nav_link_base_url'] = reverse('index') + + # Only show Logout button if Django Lockdown app is being used. + ctx['logout_show'] = ('lockdown' in settings.INSTALLED_APPS) + return ctx def index(request): -- 2.26.2