From 5b449b194efccc329e95d1c837d9820d015ff6c7 Mon Sep 17 00:00:00 2001 From: Aga Date: Wed, 14 Jun 2023 12:01:49 +0100 Subject: [PATCH 1/5] skip link added to the public pages --- portality/templates/account/forgot.html | 4 ++-- portality/templates/account/login.html | 4 ++-- portality/templates/account/login_to_apply.html | 4 ++-- portality/templates/account/register.html | 4 ++-- portality/templates/account/reset.html | 4 ++-- portality/templates/api/current/api_docs.html | 4 ++-- portality/templates/application_form/public_application.html | 4 ++-- portality/templates/application_form/readonly_journal.html | 4 ++-- portality/templates/doaj/article.html | 4 ++-- portality/templates/doaj/articles_search.html | 4 ++-- portality/templates/doaj/contact.html | 4 ++-- portality/templates/doaj/index.html | 4 ++-- portality/templates/doaj/journals_search.html | 4 ++-- portality/templates/doaj/toc.html | 4 ++-- portality/templates/editor/editor_base.html | 4 ++-- portality/templates/layouts/public_base.html | 5 ++++- portality/templates/layouts/single_col_page.html | 4 ++-- portality/templates/openurl/404.html | 4 ++-- portality/templates/openurl/help.html | 4 ++-- portality/templates/publisher/publisher_base.html | 4 ++-- 20 files changed, 42 insertions(+), 39 deletions(-) diff --git a/portality/templates/account/forgot.html b/portality/templates/account/forgot.html index 241525adfd..d8f5e9c837 100644 --- a/portality/templates/account/forgot.html +++ b/portality/templates/account/forgot.html @@ -3,7 +3,7 @@ {% block page_title %}Reset your password{% endblock %} {% block content %} -
+
@@ -23,5 +23,5 @@

Reset your password

-
+ {% endblock %} diff --git a/portality/templates/account/login.html b/portality/templates/account/login.html index 247149641a..726831e9e3 100644 --- a/portality/templates/account/login.html +++ b/portality/templates/account/login.html @@ -3,7 +3,7 @@ {% block page_title %}Login to your account{% endblock %} {% block content %} -
+
@@ -17,5 +17,5 @@

Login

-
+ {% endblock %} diff --git a/portality/templates/account/login_to_apply.html b/portality/templates/account/login_to_apply.html index c701e9e024..33ac5666fd 100644 --- a/portality/templates/account/login_to_apply.html +++ b/portality/templates/account/login_to_apply.html @@ -3,7 +3,7 @@ {% block page_title %}Login to apply{% endblock %} {% block content %} -
+
@@ -46,5 +46,5 @@

Related help

-
+ {% endblock %} diff --git a/portality/templates/account/register.html b/portality/templates/account/register.html index 4f91d8250a..a497bd396a 100644 --- a/portality/templates/account/register.html +++ b/portality/templates/account/register.html @@ -12,7 +12,7 @@ {% endblock %} {% block content %} -
+
@@ -30,7 +30,7 @@

Register

-
+ {% endblock %} {% block extra_js_bottom %} diff --git a/portality/templates/account/reset.html b/portality/templates/account/reset.html index 2b459de104..fdacc27620 100644 --- a/portality/templates/account/reset.html +++ b/portality/templates/account/reset.html @@ -4,7 +4,7 @@ {% block content %} -
+
@@ -20,6 +20,6 @@

Hi {{ account.name or account.email }}

