Merge pull request #891 from nationalarchives/fcl-96-change-pui-judgm…

…ent-template-to-use-the-common-wrapper

Judgment template now uses common wrapper

ds_judgements_public_ui/templates/judgment/detail.html

@@ -1,10 +1,48 @@
-{% extends "layouts/judgment.html" %}
+{% extends "layouts/base.html" %}
+{% load i18n document_utils %}
+{% block robots %}
+  <meta name="robots" content="noindex,nofollow" />
+{% endblock robots %}
+{% block title %}
+  {% if context.page_title %}{{ context.page_title }} -{% endif %}
+  {% translate "common.findcaselaw" %}
+{% endblock title %}
+{% block breadcrumbs %}
+  {% if context.document_noun == "press summary" %}
+    <li>
+      {% if context.linked_document_uri %}
+        <a href="{% url 'detail' context.linked_document_uri %}">{{ context.page_title|get_title_to_display_in_html:context.document_noun }}</a>
+      {% else %}
+        <a>{{ context.page_title|get_title_to_display_in_html:context.document_noun }}</a>
+      {% endif %}
+    </li>
+    <li>Press Summary</li>
+  {% else %}
+    <li>{{ context.page_title }}</li>
+  {% endif %}
+{% endblock breadcrumbs %}
+{% block precontent %}
+  {% include "includes/judgment_text_toolbar.html" %}
+{% endblock precontent %}
 {% block content %}
+  <div id="js-document-navigation-links-start"
+       class="document-navigation-links">
+    <a class="down" href="#end-of-document">Skip to end</a>
+  </div>
+  <div id="start-of-document"></div>
   {% if context.document %}
     {% autoescape off %}
       {{ context.document }}
     {% endautoescape %}
   {% else %}
     {{ content }}
   {% endif %}
+  {% include "includes/judgment_end_document_marker.html" %}
+  <div id="js-document-navigation-links-end"
+       class="document-navigation-links">
+    <a class="up" href="#start-of-document">Back to top</a>
+  </div>
 {% endblock content %}
+{% block postcontent %}
+  {% include "includes/judgment_text_download_options.html" %}
+{% endblock postcontent %}

ds_judgements_public_ui/templates/layouts/base.html

@@ -66,10 +66,14 @@
       {% endblock header %}
     </header>
     {% include "includes/notifications.html" %}
+    {% block precontent %}
+    {% endblock precontent %}
     <main id="main-content">
       {% block content %}
       {% endblock content %}
     </main>
+    {% block postcontent %}
+    {% endblock postcontent %}
     {% include "includes/help_improve_this_service.html" %}
     {% include "includes/footer.html" %}
   </body>

locale/en_GB/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-04 12:15+0000\n"
+"POT-Creation-Date: 2023-09-12 14:00+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -104,25 +104,6 @@ msgstr "Cookies"
 msgid "accessibilitystatement.title"
 msgstr "Accessibility statement"
 
-#: ds_judgements_public_ui/templates/includes/header_nav.html
-#: ds_judgements_public_ui/templates/layouts/base.html
-msgid "home"
-msgstr "Find case law"
-
-#: ds_judgements_public_ui/templates/includes/header_nav.html
-#: ds_judgements_public_ui/templates/judgment/results.html
-#: ds_judgements_public_ui/templates/layouts/base.html
-#: ds_judgements_public_ui/templates/layouts/judgment.html
-#: ds_judgements_public_ui/templates/layouts/static_content.html
-#: ds_judgements_public_ui/templates/pages/home.html
-#: ds_judgements_public_ui/templates/pages/structured_search.html
-msgid "common.findcaselaw"
-msgstr "Find case law"
-
-#: ds_judgements_public_ui/templates/includes/header_nav.html
-msgid "breadcrumbs.search"
-msgstr "Search"
-
 #: ds_judgements_public_ui/templates/includes/help_improve_this_service.html
 msgid "service.improved"
 msgstr "Help us improve this service"
@@ -223,17 +204,29 @@ msgstr "How to search"
 msgid "basicsearchform.cta"
 msgstr "Search"
 
+#: ds_judgements_public_ui/templates/judgment/detail.html
+#: ds_judgements_public_ui/templates/judgment/results.html
+#: ds_judgements_public_ui/templates/layouts/base.html
+#: ds_judgements_public_ui/templates/layouts/static_content.html
+#: ds_judgements_public_ui/templates/pages/home.html
+#: ds_judgements_public_ui/templates/pages/structured_search.html
+msgid "common.findcaselaw"
+msgstr "Find case law"
+
 #: ds_judgements_public_ui/templates/judgment/results.html
 #: judgments/views/advanced_search.py judgments/views/browse.py
 #: judgments/views/results.py
 msgid "results.search.title"
 msgstr "Search results"
 
 #: ds_judgements_public_ui/templates/layouts/base.html
-#: ds_judgements_public_ui/templates/layouts/judgment.html
 msgid "skiplink"
 msgstr "Skip to Main Content"
 
+#: ds_judgements_public_ui/templates/layouts/base.html
+msgid "home"
+msgstr "Find case law"
+
 #: ds_judgements_public_ui/templates/pages/about_this_service.html
 #: ds_judgements_public_ui/templates/pages/terms_of_use.html
 msgid "bailii.link"