replaced content_tempalte and withoutnav_template with base.html

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 #}

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">

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">

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">

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">

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">

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 %}
 

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 %}
 

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 %}

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 %}

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">

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

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(

app/templates/views/documentation.html

@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   Documentation

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 %}
 

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 %}

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 %}

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 %}

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 %}
 

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 %}
 

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 %}

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 %}

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 %}

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 %}

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

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

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 %}

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 %}
 

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 %}

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

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 %}

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 %}

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 %}

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 %}

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 %}

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

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 %}

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 %}

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 %}
 

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 %}
 

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 %}
 

app/templates/views/registration-continue.html

@@ -1,4 +1,4 @@
-{% extends "withoutnav_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   Check your email

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 %}

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 %}
 

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 %}

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 -%}

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 %}
 

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 %}
 

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 %}

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 %}
 

app/templates/views/trial-mode.html

@@ -1,4 +1,4 @@
-{% extends "content_template.html" %}
+{% extends "base.html" %}
 
 {% block per_page_title %}
   Trial mode

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 %}

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 %}
 

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}

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 %}