-
+ {% endblock %} diff --git a/portality/templates/api/current/api_docs.html b/portality/templates/api/current/api_docs.html index 9c5a2bc8e5..42d3d14588 100644 --- a/portality/templates/api/current/api_docs.html +++ b/portality/templates/api/current/api_docs.html @@ -14,7 +14,7 @@ {% endblock %} {% block content %} -
+
{# todo: this nav was bumping into swagger @@ -58,7 +58,7 @@

API

-
+ {% endblock %} {% block extra_js_bottom %} diff --git a/portality/templates/application_form/public_application.html b/portality/templates/application_form/public_application.html index af0e05d63e..31439b94d3 100644 --- a/portality/templates/application_form/public_application.html +++ b/portality/templates/application_form/public_application.html @@ -23,7 +23,7 @@ {% block content scoped %} -
+
{% include "application_form/_backend_validation.html" %}
@@ -64,7 +64,7 @@
-
+ {% endblock %} diff --git a/portality/templates/application_form/readonly_journal.html b/portality/templates/application_form/readonly_journal.html index 2fed49db61..fe429eea08 100644 --- a/portality/templates/application_form/readonly_journal.html +++ b/portality/templates/application_form/readonly_journal.html @@ -20,7 +20,7 @@ {% block content scoped %} -
+
@@ -47,7 +47,7 @@
-
+ {% endblock %} diff --git a/portality/templates/doaj/article.html b/portality/templates/doaj/article.html index 67720a8585..91f3f80200 100644 --- a/portality/templates/doaj/article.html +++ b/portality/templates/doaj/article.html @@ -67,7 +67,7 @@ {% set doi = bibjson.get_one_identifier("doi") %} {% set normalised_doi = article.get_normalised_doi() %} -
+

@@ -224,5 +224,5 @@

Published in {{jtitle}}

-
+ {% endblock %} diff --git a/portality/templates/doaj/articles_search.html b/portality/templates/doaj/articles_search.html index cea8977897..4a518fb3ae 100644 --- a/portality/templates/doaj/articles_search.html +++ b/portality/templates/doaj/articles_search.html @@ -10,10 +10,10 @@ {%- block meta_twitter_description -%}Find open access articles in DOAJ.{%- endblock -%} {% block content %} -
+
{% include "includes/search-help-modal.html" %} -
+ {% endblock %} {% block extra_js_bottom %} diff --git a/portality/templates/doaj/contact.html b/portality/templates/doaj/contact.html index 2a4739dec8..2ffb86985f 100644 --- a/portality/templates/doaj/contact.html +++ b/portality/templates/doaj/contact.html @@ -1,7 +1,7 @@ {% extends "layouts/public_base.html" %} {% block content %} -
+

Submit your feedback and questions here. Feedback submitted about a particular journal is treated as confidential.

@@ -52,7 +52,7 @@
-
+ {% endblock %} diff --git a/portality/templates/doaj/index.html b/portality/templates/doaj/index.html index c1599f238a..43b11960c9 100644 --- a/portality/templates/doaj/index.html +++ b/portality/templates/doaj/index.html @@ -74,7 +74,7 @@

DOAJ in numbers

{% endblock %} {% block content %} -
+
@@ -242,6 +242,6 @@

Recently-added journals

-
+ {% endblock %} diff --git a/portality/templates/doaj/journals_search.html b/portality/templates/doaj/journals_search.html index e38bedd18e..8eef0d2c63 100644 --- a/portality/templates/doaj/journals_search.html +++ b/portality/templates/doaj/journals_search.html @@ -10,10 +10,10 @@ {%- block meta_twitter_description -%}Find open access journals in DOAJ.{%- endblock -%} {% block content %} -
+
{% include "includes/search-help-modal.html" %} -
+ {% endblock %} {% block extra_js_bottom %} diff --git a/portality/templates/doaj/toc.html b/portality/templates/doaj/toc.html index acf0077a7e..9d5302bc64 100644 --- a/portality/templates/doaj/toc.html +++ b/portality/templates/doaj/toc.html @@ -42,7 +42,7 @@ } %} -
+
{% if journal.last_manually_updated_since(days=30) %} @@ -450,7 +450,7 @@

Journal metadata

-
+ {% include "includes/_hotjar.html" %} {% endblock %} diff --git a/portality/templates/editor/editor_base.html b/portality/templates/editor/editor_base.html index 3d488e6e72..19a36ca7c7 100644 --- a/portality/templates/editor/editor_base.html +++ b/portality/templates/editor/editor_base.html @@ -7,7 +7,7 @@ {% block page_title %}Editor dashboard{% endblock %} {% block content %} -
+

Editor dashboard

{% include 'editor/nav.html' %} @@ -15,7 +15,7 @@

Editor dashboard

