moved message to show across entire service

ministryofjustice · Oct 25, 2022 · 1307e69 · 1307e69
1 parent dc3fed6
commit 1307e69
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/cla_public/apps/contact/views.py b/cla_public/apps/contact/views.py
@@ -62,13 +62,8 @@ class Contact(AllowSessionOverride, UpdatesMeansTest, SessionBackedFormView):
     template = "contact.html"
 
     def get(self, *args, **kwargs):
-        self.template_context = {
-            "emergency_message": current_app.config["EMERGENCY_MESSAGE_ON"],
-            "emergency_message_title": current_app.config["EMERGENCY_MESSAGE_TITLE"],
-            "emergency_message_text": current_app.config["EMERGENCY_MESSAGE_TEXT"],
-        }
         if ReasonsForContacting.GA_SESSION_KEY in session:
-            self.template_context.update({"reasons_for_contacting": session[ReasonsForContacting.GA_SESSION_KEY]})
+            self.template_context = {"reasons_for_contacting": session[ReasonsForContacting.GA_SESSION_KEY]}
             del session[ReasonsForContacting.GA_SESSION_KEY]
         return super(Contact, self).get(*args, **kwargs)
 

diff --git a/cla_public/django_to_jinja.py b/cla_public/django_to_jinja.py
@@ -3,7 +3,7 @@
 import sys
 import datetime
 
-from flask import Blueprint, url_for
+from flask import Blueprint, url_for, current_app
 from flask.ext.markdown import Markdown
 import jinja2
 
@@ -56,6 +56,14 @@ def moj_variables():
             log.critical("Cannot find APP_SETTINGS group in the configuration file.")
             sys.exit(1)
 
+    @app.context_processor
+    def emergency_message_settings():
+        return {
+            "emergency_message_on": current_app.config["EMERGENCY_MESSAGE_ON"],
+            "emergency_message_title": current_app.config["EMERGENCY_MESSAGE_TITLE"],
+            "emergency_message_text": current_app.config["EMERGENCY_MESSAGE_TEXT"],
+        }
+
     # get today's date
     @app.context_processor
     def covid_availability_times():

diff --git a/cla_public/templates/base.html b/cla_public/templates/base.html
@@ -1,6 +1,7 @@
 {% extends "moj_template_base.jinja" %}
 
 {% import "macros/element.html" as Element %}
+{% import "macros/emergency_message.html" as Message %}
 
 {% block page_title %}{{ app_title }}{% endblock %}
 
@@ -84,8 +85,16 @@
             </div>
           {% endif %}
         {% endwith %}
-      <div class="govuk-grid-column-two-thirds">
         {% block session_timeout_dialog %} {% include "_modal-dialog.html" %} {% endblock %}
+      <div class="govuk-grid-column-full">
+        {% block emergency_message_block %}
+          {% if emergency_message_on %}
+            {% call Message.emergency_message(emergency_message_title, emergency_message_text) %}
+            {% endcall %}
+          {% endif %}
+        {% endblock %}
+      </div>
+      <div class="govuk-grid-column-two-thirds">
         {% block inner_content %}{% endblock %}
       </div>
       <div class="govuk-grid-column-one-third">

diff --git a/cla_public/templates/contact.html b/cla_public/templates/contact.html
@@ -7,15 +7,11 @@
 {% import "macros/form.html" as Form %}
 {% import "macros/subform.html" as Subform %}
 {% import "macros/element.html" as Element %}
-{% import "macros/emergency_message.html" as EmergencyMessage %}
 
 {% set title = _('Contact Civil Legal Advice') %}
 {% block page_title %}{{ title }}{% endblock %}
 
 {% block inner_content %}
-  {% if emergency_message %}
-    {{ EmergencyMessage(emergency_title, emergency_text) }}
-  {% endif %}
   {{ Form.handle_errors(form) }}
   {% block page_text %}
     {% if config.CONTACT_ONLY %}

diff --git a/cla_public/templates/macros/emergency_message.html b/cla_public/templates/macros/emergency_message.html
@@ -9,6 +9,7 @@ <h2 class="govuk-notification-banner__title" id="govuk-notification-banner-title
         <p class="govuk-notification-banner__heading">
             <h3 class="govuk-heading-m">{{ emergency_message_title }}</h3>
             {{ emergency_message_text }}
+            {{ caller() }}
         </p>
         </div>
     </div>