v0.2.18

nationalarchives · Nov 5, 2024 · d14e4c1 · d14e4c1
1 parent e91f5b5
commit d14e4c1
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.2.17...HEAD)
+## [Unreleased](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.2.18...HEAD)
 
 ### Added
 ### Changed
@@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+## [0.2.18](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.2.17...v0.2.18) - 2024-11-05
+
+### Changed
+
+- Upgraded TNA Frontend to `v0.2.18`
+
 ## [0.2.17](https://github.com/nationalarchives/tna-frontend-jinja/compare/v0.2.16...v0.2.17) - 2024-10-23
 
 ### Changed

diff --git a/README.md b/README.md
@@ -54,6 +54,7 @@ We test each component against its published [component fixtures](https://github
 
 | TNA Frontend Jinja | Compatible TNA Frontend versions |
 | ------------------ | -------------------------------- |
+| `0.2.18`           | `0.2.18`                         |
 | `0.2.17`           | `0.2.17`                         |
 | `0.2.16`           | `0.2.16`                         |
 | `0.2.15`           | `0.2.15`                         |

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "test": "node test-fixtures.mjs"
   },
   "dependencies": {
-    "@nationalarchives/frontend": "0.2.17",
+    "@nationalarchives/frontend": "0.2.18",
     "diff": "^7.0.0",
     "glob": "^10.2.7",
     "js-beautify": "^1.14.8",

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="tna-frontend-jinja",
-    version="0.2.17",
+    version="0.2.18",
     author="Andrew Hosgood",
     author_email="[email protected]",
     description="TNA Frontend Jinja templates",

diff --git a/tna_frontend_jinja/templates/components/button/macro.html b/tna_frontend_jinja/templates/components/button/macro.html
@@ -19,7 +19,7 @@
   {%- set buttonClasses = buttonClasses + ['tna-button--icon-right'] -%}
 {%- endif -%}
 {%- set classes = ' '.join(buttonClasses) -%}
-<{{ 'button' if params.buttonElement else 'a' }}{%- if not params.buttonElement %} href="{{ params.href }}"{%- endif %} class="tna-button {{ classes }}"{%- if params.buttonElement %} type="{{ params.buttonType or 'button' }}"{%- endif -%}{%- if params.title %} title="{{ params.title }}"{% endif %} {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
+<{{ 'button' if params.buttonElement else 'a' }}{%- if not params.buttonElement %} href="{{ params.href }}"{%- endif %} class="tna-button {{ classes }}"{%- if params.buttonElement %} type="{{ params.buttonType or 'button' }}"{%- endif -%}{%- if params.title %} aria-label="{{ params.title }}" title="{{ params.title }}"{% endif %} {%- if params.attributes %}{% for attribute, value in params.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
   {% if params.icon -%}
   <i class="fa-solid fa-{{ params.icon }}" aria-hidden="true"></i>
   {% elif params.iconSvg -%}

diff --git a/tna_frontend_jinja/templates/components/card/macro.html b/tna_frontend_jinja/templates/components/card/macro.html
@@ -99,7 +99,7 @@
   {%- if params.actions %}
     <div class="tna-card__actions">
     {%- for item in params.actions %}
-      <a href="{{ item.href }}" class="tna-card__action{% if item.classes %} {{ item.classes }}{% endif %}" {%- if item.title %} title="{{ item.title }}"{% endif %} {%- if item.attributes %}{% for attribute, value in item.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
+      <a href="{{ item.href }}" class="tna-card__action{% if item.classes %} {{ item.classes }}{% endif %}" {%- if item.title %} aria-label="{{ item.title }}" title="{{ item.title }}"{% endif %} {%- if item.attributes %}{% for attribute, value in item.attributes.items() %} {{ attribute }}{% if value != '' %}="{{ value }}"{% endif %}{% endfor %}{% endif %}>
         {{ item.text }}
       </a>
     {%- endfor %}

diff --git a/tna_frontend_jinja/templates/components/footer/macro.html b/tna_frontend_jinja/templates/components/footer/macro.html
@@ -79,7 +79,7 @@ <h3 class="tna-!--visually-hidden">Follow us</h3>
             <ul class="tna-ul tna-ul--plain tna-footer__social-items">
             {%- for item in params.social -%}
               <li class="tna-footer__social-item">
-                <a href="{{ item.href }}" class="tna-footer__social-item-link" title="{{ item.title }}" data-name="{{ item.icon }}">
+                <a href="{{ item.href }}" class="tna-footer__social-item-link" aria-label="{{ item.title }}" title="{{ item.title }}" data-name="{{ item.icon }}">
                   {%- if item.icon == 'twitter' %}
                   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" height="32"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/></svg>
                   {%- elif item.icon == 'youtube' %}

diff --git a/tna_frontend_jinja/templates/components/global-header/macro.html b/tna_frontend_jinja/templates/components/global-header/macro.html
@@ -39,7 +39,7 @@
       <ul class="tna-global-header__navigation">
         {%- for item in params.navigation %}
         <li class="tna-global-header__navigation-item">
-          <a href="{{ item.href }}" class="tna-global-header__navigation-item-link" {%- if item.title %} title="{{ item.title }}"{% endif %} tabindex="0">{{ item.text }}</a>
+          <a href="{{ item.href }}" class="tna-global-header__navigation-item-link" {%- if item.title %} aria-label="{{ item.title }}" title="{{ item.title }}"{% endif %} tabindex="0">{{ item.text }}</a>
         </li>
         {%- endfor %}
       </ul>
@@ -50,7 +50,7 @@
       <ul class="tna-global-header__top-navigation">
         {%- for item in params.topNavigation %}
         <li class="tna-global-header__top-navigation-item">
-          <a href="{{ item.href }}" class="tna-global-header__top-navigation-link" {%- if item.title %} title="{{ item.title }}"{% endif %} tabindex="0">
+          <a href="{{ item.href }}" class="tna-global-header__top-navigation-link" {%- if item.title %} aria-label="{{ item.title }}" title="{{ item.title }}"{% endif %} tabindex="0">
             {%- if item.icon == 'search' %}
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" height="16"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M416 208c0 45.9-14.9 88.3-40 122.7L502.6 457.4c12.5 12.5 12.5 32.8 0 45.3s-32.8 12.5-45.3 0L330.7 376c-34.4 25.2-76.8 40-122.7 40C93.1 416 0 322.9 0 208S93.1 0 208 0S416 93.1 416 208zM208 352a144 144 0 1 0 0-288 144 144 0 1 0 0 288z"/></svg>
             {%- elif item.icon == 'shop' %}

diff --git a/tna_frontend_jinja/templates/components/pagination/macro.html b/tna_frontend_jinja/templates/components/pagination/macro.html
@@ -30,12 +30,10 @@
         {{ tnaButton({
           'text': item.number,
           'href': item.href,
+          'title': 'Page ' + (item.number | string),
           'accent': params.solid and item.current,
           'plain': not params.solid and not item.current,
-          'classes': "tna-pagination__link",
-          'attributes': {
-            'aria-label': item.label
-          }
+          'classes': 'tna-pagination__link'
         }) }}
       </li>
       {% endif -%}