Merge branch 'develop' into feature/3621_removing_selected_filter

cms/data/notifications.yml

@@ -142,3 +142,8 @@ update_request:publisher:rejected:notify:
   short:
     Your update request was rejected
 
+journal:assed:discontinuing_soon:notify:
+  long: |
+    Journal "{title}" (id: {id}) will discontinue in {days} days.
+  short:
+     Journal discontinuing

cms/data/sponsors.yml

@@ -39,6 +39,10 @@ silver:
 - name: MDPI
   url: https://www.mdpi.com/
   logo: mdpi.svg  
+
+- name: OA.Works
+  url: https://oa.works/
+  logo: oaworks.png
 
 - name: SAGE Publishing
   url: https://www.sagepublications.com/
@@ -102,6 +106,10 @@ bronze:
   url: https://www.keaipublishing.com/
   logo: keai.svg
 
+- name: OASPA
+  url: https://oaspa.org/
+  logo: oaspa.png
+
 - name: OCLC
   url: https://www.oclc.org/
   logo: oclc.svg

cms/data/team.yml

@@ -50,22 +50,11 @@
 - name: Iemima Ploscariu
   role: Managing Editor
   photo: iemima.jpeg
-  bio: 'Iemima holds a Master of Arts in Comparative History from Central European University, Hungary, and a Master of Letters in Central and East European Studies from the University of St Andrews, Scotland. She is a PhD student and researcher for the Irish Research Council at Dublin City University, Ireland. She volunteered as an Editor for DOAJ from 2014 until 2020 when she became a Managing Editor.'
+  bio: 'Iemima holds a PhD in History from Dublin City University, Ireland, as an Irish Research Council fellow. She also has an MA in Comparative History and an MLitt in Central and East European Studies. She is originally from Romania, grew up in California, and now lives in Barcelona, Spain. She volunteered as an Editor for DOAJ from 2014 until 2020 when she became a Managing Editor.'
   coi:
     2020: https://drive.google.com/file/d/1-4wTgvwCu_tvDv5NIoJhZi0QpQl-fpdB/view?usp=sharing
     2022: https://drive.google.com/file/d/1xEUUxhqSE0OnKd_x8z1oLLRRrJrKAwXA/view?usp=sharing
 
-- name: Ilaria Fava
-  role: Managing Editor
-  photo: Ilaria.jpg
-  bio: 'Ilaria is a librarian with several years of experience within the Open Access community in her home country of Italy, where she has dealt with Open Access issues at both national and international level. She also serves the Göttingen State and University Library working on Open Science projects.
-Based in Rome and Göttingen, Ilaria loves baking cakes; she speaks Italian, English, some Spanish and a little German.'
-  coi:
-    2016: https://drive.google.com/file/d/0ByRf6PVViI-mY2dRZTR5eTFjQkk/view?usp=sharing&resourcekey=0-fPa6ce_HjfoVQqKGqWxLNw
-    2018: https://drive.google.com/file/d/1AMi0uIWHgEiaqmJLM7f_SFsiLEJENfjF/view?usp=sharing
-    2020: https://drive.google.com/file/d/1jWZKc6xjp3yfo6qjQWp6Yp3y-71ZHLth/view?usp=sharing
-    2022: https://drive.google.com/file/d/1_au6llN2ALPnkNTgUrzLrSTw8gundldJ/view?usp=sharing
-
 - name: Joanna Ball
   role: Managing Director
   photo: joba.jpg
@@ -120,14 +109,6 @@ Based in Rome and Göttingen, Ilaria loves baking cakes; she speaks Italian, Eng
     2020: https://drive.google.com/file/d/1zU-lLB5W54E_QUm5uto5tqB6cZl83TAJ/view?usp=sharing
     2022: https://drive.google.com/file/d/19rw-naMJqHkI5T7aDIDPUkwPutBdDpDm/view?usp=sharing
 
-- name: Louise Stoddard
-  role: Communications Manager
-  photo: louise.jpg
-  bio: "Louise has over 15 years experience in communications and public relations for non-profit and international organisations. She holds a Masters in Journalism and a Bachelor of Science and Economics in International Development from The University of Wales, Swansea. Louise has worked for the United Nations for 8 years, also with academic and non-profit organisations promoting access to knowledge and information. In 2021 Louise joined DOAJ as the focal point for public relations and communications. Outside of work Louise can usually be found in her vegetable garden."
-  coi:
-    2021: https://drive.google.com/file/d/1DmDsIkv-orjF7QGEVwqFDAl0EQx3qRXg/view?usp=sharing
-    2022: https://drive.google.com/file/d/1wOeX97BZGEX50orKo6TwlWmGsdbLFfBD/view?usp=sharing
-
 - name: Luis Montilla
   role: Managing Editor
   photo: luis.jpeg
