From 90a7086ff58e40f80139aa67f8fac9c605d8782f Mon Sep 17 00:00:00 2001
From: Ans <git@anselmbradford.com>
Date: Fri, 15 Mar 2024 15:55:50 -0400
Subject: [PATCH 1/2] Consolidate template breadcrumbs

---
 .../filing_instruction_guide/layout-fig.html      | 11 +----------
 .../jinja2/form-explainer/index.html              | 11 -----------
 .../regulations3k/regulations3k-side-nav.html     | 11 +----------
 cfgov/v1/jinja2/v1/layouts/_breadcrumbs.html      | 10 ++++++++++
 cfgov/v1/jinja2/v1/layouts/layout-1-3.html        | 11 +----------
 cfgov/v1/jinja2/v1/layouts/layout-2-1.html        | 15 +--------------
 cfgov/v1/jinja2/v1/layouts/layout-full.html       | 11 +----------
 7 files changed, 15 insertions(+), 65 deletions(-)
 create mode 100644 cfgov/v1/jinja2/v1/layouts/_breadcrumbs.html

diff --git a/cfgov/filing_instruction_guide/jinja2/filing_instruction_guide/layout-fig.html b/cfgov/filing_instruction_guide/jinja2/filing_instruction_guide/layout-fig.html
index 973a7bbdf4e..39f82d3f5ee 100644
--- a/cfgov/filing_instruction_guide/jinja2/filing_instruction_guide/layout-fig.html
+++ b/cfgov/filing_instruction_guide/jinja2/filing_instruction_guide/layout-fig.html
@@ -15,10 +15,6 @@
 {% endif %}
 {% set banner_modification = ' o-banner__dark' if version_status == 'Archived' else ''  %}
 
-{% if page and not breadcrumb_items %}
-{% set breadcrumb_items = page.get_breadcrumbs(request) %}
-{% endif %}
-
 {% block banner_top %}
     {% if version_status %}
         {% import 'v1/includes/molecules/notification.html' as notification with context %}
@@ -47,12 +43,7 @@
         <div class="u-layout-grid_wrapper">
         {% block hero -%}{%- endblock %}
         {% block pre_content scoped -%}
-            {% if breadcrumb_items | length > 0 %}
-                <div class="u-layout-grid_breadcrumbs">
-                {%- import 'v1/includes/molecules/breadcrumbs.html' as breadcrumbs -%}
-                {{ breadcrumbs.render(breadcrumb_items) }}
-                </div>
-            {% endif %}
+            {% include 'v1/layouts/_breadcrumbs.html' %}
         {%- endblock %}
         {% block body_content scoped %}
         <aside class="u-layout-grid_secondary-nav u-layout-grid_secondary-nav__sticky">
diff --git a/cfgov/form_explainer/jinja2/form-explainer/index.html b/cfgov/form_explainer/jinja2/form-explainer/index.html
index 4e1472c1aba..f41646daf29 100644
--- a/cfgov/form_explainer/jinja2/form-explainer/index.html
+++ b/cfgov/form_explainer/jinja2/form-explainer/index.html
@@ -8,17 +8,6 @@
     <link rel="stylesheet" href="{{ static('apps/form-explainer/css/main.css') }}">
 {%- endblock css %}
 
-{% if page and not breadcrumb_items %}
-    {% set breadcrumb_items = page.get_breadcrumbs(request) %}
-{% endif %}
-
-{% if breadcrumb_items | length > 0 %}
-    {%- import 'v1/includes/molecules/breadcrumbs.html' as breadcrumbs with context -%}
-    <div class="block block__sub block__flush-top">
-    {{ breadcrumbs.render(breadcrumb_items) }}
-    </div>
-{% endif %}
-
 {% block content_main_modifiers -%}
     {{ super() }} content__flush-bottom
 {%- endblock %}
diff --git a/cfgov/regulations3k/jinja2/regulations3k/regulations3k-side-nav.html b/cfgov/regulations3k/jinja2/regulations3k/regulations3k-side-nav.html
index 131e2a9c38b..d057f74ec45 100644
--- a/cfgov/regulations3k/jinja2/regulations3k/regulations3k-side-nav.html
+++ b/cfgov/regulations3k/jinja2/regulations3k/regulations3k-side-nav.html
@@ -7,10 +7,6 @@
     #content_main
 {%- endblock %}
 
