From cb6dbc801fec162da8150e66fb4c755a1463f461 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Fri, 14 May 2021 17:02:08 -0400
Subject: [PATCH] Simplify breadcrumbs

---
 netbox/templates/extras/objectchange.html | 24 ++++++++++-------------
 netbox/templates/extras/report.html       | 12 ++++--------
 netbox/templates/extras/script.html       | 13 ++++--------
 netbox/templates/generic/object.html      |  9 ---------
 netbox/templates/layout.html              | 16 +++++++++++++--
 5 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html
index 30664db9a..1df3bf5bc 100644
--- a/netbox/templates/extras/objectchange.html
+++ b/netbox/templates/extras/objectchange.html
@@ -3,20 +3,16 @@
 
 {% block title %}{{ object }}{% endblock %}
 
-{% block breadcrumb_main %}
-<nav class="breadcrumb-container" aria-label="breadcrumb">
-    <ol class="breadcrumb">
-        <li class="breadcrumb-item"><a href="{% url 'extras:objectchange_list' %}">Change Log</a></li>
-        {% if object.related_object.get_absolute_url %}
-            <li class="breadcrumb-item"><a href="{{ object.related_object.get_absolute_url }}changelog/">{{ object.related_object }}</a></li>
-        {% elif object.changed_object.get_absolute_url %}
-            <li class="breadcrumb-item"><a href="{{ object.changed_object.get_absolute_url }}changelog/">{{ object.changed_object }}</a></li>
-        {% elif object.changed_object %}
-            <li class="breadcrumb-item">{{ object.changed_object }}</li>
-        {% endif %}
-        <li class="breadcrumb-item">{{ object }}</li>
-    </ol>
-</nav>
+{% block breadcrumbs %}
+  <li class="breadcrumb-item"><a href="{% url 'extras:objectchange_list' %}">Change Log</a></li>
+  {% if object.related_object.get_absolute_url %}
+    <li class="breadcrumb-item"><a href="{{ object.related_object.get_absolute_url }}changelog/">{{ object.related_object }}</a></li>
+  {% elif object.changed_object.get_absolute_url %}
+    <li class="breadcrumb-item"><a href="{{ object.changed_object.get_absolute_url }}changelog/">{{ object.changed_object }}</a></li>
+  {% elif object.changed_object %}
+    <li class="breadcrumb-item">{{ object.changed_object }}</li>
+  {% endif %}
+  <li class="breadcrumb-item">{{ object }}</li>
 {% endblock %}
 
 {% block header %}
diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html
index 0d7698d76..23a91b150 100644
--- a/netbox/templates/extras/report.html
+++ b/netbox/templates/extras/report.html
@@ -3,14 +3,10 @@
 
 {% block title %}{{ report.name }}{% endblock %}
 
-{% block breadcrumb_main %}
-<nav class="breadcrumb-container" aria-label="breadcrumb">
-    <ol class="breadcrumb">
-        <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}">Reports</a></li>
-        <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}#module.{{ report.module }}">{{ report.module|bettertitle }}</a></li>
-        <li class="breadcrumb-item">{{ report.name }}</li>
-    </ol>
-</nav>
+{% block breadcrumbs %}
+  <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}">Reports</a></li>
+  <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}#module.{{ report.module }}">{{ report.module|bettertitle }}</a></li>
+  <li class="breadcrumb-item">{{ report.name }}</li>
 {% endblock %}
 
 {% block content %}
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index 1078ba427..683319fca 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -5,15 +5,10 @@
 
 {% block title %}{{ script }}{% endblock %}
 
-{% block breadcrumb_main %}
-<nav class="breadcrumb-container" aria-label="breadcrumb">
-    <ol class="breadcrumb">
-        <li class="breadcrumb-item"><a href="/">Home</a></li>
-        <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">Scripts</a></li>
-        <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ module }}">{{ module|bettertitle }}</a></li>
-        <li class="breadcrumb-item">{{ script }}</li>
-    </ol>
-</nav>
+{% block breadcrumbs %}
+  <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">Scripts</a></li>
+  <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ module }}">{{ module|bettertitle }}</a></li>
+  <li class="breadcrumb-item">{{ script }}</li>
 {% endblock %}
 
 {% block content %}
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index 27a324339..8384b29e7 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -8,15 +8,6 @@
 
 {% block title %}{{ object }}{% endblock %}
 
-{% block breadcrumb_main %}
-<nav class="breadcrumb-container" aria-label="breadcrumb">
-  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="/">Home</a></li>
-    {% block breadcrumbs %}{%endblock%}
-  </ol>
-</nav>
-{% endblock %}
-
 {% block controls %}
 <div class="controls mb-2 mx-0">
   <div class="d-flex flex-wrap justify-content-end">
diff --git a/netbox/templates/layout.html b/netbox/templates/layout.html
index e8754aa4d..0ddc5f2fd 100644
--- a/netbox/templates/layout.html
+++ b/netbox/templates/layout.html
@@ -88,14 +88,26 @@
         {# Body #}
         <div class="px-4 content-container">
 
-          {# Page title #}
+          {# Page header #}
           {% block title_container %}
             <div class="title-container">
               <div id="content-title">
+
+                {# Title #}
                 <h1 class="h2 w-100">{% block title %}{% endblock %}</h1>
-                {% block breadcrumb_main %}{% endblock %}
+
+                {# Breadcrumbs #}
+                <nav class="breadcrumb-container" aria-label="breadcrumb">
+                  <ol class="breadcrumb">
+                    {% block breadcrumbs %}{%endblock%}
+                  </ol>
+                </nav>
+
               </div>
+
+              {# Controls #}
               {% block controls %}{% endblock %}
+
             </div>
           {% endblock %}