replaced content_tempalte and withoutnav_template with base.html

2025-12-11 07:33:36 -05:00 · 2024-04-24 12:31:00 -07:00
parent 2c0a4f16f2
commit bc945c9420
66 changed files with 66 additions and 66 deletions
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -49,7 +49,7 @@
        {% block content %}
          {% block flash_messages %}
            {% include 'flash_messages.html' %}
-            {# flash_message.html was previously only included in child templates that were using withoutnav_template. Now, we can add flash_message blocks and include flash_messages.html in child templates that were using withoutnav_template. This will help eliminate the need for an entirely separate parent template. #}
+            {# flash_message.html was previously only included in child templates: withoutnav_template, org_template, settings_template, withnav_template, _base_template.html. Place this block here or within the child templates will help eliminate the need for an entirely separate parent template. #}
          {% endblock %}
          {% block maincolumn_content %}
            {#  lines 48-59 were previously from content_template.html #}
--- a/app/templates/error/401.html
+++ b/app/templates/error/401.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}You’re not authorised to see this page{% endblock %}
 {% block maincolumn_content %}
  <div class="grid-row">
--- a/app/templates/error/403.html
+++ b/app/templates/error/403.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}You’re not allowed to see this page{% endblock %}
 {% block maincolumn_content %}
    <div class="grid-row">
--- a/app/templates/error/404.html
+++ b/app/templates/error/404.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}Page not found{% endblock %}
 {% block maincolumn_content %}
    <div class="grid-row">
--- a/app/templates/error/410.html
+++ b/app/templates/error/410.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}Page not found{% endblock %}
 {% block maincolumn_content %}
    <div class="grid-row">
--- a/app/templates/error/500.html
+++ b/app/templates/error/500.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}Sorry, there’s a problem with the service{% endblock %}
 {% block maincolumn_content %}
  <div class="grid-row">
--- a/app/templates/old/admin_template.html
+++ b/app/templates/old/admin_template.html
--- a/app/templates/old/content_template.html
+++ b/app/templates/old/content_template.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/sub-navigation.html" import sub_navigation %}
 {% from "components/page-header.html" import page_header %}

--- a/app/templates/old/main_template.html
+++ b/app/templates/old/main_template.html
--- a/app/templates/old/withoutnav_template.html
+++ b/app/templates/old/withoutnav_template.html
--- a/app/templates/views/accessibility_statement.html
+++ b/app/templates/views/accessibility_statement.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/service-link.html" import service_link %}
 {% from "components/content-metadata.html" import content_metadata %}

@@ -168,7 +168,7 @@

  <p>
    The following content on the <a class="usa-link" href="https://status.notifications.service.gov.uk/">Notify status page</a> is not compliant with the WCAG version 2.1 AA standard:
-  </p> 
+  </p>

  <ul class="usa-list">
    <li>an incorrect heading hierarchy which fails <a class="usa-link" href="https://www.w3.org/TR/WCAG21/#info-and-relationships">success criterion 1.3.1: info and relationships</a></li>
--- a/app/templates/views/add-service-local.html
+++ b/app/templates/views/add-service-local.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/add-service.html
+++ b/app/templates/views/add-service.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/cancelled-invitation.html
+++ b/app/templates/views/cancelled-invitation.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% block per_page_title %}The invitation you were sent has been cancelled{% endblock %}
 {% block maincolumn_content %}
    <div class="grid-row">
--- a/app/templates/views/change-email-continue.html
+++ b/app/templates/views/change-email-continue.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}

 {% block per_page_title %}
  Check your email
--- a/app/templates/views/choose-account.html
+++ b/app/templates/views/choose-account.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/components/button/macro.njk" import usaButton %}

 {% macro service_list(
--- a/app/templates/views/documentation.html
+++ b/app/templates/views/documentation.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}

 {% block per_page_title %}
  Documentation
--- a/app/templates/views/email-link-interstitial.html
+++ b/app/templates/views/email-link-interstitial.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}

--- a/app/templates/views/email-link-invalid.html
+++ b/app/templates/views/email-link-invalid.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}

 {% block per_page_title %}