@@ -193,7 +174,7 @@ Based in Rome and Göttingen, Ilaria loves baking cakes; she speaks Italian, Eng
     2022: https://drive.google.com/file/d/19J5ELHNaV_pby7ZpQMii8_Ts4wiERu8K/view?usp=sharing
 
 - name: Tom Olijhoek
-  role: Editor-in-Chief
+  role: Head of Outreach
   photo: tom.jpg
   bio: 'Tom has a PhD in molecular microbiology and spent several years in Africa doing research on malaria, sleeping sickness and meningococcal epidemics. He has been actively advocating open access and open science since 2012 when he joined the Open Knowledge community and became a member of the DOAJ advisory board. His current research interests are development of quality systems for the assessment of scholarly journals and articles, and research in the area of soil microbiology in relation to soil health and human health.'
   coi:

cms/data/volunteers.yml

@@ -68,6 +68,14 @@ ed:
   featured: true
   photo: "napa.jpg"
 
+- name: Pablo Hernandez
+  area: Medical Sciences
+  year_since:
+  city: Caracas
+  country: Venezuela
+  language: Spanish, English
+  photo: "Pablo.jpg"
+
 - name: Paola Galimberti
   area: Research Evaluation
   year_since:
@@ -456,6 +464,14 @@ ass_ed:
   country:
   language: Korean, English
 
+- name: Kadri Kıran
+  area: Systematic Entomology
+  year_since:
+  city: Edirne
+  country: Türkiye
+  language: English, Turkish, German
+  photo: "Kadri Kiran.jpg"
+
 - name: Kâmil B. Varınca
   area: Science
   year_since:
@@ -687,14 +703,6 @@ ass_ed:
   country: Spain
   language: Euskera, Spanish, English
 
-- name: Pablo Hernandez
-  area: Science
-  year_since:
-  city: Caracas
-  country: Venezuela
-  language: Spanish, English
-  photo: "pablohernandez.jpg"
-
 - name: Paula Carina de Araújo
   area: Library and Information Science
   year_since:

cms/pages/about/at-20.md

