Merge pull request #8233 from cfpb/ans_breadcrumbs_condition

Consolidate template breadcrumbs
cfpb · Mar 21, 2024 · 4ed4051 · 4ed4051
2 parents d12eabb + 077ebca
commit 4ed4051
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 65 deletions.
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
@@ -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
@@ -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
@@ -7,23 +7,14 @@
     #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 %}"
           id="main">
         <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
@@ -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
@@ -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 '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
@@ -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 'v1/layouts/_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
@@ -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 %}