Merge branch '2135-send-message-flow-h1-changes' of https://github.com/GSA/notifications-admin into 2135-send-message-flow-h1-changes

# Conflicts:
#	app/templates/views/templates/template.html

app/templates/components/folder-path.html

@@ -3,10 +3,10 @@
   service_id,
   template_type,
   current_user,
-  link_current_item=False
+  link_current_item=False,
+  root_element='nav'
 ) %}
-
-  <nav class="navigation-service usa-breadcrumb padding-top-0">
+  <{{ root_element }} id="breadcrumb-template-folders" class="navigation-service usa-breadcrumb padding-top-0">
     {% for folder in folders %}
       {% if loop.last and not link_current_item %}
         {% if folder.template_type or not folder.id %}
@@ -27,7 +27,7 @@
         {% if not loop.last %}{{ folder_path_separator() }}{% endif %}
       {% endif %}
     {% endfor %}
-  </nav>
+  </{{ root_element }}>
 {% endmacro %}
 
 

app/templates/views/templates/choose.html

@@ -37,13 +37,15 @@
         <p class="margin-top-0 margin-bottom-4">
           Every message starts with a template. To send, choose or create a template.
         </p>
-        {# you don't need this unless you're trying to add the parent breadcrumb title to the first page of the flow #}
-        <!-- {{ folder_path(
+        {# you don't need folder_path unless you're trying to add the parent breadcrumb title to the first
+        page of the flow, if that's the case, you'll want to delete line 353 within the test_template_folders.py
+        file. assert len(page.select("nav#breadcrumb-template-folders a")) == len(expected_parent_link_args)#}
+        {{ folder_path(
           folders=template_folder_path,
           service_id=current_service.id,
           template_type=template_type,
           current_user=current_user
-        ) }} -->
+        ) }}
       </div>
       {% if current_user.has_permissions('manage_templates') and current_template_folder_id and user_has_template_folder_permission %}
         <div class="grid-col-2">

app/templates/views/templates/manage-template-folder.html

@@ -3,9 +3,9 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 
-{% block service_page_title %}
-  {{ page_title_folder_path(template_folder_path) }}
-{% endblock %}
+{% set page_title = 'Select or create a template' %}
+
+{% block service_page_title %}{{page_title}}{% endblock %}
 
 {% block maincolumn_content %}
 

app/templates/views/templates/template.html

@@ -1,13 +1,13 @@
 {% extends "withnav_template.html" %}
 {% from "components/banner.html" import banner_wrapper %}
-{% from "components/folder-path.html" import folder_path, page_title_folder_path %}
+{% from "components/folder-path.html" import folder_path %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
 {% from "components/components/button/macro.njk" import usaButton %}
 
-{% block service_page_title %}
-  {{ page_title_folder_path(current_service.get_template_path(template._template)) }}
-{% endblock %}
+{% set page_title = 'Confirm your template' %}
+
+{% block service_page_title %}{{page_title}}{% endblock %}
 
 {% block maincolumn_content %}
 
@@ -33,7 +33,7 @@
     <div class="grid-row">
       <div class="grid-col-12">
         <h1 class="font-body-2xl line-height-sans-2 folder-heading margin-top-0">
-          Confirm your template
+          {{page_title}}
         </h1>
         {{ folder_path(
           folders=current_service.get_template_path(template._template),