Merge branch 'main' into issue/tiamat-theme/543

CuBoulder · Nov 27, 2023 · 05add88 · 05add88
2 parents ec911df + 675de04
commit 05add88
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- ### Breadcrumbs updates
+  Updates to breadcrumbs to not display breadcrumb div when there are no items in the div
+
+  Sister PR: https://github.com/CuBoulder/tiamat-custom-entities/pull/86
+
+  Closes #549 
+---
+
 - ### Completes in-content menu blocks
   This update completes in-content menu blocks (menu blocks placed outside of a navigation bar, e.g. in a sidebar) by styling them and adding the [Menu Block](https://www.drupal.org/project/menu_block) contrib module for additional options.
 

diff --git a/templates/block/block--boulder-base-breadcrumbs.html.twig b/templates/block/block--boulder-base-breadcrumbs.html.twig
@@ -0,0 +1,13 @@
+{#
+/**
+ * Theme layout to display a UCB Breadcrumb Menu Navigation page. 
+ * The purpose of this template is to make sure that there are more links than the home link in the nav item.
+ *
+ */
+#}
+
+{% if (content['#links']|length > 1) %}
+		<div class="container">
+			{{ content}}
+		</div>
+{% endif %}
diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig
@@ -152,7 +152,7 @@
 
   {# MAIN PAGE CONTENT #}
   <div class="ucb-page-content">
-  {% if show_breadcrumb %}
+  {% if (show_breadcrumb) and (page.breadcrumb|render|striptags|trim) %}
   <div class="ucb-breadcrumb-region">
     {{ page.breadcrumb }}
   </div>

diff --git a/templates/regions/region--breadcrumb.html.twig b/templates/regions/region--breadcrumb.html.twig
@@ -20,7 +20,8 @@
   ]
 %}
 
-{% if show_breadcrumb and content %}
+
+{% if (show_breadcrumb) and (content|render|striptags|trim is not empty) %}
 	<div{{ attributes.addClass(classes) }}>
 		<div class="ucb-breadcrumb-row row">
 			{{ content }}