{% block editor_content %} {% endblock %} -
+ {% include "includes/_hotjar.html" %} {% endblock %} diff --git a/portality/templates/layouts/public_base.html b/portality/templates/layouts/public_base.html index 2e4cad9ddc..ef0a3ae4f0 100644 --- a/portality/templates/layouts/public_base.html +++ b/portality/templates/layouts/public_base.html @@ -2,6 +2,7 @@ {% block base_content %} +Skip to main content
{% include "includes/header.html" %} @@ -17,7 +18,9 @@ {% endif %} {% block main_panel %} - {% block content %}{% endblock %} +
+ {% block content %}{% endblock %} +
{% endblock %} {% include "includes/footer.html" %} diff --git a/portality/templates/layouts/single_col_page.html b/portality/templates/layouts/single_col_page.html index 5e28ee87d3..a8bc801cf0 100644 --- a/portality/templates/layouts/single_col_page.html +++ b/portality/templates/layouts/single_col_page.html @@ -1,11 +1,11 @@ {% extends "layouts/public_base.html" %} {% block content %} -
+

{% block title %}{% endblock %}

{% block single_col_content %}{% endblock %}
-
+ {% endblock %} diff --git a/portality/templates/openurl/404.html b/portality/templates/openurl/404.html index 43d3b688f4..5f8379deb3 100644 --- a/portality/templates/openurl/404.html +++ b/portality/templates/openurl/404.html @@ -1,7 +1,7 @@ {% extends "layouts/public_base.html" %} {% block content %} -
+

OpenURL - no results

@@ -16,5 +16,5 @@

What next?

-
+ {% endblock %} diff --git a/portality/templates/openurl/help.html b/portality/templates/openurl/help.html index 75332c5637..c1a4eb4424 100644 --- a/portality/templates/openurl/help.html +++ b/portality/templates/openurl/help.html @@ -1,7 +1,7 @@ {% extends "layouts/public_base.html" %} {% block content %} -
+

Help

@@ -33,5 +33,5 @@

Supported OpenURL version

-
+ {% endblock %} diff --git a/portality/templates/publisher/publisher_base.html b/portality/templates/publisher/publisher_base.html index d4873f1fb5..96ba47ca72 100644 --- a/portality/templates/publisher/publisher_base.html +++ b/portality/templates/publisher/publisher_base.html @@ -7,14 +7,14 @@ {% block page_title %}Publisher dashboard{% endblock %} {% block content %} -
+

Publisher dashboard