-{% if page and not breadcrumb_items %}
-{% set breadcrumb_items = page.get_breadcrumbs(request) %}
-{% endif %}
-
 {% block content scoped %}
     <main class="u-layout-grid u-layout-grid__1-3
                  {% block content_modifiers -%}{%- endblock %}"
@@ -18,12 +14,7 @@
         <div class="u-layout-grid_wrapper">
         {% block hero -%}{%- endblock %}
         {% block pre_content scoped -%}
-            {% if breadcrumb_items | length > 0 %}
-                <div class="u-layout-grid_breadcrumbs">
-                {%- import 'v1/includes/molecules/breadcrumbs.html' as breadcrumbs -%}
-                {{ breadcrumbs.render(breadcrumb_items) }}
-                </div>
-            {% endif %}
+            {% include 'v1/layouts/_breadcrumbs.html' %}
         {%- endblock %}
         {% block body_content scoped %}
         <aside class="u-layout-grid_secondary-nav o-regs3k-sidebar">
diff --git a/cfgov/v1/jinja2/v1/layouts/_breadcrumbs.html b/cfgov/v1/jinja2/v1/layouts/_breadcrumbs.html
new file mode 100644
index 00000000000..9cb376ecdf9
--- /dev/null
+++ b/cfgov/v1/jinja2/v1/layouts/_breadcrumbs.html
@@ -0,0 +1,10 @@
+{% if not breadcrumb_items and page and page.get_breadcrumbs %}
+    {% set breadcrumb_items = page.get_breadcrumbs(request) %}
+{% endif %}
+
+{% if breadcrumb_items | length > 0 %}
+    <div class="u-layout-grid_breadcrumbs">
+        {%- import 'v1/includes/molecules/breadcrumbs.html' as breadcrumbs with context -%}
+        {{ breadcrumbs.render(breadcrumb_items) }}
+    </div>
+{% endif %}
diff --git a/cfgov/v1/jinja2/v1/layouts/layout-1-3.html b/cfgov/v1/jinja2/v1/layouts/layout-1-3.html
index 131d175d7ce..cb1ce77c0e1 100644
--- a/cfgov/v1/jinja2/v1/layouts/layout-1-3.html
+++ b/cfgov/v1/jinja2/v1/layouts/layout-1-3.html
@@ -7,10 +7,6 @@
     #content_main
 {%- endblock %}
 
-{% if page and not breadcrumb_items %}
-{% set breadcrumb_items = page.get_breadcrumbs(request) %}
-{% endif %}
-
 {% block content scoped %}
     <main class="u-layout-grid u-layout-grid__1-3
                  {% block content_modifiers -%}{%- endblock %}"
@@ -20,12 +16,7 @@
         <div class="u-layout-grid_wrapper">
             {% block hero -%}{%- endblock %}
             {% block pre_content scoped -%}
-                {% if breadcrumb_items | length > 0 %}
-                    <div class="u-layout-grid_breadcrumbs">
-                        {%- import 'v1/includes/molecules/breadcrumbs.html' as breadcrumbs with context -%}
-                        {{ breadcrumbs.render(breadcrumb_items) }}
-                    </div>
-                {% endif %}
+                {% include '_breadcrumbs.html' %}
             {%- endblock %}
             {% block body_content scoped %}
                 <aside class="u-layout-grid_secondary-nav">
diff --git a/cfgov/v1/jinja2/v1/layouts/layout-2-1.html b/cfgov/v1/jinja2/v1/layouts/layout-2-1.html
index e3da3661811..808856ffdd4 100644
--- a/cfgov/v1/jinja2/v1/layouts/layout-2-1.html
+++ b/cfgov/v1/jinja2/v1/layouts/layout-2-1.html
@@ -1,9 +1,5 @@
 {% extends 'v1/layouts/base.html' %}
 
