Merge pull request #200 from digital-land/refactor/removeLeftoverBrea…

…dcrumbs Refactor/remove leftover breadcrumbs
digital-land · Oct 3, 2023 · 4403fad · 4403fad
2 parents 703d79d + a3b0b72
commit 4403fad
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 62 deletions.
diff --git a/application/templates/components/hero/macro.jinja b/application/templates/components/hero/macro.jinja
@@ -1,6 +1,5 @@
 {% from "govuk_frontend_jinja/components/button/macro.html" import govukButton %}
 {% from "govuk_frontend_jinja/components/phase-banner/macro.html" import govukPhaseBanner %}
-{% from "govuk_frontend_jinja/components/breadcrumbs/macro.html" import govukBreadcrumbs %}
 
 {% macro appHero(params={}) %}
 <div class="app-hero{%- if params.classes %} {{ params.classes }}{% endif -%}"
@@ -16,12 +15,12 @@
       },
       'attributes': params.phaseBanner['attributes']
     }) if params.phaseBanner }}
-    {{ govukBreadcrumbs({
-      'classes': "app-breadcrumbs--inverse" + (" " + params.breadcrumbs.classes if params.breadcrumbs.classes else ''),
-      'items': params.breadcrumbs.items,
-      'collapseOnMobile': params.breadcrumbs.collapseOnMobile,
-      'attributes': params.breadcrumbs.attributes
-    }) if params.breadcrumbs }}
+    {%- from "components/back-button/macro.jinja" import dlBackButton %}
+    {% block breadcrumbs%}
+      {{ dlBackButton({
+        "parentHref": '/'
+      })}}
+    {% endblock %}
     {{- caller() if caller -}}
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds-from-desktop">

diff --git a/application/templates/dataset-backlog.html b/application/templates/dataset-backlog.html
@@ -6,25 +6,12 @@
   <meta name="generated-date" content="{{ now }}" />
 {% endblock head %}
 
-{%- block beforeContent -%}
-  {{ super() }}
-
-  {{- govukBreadcrumbs({
-    "items": [
-        {
-        "text": "Planning Data",
-        "href": "/"
-        },
-        {
-        "text": "Datasets",
-        "href": "/dataset/"
-        },
-        {
-        "text": name
-        }
-    ]
-    }) -}}
-{%- endblock -%}
+{%- from "components/back-button/macro.jinja" import dlBackButton %}
+{% block breadcrumbs%}
+  {{ dlBackButton({
+    "parentHref": '/'
+  })}}
+{% endblock %}
 
 {% block pageTitle %}{{ name }} dataset | Planning Data{% endblock %}
 

diff --git a/application/templates/fact.html b/application/templates/fact.html
@@ -10,23 +10,12 @@
 
 {%- block pageTitle %}{{ row_name }} | {{ pipeline_name|capitalize }} | Planning Data{% endblock -%}
 
-{%- block breadcrumbs -%}
-  {{- govukBreadcrumbs({
-    "items": [
-        {
-          "text": "Planning Data",
-          "href": "/"
-        },
-        {
-          "text": "Fact",
-          "href": "/fact"
-        },
-        {
-          "text": fact["fact"]
-        }
-      ]
-    }) -}}
-{%- endblock -%}
+{%- from "components/back-button/macro.jinja" import dlBackButton %}
+{% block breadcrumbs%}
+  {{ dlBackButton({
+    "parentHref": '/'
+  })}}
+{% endblock %}
 
 {%- block content %}
   <div class="govuk-grid-row">

diff --git a/application/templates/layouts/base.html b/application/templates/layouts/base.html
@@ -1,6 +1,5 @@
 {% extends "govuk_frontend_jinja/template.html" %}
 {% from "govuk_frontend_jinja/components/phase-banner/macro.html" import govukPhaseBanner %}
-{% from "govuk_frontend_jinja/components/breadcrumbs/macro.html" import govukBreadcrumbs %}
 
 {%- block pageTitle %}Planning data you can find, use and trust{% endblock -%}
 

diff --git a/application/templates/layouts/layout--guidance.html b/application/templates/layouts/layout--guidance.html
@@ -2,9 +2,12 @@
 {% from "components/sub-navigation/macro.jinja" import appSubNavigation %}
 {% block pageTitle %}{{ pageData.pageTitle }}{% endblock %}
 
-{%- block breadcrumbs -%}
-  {{- govukBreadcrumbs({ 'items': pageData.breadcrumbs }) -}}
-{%- endblock -%}
+{%- from "components/back-button/macro.jinja" import dlBackButton %}
+{% block breadcrumbs%}
+  {{ dlBackButton({
+    "parentHref": '/'
+  })}}
+{% endblock %}
 
 {% block content %}
 

diff --git a/application/templates/organisation_index.html b/application/templates/organisation_index.html
@@ -7,21 +7,12 @@
 	<link rel="stylesheet" href="/static/stylesheets/application.css">
 {% endblock head %}
 
-{%- block beforeContent -%}
-    {{ super() }}
-
-    {{- govukBreadcrumbs({
-    "items": [
-        {
-        "text": "Planning Data",
-        "href": "/"
-        },
-        {
-        "text": "Organisations"
-        }
-    ]
-    }) -}}
-{%- endblock -%}
+{%- from "components/back-button/macro.jinja" import dlBackButton %}
+{% block breadcrumbs%}
+  {{ dlBackButton({
+    "parentHref": '/'
+  })}}
+{% endblock %}
 
 {% block pageTitle %}Organisations | Planning Data{% endblock %}