Remove response settings in favour of many more template customisation points

danpalmer · danpalmer · commit af0a016b8040 · 2019-12-05T16:17:17.000Z
diff --git a/response/apps.py b/response/apps.py
@@ -1,7 +1,5 @@
 from django.apps import AppConfig
 from django.conf import settings as site_settings
-from django.templatetags.static import static
-from django.utils.functional import lazy
 
 
 class ResponseConfig(AppConfig):
@@ -20,17 +18,6 @@ def ready(self):
 
         from .core import signals as core_signals  # noqa: F401
 
-        self.configure_setting("RESPONSE_LOGIN_REQUIRED", True)
-        self.configure_setting("RESPONSE_APP_NAME", "Response")
-        self.configure_setting(
-            "RESPONSE_FAVICON", self.lazy_static_url("images/favicon.png")
+        site_settings.RESPONSE_LOGIN_REQUIRED = getattr(
+            site_settings, "RESPONSE_LOGIN_REQUIRED", True
         )
-        self.configure_setting(
-            "RESPONSE_LOGO", self.lazy_static_url("images/response.png")
-        )
-
-    def configure_setting(self, name, default):
-        setattr(site_settings, name, getattr(site_settings, name, default))
-
-    def lazy_static_url(self, name):
-        return lazy(lambda: static(name))()
diff --git a/response/templates/response/base.html b/response/templates/response/base.html
@@ -1,5 +1,4 @@
 {% load static %}
-{% load response_settings %}
 {% load bootstrap4_alerts %}
 
 <!DOCTYPE html>
@@ -8,21 +7,28 @@
 <head>
   <title>
     {% block title %}
-      {% response_setting "RESPONSE_APP_NAME" %}
+      Response
     {% endblock %}
   </title>
-  <link rel="shortcut icon" href="{% response_setting 'RESPONSE_FAVICON' %}">
 
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <meta name="description" content="{% response_setting "RESPONSE_APP_NAME" %}">
-  <meta name="author" content="Monzo">
-  <meta name="mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <link rel="manifest" href="{% static 'manifest.json' %}">
+  {% block favicon %}
+    <link rel="shortcut icon" href="{% static 'images/favicon.png' %}">
+  {% endblock %}
+
+  {% block meta %}
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="Response">
+    <meta name="author" content="Monzo">
+    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+  {% endblock %}
 
-  <link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
-  <link href="{% static 'common.css' %}" rel="stylesheet">
+  {% block static %}
+    <link rel="manifest" href="{% static 'manifest.json' %}">
+    <link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
+    <link href="{% static 'common.css' %}" rel="stylesheet">
+  {% endblock %}
 
   {% block head %}{% endblock %}
 
@@ -34,10 +40,12 @@
   {% block navigation %}
     <nav class="navbar navbar-expand-lg navbar-dark bg-dark static-top">
       <div class="{% block navbar_container_class %}container{% endblock %}">
-        <a class="navbar-brand" href="/">
-          <img  id="logo" src="{% response_setting 'RESPONSE_LOGO' %}" />
-          <strong>{% response_setting "RESPONSE_APP_NAME" %}</strong>
-        </a>
+        {% block navigation_brand %}
+          <a class="navbar-brand" href="/">
+            <img  id="logo" src="{% static 'images/response.png' %}" />
+            <strong>Response</strong>
+          </a>
+        {% endblock %}
 
         <button
           class="navbar-toggler"
@@ -53,7 +61,7 @@
 
         <div class="collapse navbar-collapse" id="navbarResponsive">
           <ul class="navbar-nav ml-auto">
-            {% block navbar %}{% endblock %}
+            {% block navigation_items %}{% endblock %}
           </ul>
         </div>
       </div>
diff --git a/response/templatetags/response_settings.py b/response/templatetags/response_settings.py
