From f086ab90f4e96d607ee00728a5b8626c4b253604 Mon Sep 17 00:00:00 2001
From: David Kerkeslager <kerkeslager@gmail.com>
Date: Fri, 26 Feb 2021 20:41:57 -0500
Subject: [PATCH] Fix an issue with breadcrumb trails

---
 setup.py                                      |  2 +-
 tickle/templates/tickle/area_breadcrumb.html  | 27 +++++++++----------
 .../tickle/area_breadcrumb_trail.html         |  3 +++
 tickle/templates/tickle/area_detail.html      |  2 +-
 tickle/templates/tickle/boulder_detail.html   |  2 +-
 tickle/templates/tickle/route_detail.html     |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 tickle/templates/tickle/area_breadcrumb_trail.html

diff --git a/setup.py b/setup.py
index fbb1700..90a944a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 import pathlib
 from setuptools import setup, find_packages
 HERE = pathlib.Path(__file__).parent
-VERSION = '0.0.5'
+VERSION = '0.0.7'
 PACKAGE_NAME = 'django_predrill_tickle'
 AUTHOR = 'David Kerkeslager'
 AUTHOR_EMAIL = 'david@kerkeslager.com'
diff --git a/tickle/templates/tickle/area_breadcrumb.html b/tickle/templates/tickle/area_breadcrumb.html
index e0b1034..6ef0850 100644
--- a/tickle/templates/tickle/area_breadcrumb.html
+++ b/tickle/templates/tickle/area_breadcrumb.html
@@ -1,19 +1,16 @@
-<nav class='tickle-breadcrumb'>
-  {% if area %}
-    {% include 'tickle/area_breadcrumb.html' with area=area.parent is_parent=True %}
-    &gt;
-    {% if is_parent %}
-      <span class='tickle-breadcrumb-item'>
-        <a href='{% url "tickle:area-detail" pk=area.pk %}'>{{ area.name }}</a>
-      </span>
-    {% else %}
-      <span class='tickle-breadcrumb-item'>
-        {{ area.name }}
-      </span>
-    {% endif %}
+{% if area %}
+  {% include 'tickle/area_breadcrumb.html' with area=area.parent is_parent=True %}
+  {% if is_parent %}
+    <span class='tickle-breadcrumb-item'>
+      <a href='{% url "tickle:area-detail" pk=area.pk %}'>{{ area.name }}</a>
+    </span>
   {% else %}
     <span class='tickle-breadcrumb-item'>
-      <a href='{% url "tickle:area-list" %}'>All</a>
+      {{ area.name }}
     </span>
   {% endif %}
-</nav>
+{% else %}
+  <span class='tickle-breadcrumb-item'>
+    <a href='{% url "tickle:area-list" %}'>All</a>
+  </span>
+{% endif %}
diff --git a/tickle/templates/tickle/area_breadcrumb_trail.html b/tickle/templates/tickle/area_breadcrumb_trail.html
new file mode 100644
index 0000000..ec30361
--- /dev/null
+++ b/tickle/templates/tickle/area_breadcrumb_trail.html
@@ -0,0 +1,3 @@
+<nav class='tickle-breadcrumb'>
+  {% include 'tickle/area_breadcrumb.html' %}
+</nav>
diff --git a/tickle/templates/tickle/area_detail.html b/tickle/templates/tickle/area_detail.html
index 6880397..bd48777 100644
--- a/tickle/templates/tickle/area_detail.html
+++ b/tickle/templates/tickle/area_detail.html
@@ -4,7 +4,7 @@
 {% block tickle_header_name %}{{ area.name }}{% endblock %}
 
 {% block tickle_nav %}
-  {% include 'tickle/area_breadcrumb.html' %}
+  {% include 'tickle/area_breadcrumb_trail.html' %}
 {% endblock %}
 
 {% block tickle_main %}
diff --git a/tickle/templates/tickle/boulder_detail.html b/tickle/templates/tickle/boulder_detail.html
index 51e8977..7bcbc14 100644
--- a/tickle/templates/tickle/boulder_detail.html
+++ b/tickle/templates/tickle/boulder_detail.html
@@ -4,7 +4,7 @@
 {% block tickle_header_name %}{{ boulder.name }}{% endblock %}
 
 {% block tickle_nav %}
-  {% include 'tickle/area_breadcrumb.html' with area=boulder.area is_parent=True %}
+  {% include 'tickle/area_breadcrumb_trail.html' with area=boulder.area is_parent=True %}
 {% endblock %}
 
 {% block tickle_extra_header %}
diff --git a/tickle/templates/tickle/route_detail.html b/tickle/templates/tickle/route_detail.html
index 6b6ad52..0f423a7 100644
--- a/tickle/templates/tickle/route_detail.html
+++ b/tickle/templates/tickle/route_detail.html
@@ -4,7 +4,7 @@
 {% block tickle_header_name %}{{ route.name }}{% endblock %}
 
 {% block tickle_nav %}
-  {% include 'tickle/area_breadcrumb.html' with area=route.area is_parent=True %}
+  {% include 'tickle/area_breadcrumb_trail.html' with area=route.area is_parent=True %}
 {% endblock %}
 
 {% block tickle_extra_header %}
-- 
2.20.1