--- a/app/templates/views/email-not-received.html
+++ b/app/templates/views/email-not-received.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/components/button/macro.njk" import usaButton %}

 {% block per_page_title %}
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/sub-navigation.html" import sub_navigation %}
 {% from "components/service-link.html" import service_link %}
--- a/app/templates/views/features/text-messages.html
+++ b/app/templates/views/features/text-messages.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/service-link.html" import service_link %}

--- a/app/templates/views/forgot-password.html
+++ b/app/templates/views/forgot-password.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}

--- a/app/templates/views/get-started.html
+++ b/app/templates/views/get-started.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/sub-navigation.html" import sub_navigation %}
 {% from "components/components/details/macro.njk" import usaDetails %}
--- a/app/templates/views/guidance/create-and-send-messages.html
+++ b/app/templates/views/guidance/create-and-send-messages.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/service-link.html" import service_link %}

 {% block per_page_title %}
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/service-link.html" import service_link %}

 {% block per_page_title %}
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/sub-navigation.html" import sub_navigation %}
 {% from "components/service-link.html" import service_link %}
--- a/app/templates/views/guidance/send-files-by-email.html
+++ b/app/templates/views/guidance/send-files-by-email.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}

 {% block per_page_title %}
  Send files by email
--- a/app/templates/views/integration-testing.html
+++ b/app/templates/views/integration-testing.html
@@ -1,5 +1,5 @@
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}

 {% block per_page_title %}
  Integration testing
--- a/app/templates/views/message-status.html
+++ b/app/templates/views/message-status.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field %}

 {% block per_page_title %}
--- a/app/templates/views/new-password.html
+++ b/app/templates/views/new-password.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}

--- a/app/templates/views/organizations/add-organization.html
+++ b/app/templates/views/organizations/add-organization.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/password-reset-sent.html
+++ b/app/templates/views/password-reset-sent.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}

 {% block per_page_title %}
 Check your email
--- a/app/templates/views/performance.html
+++ b/app/templates/views/performance.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/big-number.html" import big_number %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/table.html" import field, list_table %}
--- a/app/templates/views/platform-admin/_base_template.html
+++ b/app/templates/views/platform-admin/_base_template.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}

 {% block main %}
--- a/app/templates/views/pricing/billing-details-signed-out.html
+++ b/app/templates/views/pricing/billing-details-signed-out.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}

 {% block per_page_title %}
--- a/app/templates/views/pricing/billing-details.html
+++ b/app/templates/views/pricing/billing-details.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}

 {% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
--- a/app/templates/views/pricing/how-to-pay.html
+++ b/app/templates/views/pricing/how-to-pay.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}

 {% block per_page_title %}
--- a/app/templates/views/pricing/index.html
+++ b/app/templates/views/pricing/index.html
@@ -3,7 +3,7 @@
 {% from "components/live-search.html" import live_search %}
 {% from "components/components/details/macro.njk" import usaDetails %}

-{% extends "content_template.html" %}
+{% extends "base.html" %}

 {% block per_page_title %}
 Message parts
--- a/app/templates/views/privacy.html
+++ b/app/templates/views/privacy.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/content-metadata.html" import content_metadata %}

 {% block per_page_title %}
@@ -61,7 +61,7 @@
      processed and when it’s stored.</p>

    <!-- <p>Your personal data will be processed both in the UK and the European Economic Area (EEA). Your data receives the same level of protection in the EEA as it does in the UK through the safeguard of <a class="usa-link" href="https://ico.org.uk/for-organizations/dp-at-the-end-of-the-transition-period/data-protection-and-the-eu-in-detail/adequacy/">Adequacy Decisions</a>.</p> -->
-   
+
    <h2 class="font-body-lg" id="how-we-protect-your-data">How we protect your data and keep it secure</h2>

    <p>We are committed to doing all that we can to keep your data secure. To prevent unauthorized access or disclosure we have put in place technical and organizational procedures to secure the data we collect about you – for example, we protect your