{% include 'publisher/nav.html' %} {% block publisher_content %} {% endblock %} -
+ {% include "includes/_hotjar.html" %} {% endblock %} From 6e5a26d7114c6e8ac289757c6d308d94b6b81c9f Mon Sep 17 00:00:00 2001 From: Aga Date: Thu, 29 Jun 2023 10:57:41 +0100 Subject: [PATCH 2/5] style skip to main button --- .../components/_skip-to-main-content.scss | 35 +++++++++++++++++++ cms/sass/main.scss | 1 + portality/templates/layouts/public_base.html | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 cms/sass/components/_skip-to-main-content.scss diff --git a/cms/sass/components/_skip-to-main-content.scss b/cms/sass/components/_skip-to-main-content.scss new file mode 100644 index 0000000000..3542adb62c --- /dev/null +++ b/cms/sass/components/_skip-to-main-content.scss @@ -0,0 +1,35 @@ +/* Back to main content button */ + +.skip-to-main { + position: absolute; + z-index: 10000; + display: flex; + flex-direction: row; + align-items: center; + min-width: min-content; + padding: 5px; + top: 10px; + left: 10px; + background-color: $grapefruit; + + svg { + display: block; + margin: 0 auto; + stroke: $warm-black; + margin-rigth: 10px; + } + &:hover, &:focus { + svg { + margin-right: 10px; + } + } + &:hover:after, &:focus:after { + content: " Skip to main content"; + color: $warm-black; + vertical-align: bottom; + -webkit-font-feature-settings: 'liga' 1; + -moz-font-feature-settings: 'liga' 1; + font-feature-settings: 'liga' 1; + transition: 0.5 smooth; + } +} \ No newline at end of file diff --git a/cms/sass/main.scss b/cms/sass/main.scss index cdd22133b8..17ec6552f5 100644 --- a/cms/sass/main.scss +++ b/cms/sass/main.scss @@ -52,6 +52,7 @@ "components/review-table", "components/select2", "components/search-results", + "components/skip-to-main-content", "components/stat", "components/stretch-list", "components/tabs", diff --git a/portality/templates/layouts/public_base.html b/portality/templates/layouts/public_base.html index ef0a3ae4f0..f6bdcf2b4d 100644 --- a/portality/templates/layouts/public_base.html +++ b/portality/templates/layouts/public_base.html @@ -2,7 +2,7 @@ {% block base_content %} -Skip to main content +
{% include "includes/header.html" %} From 457d9637247f891d792e95ae81593e5b178d6006 Mon Sep 17 00:00:00 2001 From: Aga Date: Thu, 29 Jun 2023 11:05:38 +0100 Subject: [PATCH 3/5] add functional test for home page accessibility --- doajtest/testbook/public_site/home_page.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doajtest/testbook/public_site/home_page.yml b/doajtest/testbook/public_site/home_page.yml index c2261786cc..dfacc81e27 100644 --- a/doajtest/testbook/public_site/home_page.yml +++ b/doajtest/testbook/public_site/home_page.yml @@ -120,3 +120,19 @@ tests: bottom right-hand corner. results: - You are returned to the top of the home page +- title: Accessibility - Skip to main content button + - step: Refresh the page + - step: Click tab key on the keyboard once + results: + - Skip to the main content button is unfolded and focused + - step: Click enter + results: + - Focus is moved to the main content + - step: Turn on screen reader + - step: With the keyboard navigate to Skip to main content button + results: + - Screen reader reads the button title + - step: Click enter + results: + - Focus is moved to the main content + From 4c21a3eae264c91d5793e3c8daea42422df1b9e7 Mon Sep 17 00:00:00 2001 From: Aga Date: Thu, 29 Jun 2023 11:17:58 +0100 Subject: [PATCH 4/5] functional tests form --- doajtest/testbook/public_site/home_page.yml | 31 +++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/doajtest/testbook/public_site/home_page.yml b/doajtest/testbook/public_site/home_page.yml index dfacc81e27..625df716f7 100644 --- a/doajtest/testbook/public_site/home_page.yml +++ b/doajtest/testbook/public_site/home_page.yml @@ -120,19 +120,22 @@ tests: bottom right-hand corner. results: - You are returned to the top of the home page -- title: Accessibility - Skip to main content button - - step: Refresh the page - - step: Click tab key on the keyboard once - results: - - Skip to the main content button is unfolded and focused - - step: Click enter - results: +- title: Skip to main content button (Accessibility) + context: + role: anonymous + steps: + - step: Refresh the page + - step: Click tab key on the keyboard once + results: + - Skip to the main content button is unfolded and focused + - step: Click enter + results: + - Focus is moved to the main content + - step: Turn on screen reader + - step: With the keyboard navigate to Skip to main content button + results: + - Screen reader reads the button title + - step: Click enter + results: - Focus is moved to the main content - - step: Turn on screen reader - - step: With the keyboard navigate to Skip to main content button - results: - - Screen reader reads the button title - - step: Click enter - results: - - Focus is moved to the main content From 011fa6c75d23fc47e7d94287f5aba4d9981655e1 Mon Sep 17 00:00:00 2001 From: Steve Eardley Date: Tue, 3 Oct 2023 12:12:29 +0100 Subject: [PATCH 5/5] Version bump for skip links release --- portality/settings.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portality/settings.py b/portality/settings.py index f1a11269e4..df889cbd14 100644 --- a/portality/settings.py +++ b/portality/settings.py @@ -9,7 +9,7 @@ # Application Version information # ~~->API:Feature~~ -DOAJ_VERSION = "6.4.1" +DOAJ_VERSION = "6.4.2" API_VERSION = "3.0.1" ###################################### diff --git a/setup.py b/setup.py index 9be9b324ea..8d951cb4eb 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name='doaj', - version='6.4.1', + version='6.4.2', packages=find_packages(), install_requires=[ "awscli==1.20.50",