@@ -23,16 +23,17 @@ Further down the page is a historical timeline to give you a full overview of DO
 [//]: # (NB. adding whitespace around the titles will break styling)
 {.events .unstyled-list}
 - {% include "includes/svg/at-20/theme_open.svg" %}
-   - **[Registration is open](https://us02web.zoom.us/webinar/register/WN_-b000to3RZKexuFsJGJw1g#/registration)**
+   - **[Recording is available](https://www.youtube.com/watch?v=qnpSdX3eusk)**
    - Name: _DOAJ at 20: Open_
    - Date: 15th June 2023
-   - Event Time: 13:00 UTC ([Check the event time](https://www.timeanddate.com/worldclock/fixedtime.html?iso=20230615T13&ah=1&am=30) where you are.)
+   - Event Time: 13:00 UTC 
    - Duration: 90 mins
 - {% include "includes/svg/at-20/theme_global.svg" %}
+   - **[Registration is open](https://us02web.zoom.us/webinar/register/WN_fu42oi59S7GZ366rjyAUGg#/registration)**
    - Name: _DOAJ at 20: Global_
    - Date: _28th September 2023_
-   - Event Time: to be confirmed
-   - Duration: 90 mins
+   - Event Time: 13:00 UTC ([Check the event time](https://www.timeanddate.com/worldclock/fixedtime.html?iso=20230928T13&ah=1&am=30) where you are.)
+   - Duration: 2 hours
 - {% include "includes/svg/at-20/theme_trusted.svg" %}
    - Name: _DOAJ at 20: Trusted_
    - Date: _7th December 2023_
@@ -41,27 +42,15 @@ Further down the page is a historical timeline to give you a full overview of DO
 
 ## Open
 
-Join us for the first of three events marking our 20th anniversary as a key open infrastructure. 'DOAJ at 20: Open' is free and open to researchers, librarians, research support staff, publishers, and anyone interested in open access!
-
-The event will build around the theme ‘open’, where our moderator (Abeni Wickham) will be chatting with our three guests: Lars Bjørnshauge, Mikael Laakso, and Nadine Buckland. The discussion will focus on their thoughts and aspirations on open scholarship. They will also explore the obstacles and challenges in adopting immediate open access. 
-
-The event will last 90 minutes.
-
-**Abeni Wickham**
-
-Abeni was born in Guyana, South America and holds a PhD in Molecular Physics from Linkoping University. She left academia in 2018 to create SciFree, a software company with a mission to make research open to the public for free. SciFree currently serves 45 University Library customers in Sweden, Denmark, the United Kingdom and the USA. Besides building new tech platforms for university infrastructure, Abeni volunteers on the NASIG Digital Preservation committee, helps PhDs transition in their careers and enjoys surfing both actual waves and the Open Access wave worldwide.
+Our first of three events marking our 20th anniversary took place on the 15th June 2023. The event was built around the theme ‘open’, where our moderator (Abeni Wickham) had a coversation with our three guests: Lars Bjørnshauge, Mikael Laakso, and Nadine Buckland. The discussion focused on development and changes over the last 20 years, with reflections from all speakers on what the next years will bring. A recording of the event is [available on YouTube](https://www.youtube.com/watch?v=qnpSdX3eusk). 
 
-**Lars Bjørnshauge**
+## Global
 
-Lars Bjørnshauge is the Director of Infrastructure Services for Open Access C.I.C (www.is4oa.org). A true open access champion, Lars is DOAJ’s founder and worked as the Managing Director until 2022. Previously, he has been the Deputy Director and Acting Director for the Technical Information Center of Denmark at the Technical University of Denmark. Lars has also been the Director of Libraries at Lund University in Sweden, and the Director of SPARC Europe. In addition to founding DOAJ, he has also co-founded OpenDOAR (the Directory of Open Access Repositories, DOAB (Directory of Open Access Books), and Think.Check.Submit. Lars was on the OASPA Board from 2012-2019.
+Our second event will be around the theme Global, where we will have eight lighting talks from speakers from around the world. Our moderator and DOAJ Ambassador, Ivonne Lujano, will introduce speakers and manage two Q&As, where the audience can ask our speakers questions. More information about the event and all the speakers can be found on the [registration page](https://us02web.zoom.us/webinar/register/WN_fu42oi59S7GZ366rjyAUGg#/registration).
 
-**Mikael Laakso**
+## Trusted
 
-Mikael Laakso is an Associate Professor in Information Systems Science at Hanken School of Economics in Helsinki. He has been researching the changing landscape towards openness in scholarly publishing by studying combinations of bibliometrics, web metrics, business models, science policy, and author behaviour. Since the start of his research in this domain around 2009, DOAJ data has been instrumental to most of his research projects. In addition to research, Mikael has also been active in national and international working groups furthering various dimensions of open science.
-
-**Nadine D. Tulloch-Buckland**
-
-Nadine D. Tulloch-Buckland is the former General Manager of the UWI Press, Senior Lecturer of the University of the West Indies and Director of Spoizer Content Agency Limited. She has over twenty years’ experience in scholarly publishing with specific emphasis on finance and business model development geared towards sustainability in scholarly publishing in the Caribbean. Nadine is the current Treasurer of ALPSP and former Treasurer/Director of AUPresses. She is an advocate for Sustainable Open Access Publishing.
+Our third and last DOAJ at 20 event will be around the theme Trusted. More information about this event will be available later in the year. 
 
 ## Timeline 
 
@@ -124,6 +113,9 @@ Find out more by [registering with us](https://forms.reform.app/S49aj6/DOAJat20/
 You can also follow and join our celebration on social media: #DOAJat20 ([Mastodon](https://masto.ai/tags/DOAJat20) & [Twitter](https://twitter.com/search?q=%23DOAJat20)).
 
 ## Support our anniversary campaign
+
+<iframe src="https://www.paypal.com/giving/campaigns?campaign_id=4VXR4TJ69MDJJ" title="PayPal donate campaign card" frameborder="0" width=382 height=550 scrolling="no" ></iframe>
+
 As a crucial open infrastructure, DOAJ relies on donations from supporting organisations to help keep it running to provide the services the community relies on and trusts.
 
 We're running [a fundraising campaign](https://www.paypal.com/giving/campaigns?campaign_id=4VXR4TJ69MDJJ) for our 20th year. 

cms/pages/about/index.md

@@ -14,7 +14,7 @@ OPEN - DOAJ is a vital part of the global open access infrastructure.
 
 GLOBAL – DOAJ is a global community, with [team members](/about/team/), [ambassadors](/about/ambassadors/) and [volunteers](/about/volunteers/) based in 45 countries around the world, speaking 36 languages.
 
-TRUSTED – Globally DOAJ's [standards](/apply/guide/#basic-criteria-for-inclusion) have become a gold standard for open access publishing.
+TRUSTED – Globally, DOAJ's [criteria](/apply/guide/#basic-criteria-for-inclusion) have become a gold standard for open access publishing.
 
 ## Our mission
 
@@ -30,7 +30,7 @@ DOAJ works to build an equitable and diverse scholarly ecosystem where trusted r
 
 DOAJ is an independent, non-profit organisation managed by [Infrastructure Services for Open Access C.I.C.](https://is4oa.org/) (IS4OA), a  [community interest company](https://en.wikipedia.org/wiki/Community_interest_company) registered in the United Kingdom and with a branch in Denmark. 
 
-DOAJ relies entirely on the voluntary donations of its supporters. Neither DOAJ or IS4OA receive grants or funding from any other source.
+DOAJ relies entirely on the voluntary donations of its supporters. Neither DOAJ nor IS4OA receive grants or funding from any other source.
 
 DOAJ has an [Advisory Board and Council](/about/advisory-board-council), the members of which carry out their duties voluntarily.
 
@@ -51,19 +51,19 @@ We expect the members of our Team, our volunteers and our Ambassadors to always
 
 ## Partnerships and collaborations
 
-DOAJ partners with many organisations. The nature of the partnerships vary and may include membership, contracts for work, exchanges of information or services, initiative signatories, or access to information resources that assist DOAJ with our application review process.
+DOAJ partners with many organisations. The nature of the partnerships varies and may include membership, contracts for work, exchanges of information or services, initiative signatories, or access to information resources that assist DOAJ with our application review process.
 
 {:.stretch-list}
 + [Creative Commons Global Network](https://network.creativecommons.org/)
-  {:.stretch-list__item} 
+  {:.stretch-list__item}
++ [Crossref](https://crossref.org/)
+  {:.stretch-list__item}   
 + [COPE](https://publicationethics.org/)
   {:.stretch-list__item} 
 + [Cottage Labs LLP](https://cottagelabs.com/)
   {:.stretch-list__item} 
 + [DOAB (Directory of Open Access Books)](https://www.doabooks.org/)
   {:.stretch-list__item} 
-+ [Federation of Finnish Learned Societies](https://tsv.fi/en)
-  {:.stretch-list__item} 
 + [Helsinki Initiative on Multilingualism](https://www.helsinki-initiative.org/)
   {:.stretch-list__item} 
 + [ISSN](https://www.issn.org/)
@@ -73,7 +73,9 @@ DOAJ partners with many organisations. The nature of the partnerships vary and m
 + [OASPA](https://oaspa.org/)
   {:.stretch-list__item} 
 + [OCLC](https://www.oclc.org/en/home.html)
-  {:.stretch-list__item} 
+  {:.stretch-list__item}
++ [OpenAIRE](https://www.openaire.eu/)
+  {:.stretch-list__item}    
 + [Redalyc](https://www.redalyc.org/)
   {:.stretch-list__item} 
 + [Research4Life](https://www.research4life.org/)

cms/pages/about/team.md

@@ -8,4 +8,3 @@ featuremap: ~~Team:Fragment->TeamData:Template~~
 
 ---
 
-

cms/pages/apply/guide.md

@@ -7,7 +7,7 @@ sticky_sidenav: true
 featuremap: ~~GuideToApplying:Fragment~~
 
 ---
-Before you start the application process, you will be asked to log in or register. You will be able to save your progress and review all your answers before you submit them. A [PDF version of the application form](/static/doaj/docs/2022-09-27-DOAJQuestions.pdf) is available for reference only.
+Before you start the application process, you will be asked to log in or register. You will be able to save your progress and review all your answers before you submit them. A [PDF version of the application form](/static/doaj/docs/2023-07-04-DOAJQuestions.pdf) is available for reference only.
 
 ## Basic criteria for inclusion
 

cms/pages/legal/terms.md

@@ -62,8 +62,16 @@ DOAJ uses a variety of licenses for the different parts of its website and the c
 
 ---
 
+### Licensing terms for content published on DOAJ News Service
+15. DOAJ News Service is the DOAJ blog, hosted on Wordpress: https://blog.doaj.org
+
+16. All content posted on the blog is licensed under the CC BY-NC Creative Commons license. See the blog footer for full details.
+
+---
+
 ### Version history
-1. **Version 1.3** (20 April 2023) - address and contact details added to Copyright (1). 'Other than as permitted in law...' added to Copyright (2). Notice period added to Conditions of using this website (3). Conditions of using this website (4) rewritten completely to make it clearer that the name and website are protected.
-2. **Version 1.2** (20 January 2022) - corrected ownership from DOAJ to IS4OA in Copyright (1). Simplified the language of Copyright (3). Corrected ownership from DOAJ to IS4OA in Conditions of using this website (4)
-3. **Version 1** (March 2021)
+1. **Version 1.4** (03 July 2023) - added details about the way we license content on our blog, DOAJ News Service.
+2. **Version 1.3** (20 April 2023) - address and contact details added to Copyright (1). 'Other than as permitted in law...' added to Copyright (2). Notice period added to Conditions of using this website (3). Conditions of using this website (4) rewritten completely to make it clearer that the name and website are protected.
+3. **Version 1.2** (20 January 2022) - corrected ownership from DOAJ to IS4OA in Copyright (1). Simplified the language of Copyright (3). Corrected ownership from DOAJ to IS4OA in Conditions of using this website (4)
+4. **Version 1** (March 2021)
 

cms/sass/base/_general.scss

@@ -261,7 +261,20 @@ select {
 
 input[type="checkbox"],
 input[type="radio"] {
-  display: none;
+  opacity: 0;
+  width: 0.8em;
+  height: 0.8em;
+  margin-left: -0.8rem;
+
+  &:focus  + label {
+    outline: dashed 2px lightgrey;
+    outline-offset: 1px;
+  }
+
+  &:focus:not(:focus-visible){
+    outline: none;
+  }
+
 
   + label {
     margin: 0 0 $spacing-03 0;

cms/sass/components/_accordion.scss

@@ -0,0 +1,3 @@
+.accordion:focus-within {
+  border: $grapefruit solid;
+}

cms/sass/components/_buttons.scss

@@ -117,3 +117,10 @@ button[type="submit"].button--secondary {
     color: currentColor;
   }
 }
+
+button.aria-button {
+    all: inherit;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+}

cms/sass/components/_filters.scss

@@ -50,6 +50,8 @@
   max-height: $spacing-07;
   height: auto;
   overflow-y: auto;
+  //add minimal padding to ensure visible outline
+  padding-top: $spacing-01;
   @include unstyled-list;
 
   li {

cms/sass/main.scss

@@ -28,6 +28,7 @@
   "layout/sidenav",
 
   "components/alert",
+  "components/accordion",
   "components/back-to-top",
   "components/buttons",
   "components/card",

doajtest/fixtures/urls.py

@@ -0,0 +1,18 @@
+VALID_URL_LISTS = [
+    "https://www.sunshine.com",
+    "http://www.moonlight.com",
+    "https://www.cosmos.com#galaxy",
+    "https://www.cosmos.com/galaxy",
+    "https://www.cosmos.com/galaxy#peanut",
+    "http://ftp.example.com/file%20name.txt"
+]
+
+INVALID_URL_LISTS = [
+    "ht:www",
+    "nonexistent.com",
+    "https://www.doaj.org and https://www.reddit.com",
+    "http://www.doaj.org and www.doaj.org",
+"http://www.doaj.org, www.doaj.org",
+"http://www.doaj.org, https://www.doaj.org",
+"http://ftp.example.com/file name.txt"
+]

doajtest/fixtures/v2/common.py

@@ -1,11 +1,11 @@
 NOTES_FORM_EXPANDED = {
     'notes': [
         {"note": "Second Note", "note_date": "2014-05-22T00:00:00Z", "note_id": "1234",
-         'note_author': '(fake_account_id__b)',
+         'note_author': ' (fake_account_id__b)',
          "note_author_id": "fake_account_id__b",
          },
         {"note": "First Note", "note_date": "2014-05-21T14:02:45Z", "note_id": "abcd",
-         'note_author': '(fake_account_id__a)',
+         'note_author': ' (fake_account_id__a)',
          "note_author_id": "fake_account_id__a",
          }
     ]