@@ -70,7 +70,7 @@

    <!-- <h2 class="font-body-lg" id="childrens-privacy-protection">Children’s privacy protection</h2>

-    <p>We understand the importance of protecting children’s privacy online. Our services are not designed for, or intentionally targeted at, children 13 years of age or younger. It is not our policy to intentionally collect or maintain data about anyone under the age of 13.</p> 
+    <p>We understand the importance of protecting children’s privacy online. Our services are not designed for, or intentionally targeted at, children 13 years of age or younger. It is not our policy to intentionally collect or maintain data about anyone under the age of 13.</p>

    <h2 class="font-body-lg" id="your-rights">What are your rights</h2>

--- a/app/templates/views/re-validate-email-sent.html
+++ b/app/templates/views/re-validate-email-sent.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}

 {% block per_page_title %}
--- a/app/templates/views/register-from-invite.html
+++ b/app/templates/views/register-from-invite.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}

--- a/app/templates/views/register-from-org-invite.html
+++ b/app/templates/views/register-from-org-invite.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}

--- a/app/templates/views/register.html
+++ b/app/templates/views/register.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}

--- a/app/templates/views/registration-continue.html
+++ b/app/templates/views/registration-continue.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}

 {% block per_page_title %}
  Check your email
--- a/app/templates/views/resend-email-verification.html
+++ b/app/templates/views/resend-email-verification.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}

 {% block per_page_title %}
--- a/app/templates/views/roadmap.html
+++ b/app/templates/views/roadmap.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}
 {% from "components/content-metadata.html" import content_metadata %}

--- a/app/templates/views/security.html
+++ b/app/templates/views/security.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, field with context %}

 {% block per_page_title %}
--- a/app/templates/views/set-up-your-profile.html
+++ b/app/templates/views/set-up-your-profile.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/select/macro.njk" import usaSelect -%}
--- a/app/templates/views/signin.html
+++ b/app/templates/views/signin.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}

--- a/app/templates/views/support/index.html
+++ b/app/templates/views/support/index.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}

--- a/app/templates/views/terms-of-use.html
+++ b/app/templates/views/terms-of-use.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 {% from "components/banner.html" import banner_wrapper %}

 {% block per_page_title %}
--- a/app/templates/views/text-not-received.html
+++ b/app/templates/views/text-not-received.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}

--- a/app/templates/views/trial-mode.html
+++ b/app/templates/views/trial-mode.html
@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}

 {% block per_page_title %}
  Trial mode
--- a/app/templates/views/two-factor-email.html
+++ b/app/templates/views/two-factor-email.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}

 {% block per_page_title %}
--- a/app/templates/views/two-factor-sms.html
+++ b/app/templates/views/two-factor-sms.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}

--- a/app/templates/views/two-factor-webauthn.html
+++ b/app/templates/views/two-factor-webauthn.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/components/button/macro.njk" import usaButton %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
--- a/app/templates/views/user-profile/authenticate.html
+++ b/app/templates/views/user-profile/authenticate.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/user-profile/change-password.html
+++ b/app/templates/views/user-profile/change-password.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/user-profile/change.html
+++ b/app/templates/views/user-profile/change.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/user-profile/confirm.html
+++ b/app/templates/views/user-profile/confirm.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/user-profile/disable-platform-admin-view.html
+++ b/app/templates/views/user-profile/disable-platform-admin-view.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
--- a/app/templates/views/user-profile/manage-security-key.html
+++ b/app/templates/views/user-profile/manage-security-key.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
--- a/app/templates/views/user-profile/security-keys.html
+++ b/app/templates/views/user-profile/security-keys.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/components/button/macro.njk" import usaButton %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
--- a/app/templates/views/using-notify.html
+++ b/app/templates/views/using-notify.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/sub-navigation.html" import sub_navigation %}

 {% block per_page_title %}
--- a/app/templates/views/verification-not-received.html
+++ b/app/templates/views/verification-not-received.html
@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 {% from "components/components/button/macro.njk" import usaButton %}

 {% block per_page_title %}