-{% if page and not breadcrumb_items %}
-{% set breadcrumb_items = page.get_breadcrumbs(request) %}
-{% endif %}
-
 {% block content scoped %}
     <main class="u-layout-grid u-layout-grid__2-1
                  {% block content_modifiers -%}{%- endblock %}"
@@ -18,16 +14,7 @@
 
         <div class="u-layout-grid_wrapper">
             {% block pre_content scoped -%}
-                {% if not breadcrumb_items and page and page.get_breadcrumbs %}
-                    {% set breadcrumb_items = page.get_breadcrumbs(request) %}
-                {% endif %}
-
-                {% if breadcrumb_items | length > 0 %}
-                    <div class="u-layout-grid_breadcrumbs">
-                        {%- import 'v1/includes/molecules/breadcrumbs.html' as breadcrumbs with context -%}
-                        {{ breadcrumbs.render(breadcrumb_items) }}
-                    </div>
-                {% endif %}
+                {% include '_breadcrumbs.html' %}
             {%- endblock %}
 
             {% block body_content scoped %}
diff --git a/cfgov/v1/jinja2/v1/layouts/layout-full.html b/cfgov/v1/jinja2/v1/layouts/layout-full.html
index c6065b3f89e..e8d519a80d2 100644
--- a/cfgov/v1/jinja2/v1/layouts/layout-full.html
+++ b/cfgov/v1/jinja2/v1/layouts/layout-full.html
@@ -18,16 +18,7 @@
 
         <div class="u-layout-grid_wrapper">
             {% block pre_content scoped -%}
-                {% if not breadcrumb_items and page and page.get_breadcrumbs %}
-                    {% set breadcrumb_items = page.get_breadcrumbs(request) %}
-                {% endif %}
-
-                {% if breadcrumb_items | length > 0 %}
-                    <div class="u-layout-grid_breadcrumbs">
-                        {%- import 'v1/includes/molecules/breadcrumbs.html' as breadcrumbs with context -%}
-                        {{ breadcrumbs.render(breadcrumb_items) }}
-                    </div>
-                {% endif %}
+                {% include 'v1/layouts/_breadcrumbs.html' %}
             {%- endblock %}
 
             {% block body_content scoped %}

From eb583e012ba2ab4e1b14b5d2599706b016d1f37b Mon Sep 17 00:00:00 2001
From: Ans <git@anselmbradford.com>
Date: Fri, 15 Mar 2024 17:02:18 -0400
Subject: [PATCH 2/2] Use absolute path

---
 cfgov/v1/jinja2/v1/layouts/layout-1-3.html | 2 +-
 cfgov/v1/jinja2/v1/layouts/layout-2-1.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cfgov/v1/jinja2/v1/layouts/layout-1-3.html b/cfgov/v1/jinja2/v1/layouts/layout-1-3.html
index cb1ce77c0e1..99952324ac1 100644
--- a/cfgov/v1/jinja2/v1/layouts/layout-1-3.html
+++ b/cfgov/v1/jinja2/v1/layouts/layout-1-3.html
@@ -16,7 +16,7 @@
         <div class="u-layout-grid_wrapper">
             {% block hero -%}{%- endblock %}
             {% block pre_content scoped -%}
-                {% include '_breadcrumbs.html' %}
+                {% include 'v1/layouts/_breadcrumbs.html' %}
             {%- endblock %}
             {% block body_content scoped %}
                 <aside class="u-layout-grid_secondary-nav">
diff --git a/cfgov/v1/jinja2/v1/layouts/layout-2-1.html b/cfgov/v1/jinja2/v1/layouts/layout-2-1.html
index 808856ffdd4..2e6f7595f37 100644
--- a/cfgov/v1/jinja2/v1/layouts/layout-2-1.html
+++ b/cfgov/v1/jinja2/v1/layouts/layout-2-1.html
@@ -14,7 +14,7 @@
 
         <div class="u-layout-grid_wrapper">
             {% block pre_content scoped -%}
-                {% include '_breadcrumbs.html' %}
+                {% include 'v1/layouts/_breadcrumbs.html' %}
             {%- endblock %}
 
             {% block body_content scoped %}