v5.5 updates

LandRegistry · Aug 27, 2024 · c6555e7 · c6555e7
1 parent 1a1ba3a
commit c6555e7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/govuk_frontend_jinja/templates/components/back-link/macro.html b/govuk_frontend_jinja/templates/components/back-link/macro.html
@@ -1,8 +1,8 @@
 {% macro govukBackLink(params) %}
 {% from "govuk_frontend_jinja/macros/attributes.html" import govukAttributes -%}
 
-<a href="{% if params.href %}{{ params.href }}{% else %}#{% endif %}" class="govuk-back-link {%- if params.classes %} {{ params.classes }}{% endif %}"
+<a href="{{ params.href | default('#', true) }}" class="govuk-back-link {%- if params.classes %} {{ params.classes }}{% endif %}"
   {{- govukAttributes(params.attributes) }}>
-  {{- params.html | safe if params.html else (params.text if params.text else "Back") -}}
+  {{- params.html | safe if params.html else (params.text | default("Back", true)) -}}
 </a>
 {% endmacro %}
diff --git a/govuk_frontend_jinja/templates/components/breadcrumbs/macro.html b/govuk_frontend_jinja/templates/components/breadcrumbs/macro.html
@@ -12,7 +12,7 @@
   {% set classNames = classNames ~ " govuk-breadcrumbs--collapse-on-mobile" %}
 {% endif -%}
 
-<div class="{{ classNames }}" {{- govukAttributes(params.attributes) }}>
+<nav class="{{ classNames }}" {{- govukAttributes(params.attributes) }} aria-label="{{ params.labelText | default("Breadcrumb") }}">
   <ol class="govuk-breadcrumbs__list">
 {% for item in params['items'] %}
   {% if item.href %}
@@ -28,5 +28,5 @@
   {% endif %}
 {% endfor %}
   </ol>
-</div>
+</nav>
 {% endmacro %}
diff --git a/govuk_frontend_jinja/templates/components/task-list/macro.html b/govuk_frontend_jinja/templates/components/task-list/macro.html
@@ -37,7 +37,7 @@
 <ul class="govuk-task-list {%- if params.classes %} {{ params.classes }}{% endif %}"
   {{- govukAttributes(params.attributes) }}>
   {% for item in params['items'] %}
-    {{- _taskListItem(params, item, loop.index) }}
+    {{- _taskListItem(params, item, loop.index) if item }}
   {% endfor %}
 </ul>
 {% endmacro %}