diff --git a/components/prev-next/prev-next.component.yml b/components/prev-next/prev-next.component.yml index f49d7574..7fbe3b9e 100644 --- a/components/prev-next/prev-next.component.yml +++ b/components/prev-next/prev-next.component.yml @@ -10,6 +10,11 @@ status: stable props: type: object properties: + prevNextAttributes: + type: object + title: Prev-Next attributes + description: a Drupal attributes object. Will not override default + classes. prev_next_type: type: string title: Prev-Next type @@ -74,3 +79,20 @@ props: description: > The actual URL for the Next link. If empty, the entire link will not be rendered. + prev_next_nav_aria_label: + type: string + title: Prev-Next nav label + description: Translated label for parent diff --git a/templates/block/guides-prev-next-block.html.twig b/templates/block/guides-prev-next-block.html.twig index 88f224d1..b03ffa5c 100644 --- a/templates/block/guides-prev-next-block.html.twig +++ b/templates/block/guides-prev-next-block.html.twig @@ -1,3 +1,5 @@ +{% set nav_id = 'guides-prev-next' %} +{% set prevNextAttributes = create_attribute({ id: nav_id }) %} {% set prev_next_type = 'guides' %} {# Probably the parent module should take responsibility for this. @@ -9,4 +11,8 @@ {% set prev_url = previous_url|default('') %} {% set prev_title = previous_title %} -{% include 'localgov_base:prev-next' %} +{% embed 'localgov_base:prev-next' %} + {% block prev_next_pre_content %} +

{{ 'Guides navigation'|t }}

+ {% endblock %} +{% endembed %} diff --git a/templates/block/localgov-blogs-prev-next-block.html.twig b/templates/block/localgov-blogs-prev-next-block.html.twig index 63619184..c977d405 100644 --- a/templates/block/localgov-blogs-prev-next-block.html.twig +++ b/templates/block/localgov-blogs-prev-next-block.html.twig @@ -1,2 +1,8 @@ +{% set nav_id = 'blogs-prev-next' %} +{% set prevNextAttributes = create_attribute({ id: nav_id }) %} {% set prev_next_type = 'blog' %} -{% include 'localgov_base:prev-next' %} +{% embed 'localgov_base:prev-next' %} + {% block prev_next_pre_content %} +

{{ 'Blog navigation'|t }}

+ {% endblock %} +{% endembed %} diff --git a/templates/navigation/book-navigation--publication.html.twig b/templates/navigation/book-navigation--publication.html.twig index b6a7ec6a..01af8cc0 100644 --- a/templates/navigation/book-navigation--publication.html.twig +++ b/templates/navigation/book-navigation--publication.html.twig @@ -32,9 +32,15 @@ #} {% if has_links %} + {% set nav_id = 'publication-prev-next' %} + {% set prevNextAttributes = create_attribute({ id: nav_id }) %} {# This uses previous_* vars, prev-next uses prev_*, so we translate. #} {% set show_title = true %} {% set prev_next_type = 'publications' %} - {% include 'localgov_base:prev-next' %} + {% embed 'localgov_base:prev-next' %} + {% block prev_next_pre_content %} +

{{ 'Publication navigation'|t }}

+ {% endblock %} + {% endembed %} {% endif %} diff --git a/templates/views/views-view-list--localgov-step-by-step-navigation--prev-next.html.twig b/templates/views/views-view-list--localgov-step-by-step-navigation--prev-next.html.twig index bd4a0224..4269821f 100644 --- a/templates/views/views-view-list--localgov-step-by-step-navigation--prev-next.html.twig +++ b/templates/views/views-view-list--localgov-step-by-step-navigation--prev-next.html.twig @@ -36,8 +36,14 @@ */ #} +{% set nav_id = 'step-by-step-prev-next' %} +{% set prevNextAttributes = create_attribute({ id: nav_id }) %} {% set prev_next_type = 'step_by_step' %} {% set prev_url = has_prev_step ? path('entity.node.canonical', {'node': prev_step_nid }) : '' %} {% set next_url = has_next_step ? path('entity.node.canonical', {'node': next_step_nid }) : '' %} -{% include 'localgov_base:prev-next' %} +{% embed 'localgov_base:prev-next' %} + {% block prev_next_pre_content %} +

{{ 'Step by step navigation'|t }}

+ {% endblock %} +{% endembed %}