merge develop

.circleci/config.yml

@@ -14,6 +14,7 @@ jobs:
           - xpack.security.enabled: false
           - transport.host: localhost
           - discovery.type: single-node
+    parallelism: 4
 
     steps:
       - checkout
@@ -26,7 +27,8 @@ jobs:
           echo "ELASTICSEARCH_HOSTS = [{'host': 'localhost', 'port': 9200}]" > test.cfg
           python portality/cms/build_fragments.py
           python portality/cms/build_sass.py
-          pytest -v --color=yes --code-highlight=yes --log-level=DEBUG doajtest/unit
+          TESTS=$(circleci tests glob "doajtest/unit/**/*.py" | circleci tests split)
+          pytest -v --color=yes --code-highlight=yes --log-level=DEBUG $TESTS
 
     working_directory: ~/doaj
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -55,6 +55,10 @@ Instructions for reviewers:
   - [ ] Developer
   - [ ] Reviewer
 
+- Urls are constructed with `url_for` not hard-coded
+  - [ ] N/A
+  - [ ] Developer
+  - [ ] Reviewer
 ### Testing
 
 - Unit tests have been added/modified
@@ -72,6 +76,11 @@ Instructions for reviewers:
   - [ ] Developer
   - [ ] Reviewer
 
+- Have CSS/style changes been implemented?  If they are of a global scope (e.g. on base HTML elements) have the downstream impacts of the change in other areas of the system been considered?
+  - [ ] N/A
+  - [ ] Developer
+  - [ ] Reviewer
+
 ### Documentation
 
 - FeatureMap annotations have been added

cms/data/notifications.yml

@@ -3,38 +3,38 @@ application:assed:assigned:notify:
   long: |
     An application, or update request for the journal **{journal_title}** has been assigned to you by the Editor of your group **{group_name}**. Please start work on this within 10 days.
   short:
-    New application assigned to you
+    New application ({issns}) assigned to you
 
 application:assed:inprogress:notify:
   long: |
     The application for **{application_title}** has not passed review by an Editor or Managing Editor and has been assigned back to you with questions or changes.
   short:
-    One of your applications has not passed review
+    One of your applications ({issns}) has not passed review
 
 application:editor:completed:notify:
   long: |
     **{associate_editor}** has finished a review of the application for **{application_title}**
      and marked it as **Completed**. Please review within 5 working days.
   short:
-    Application marked as completed
+    Application ({issns}) marked as completed
 
 application:editor_group:assigned:notify:
   long: |
     A new application or an update request for the journal **{journal_name}** has been assigned to your group by a Managing Editor. Please assign this to an Associate Editor within 5 working days.
   short:
-    New application assigned to your group
+    New application ({issns}) assigned to your group
 
 application:editor:inprogress:notify:
   long: |
     The application for **{application_title}** has not passed review by a Managing Editor and has been assigned back to your group with questions or changes.
   short:
-    Application reverted to 'In Progress' by Managing Editor
+    Application ({issns}) reverted to 'In Progress' by Managing Editor
 
 application:maned:ready:notify:
   long: |
     The application for **{application_title}** has been marked **Ready** by **{editor}**. Please review it as soon as possible.
   short:
-    Application marked as ready
+    Application ({issns}) marked as ready
 
 application:publisher:accepted:notify:
   long: |
@@ -52,13 +52,13 @@ application:publisher:accepted:notify:
 
     We are delighted to welcome this journal into DOAJ. Do not hesitate to contact us at [[email protected]](mailto:[email protected]) if you have any questions.
   short:
-    Your journal has been accepted
+    Your journal ({issns}) has been accepted
 
 application:publisher:assigned:notify:
   long: |
     Your application for **{application_title}** submitted on {application_date} has been assigned to an editor for review for inclusion in the DOAJ. Please look out for further communications about the application. These may come from someone who is not using a DOAJ email address: [{volunteers_url}]({volunteers_url})
   short:
-    Your application has been assigned an editor for review
+    Your application ({issns}) has been assigned to an editor for review
 
 application:publisher:created:notify:
   long: |
@@ -72,15 +72,15 @@ application:publisher:created:notify:
 
     If you write to us, check first that there is nothing in your Spam folder from us or one of our volunteers. Our volunteers may not be emailing from a DOAJ email address so you can check that their name is there on this page [{volunteers_url}]({volunteers_url})
   short:
-    Your application to DOAJ has been received
+    Your application ({issns}) to DOAJ has been received
 
 application:publisher:inprogress:notify:
   long: |
     Your submission for **{title}** submitted on {date_applied} is now being reviewed by an Associate Editor.
 
     The Associate Editor ([{volunteers}]({volunteers})) may contact you by email with questions. They may not be using a doaj.org email address. These emails can end up in your Spam folder so please check your Spam folder regularly.
   short:
-    Your submission is under review
+    Your submission ({issns}) is under review
 
 application:publisher:quickreject:notify:
   long: |
@@ -90,13 +90,13 @@ application:publisher:quickreject:notify:
     
     You may submit a new application 6 months after the date of this email unless advised otherwise by a member of the DOAJ Editorial Team. Before you apply again, make any necessary changes to ensure your journal adheres to our criteria: ([{doaj_guide_url}]({doaj_guide_url}))
   short:
-    Your application was rejected
+    Your application ({issns}) was rejected
 
 application:publisher:revision:notify:
   long: |
     The update which you submitted for **{application_title}** on {date_applied} requires some revisions before it can be accepted. The Managing Editor reviewing your update will contact you to explain the changes that are needed.
   short:
-    Your update request needs revisions
+    Your update request ({issns}) needs revisions
 
 bg:job_finished:notify:
   long: |
@@ -108,29 +108,29 @@ journal:assed:assigned:notify:
   long: |
     The journal **{journal_name}** has been assigned to you by the Editor of your group **{group_name}**. Please start work on this within 10 days.
   short:
-    New journal assigned to you
+    New journal ({issns}) assigned to you
 
 journal:editor_group:assigned:notify:
   long: |
     The journal **{journal_name}** has been assigned to your group by a Managing Editor. Please assign this to an Associate Editor within 5 working days.
   short:
-    New journal assigned to your group
+    New journal ({issns}) assigned to your group
 
 update_request:publisher:accepted:notify:
   long: |
     Congratulations! The changes which you sent us for **{application_title}** on {application_date} have been reviewed and the journal record updated. Please note that some of the changes you suggested may have been omitted and replaced with other values by the Managing Editor who carried out the review. Review the journal record here: [{publisher_dashboard_url}]({publisher_dashboard_url}).
 
     Thank you for updating this journal and helping to keep the DOAJ database up-to-date.
   short:
-    Update request accepted
+    Update request ({issns}) accepted
 
 update_request:publisher:assigned:notify:
   long: |
     The update you submitted for **{application_title}** on {application_date} has been assigned to a Managing Editor for review.
 
     Thank you for helping to keep the DOAJ database up-to-date.
   short:
-    Your update request has been assigned an editor for review
+    Your update request ({issns}) has been assigned to an editor for review
 
 update_request:publisher:rejected:notify:
   long: |
@@ -140,5 +140,10 @@ update_request:publisher:rejected:notify:
 
     - We already have one active update in the system. Additional updates are rejected without review.
   short:
-    Your update request was rejected
+    Your update request ({issns}) was rejected
 
+journal:assed:discontinuing_soon:notify:
+  long: |
+    Journal "{title}" (id: {id}) will discontinue in {days} days.
+  short:
+     Journal discontinuing

cms/data/sponsors.yml

@@ -94,6 +94,10 @@ bronze:
   url: https://www.iop.org/
   logo: iop.jpg
 
+- name: International Union for Conservation of Nature
+  url: https://iucn.org/
+  logo: IUCN.svg
+
 - name: JMIR Publications
   url: https://jmirpublications.com/
   logo: jmir.svg
@@ -106,6 +110,10 @@ bronze:
   url: https://www.keaipublishing.com/
   logo: keai.svg
 
+- name: NERAC Inc.
+  url: https://www.nerac.com/
+  logo: nerac.jpg
+
 - name: OASPA
   url: https://oaspa.org/
   logo: oaspa.png

cms/data/team.yml

@@ -33,7 +33,7 @@
 - name: Dominic Mitchell
   role: Operations Manager
   photo: dominic.jpg
-  bio: 'Dominic has over 25 years experience working with publisher and library communities. He is responsible for operations and development of the DOAJ platform. He acts as Committee chair for the Think. Check. Submit. initiative, of which DOAJ is a founding organisation. He represents DOAJ in Project JASPER, a cross-industry project working to ensure that journals are preserved for the long term. He also sits on the OASPA Board of Directors and serves as Secretary. Outside of work, he is reluctantly becoming an expert in the playparks of Stockholm with his twin sons.'
+  bio: 'Dominic has over 25 years of experience working with publisher and library communities. He is responsible for operations and development of the DOAJ platform. He acts as Committee chair for the Think. Check. Submit. initiative, of which DOAJ is a founding organisation. He represents DOAJ in Project JASPER, a cross-industry project working to ensure that journals are preserved for the long term. He also sits on the OASPA Board of Directors and serves as Secretary. Outside of work, he is reluctantly becoming an expert in the playparks of Stockholm with his twin sons.'
   coi:
     2016: https://drive.google.com/file/d/0ByRf6PVViI-mWmU0UHZqZm1xcDQ/view?usp=sharing&resourcekey=0-BmQKwWn6Vb9ot73Xie66aA
     2018: https://drive.google.com/file/d/13XX_GUrw2xRmXARjRrTxegULPT8Redka/view?usp=sharing
@@ -43,7 +43,7 @@
 - name: Gala García Reátegui
   role: Managing Editor
   photo: gala.jpg
-  bio: 'Gala holds a Masters Degree in Information and Documentation from Lyon 3 University in France. Prior to joining DOAJ, she worked for the Digital Strategy and Data Directorate at The French National Research Agency (ANR) and for the Open Archive HAL at the Center for Direct Scientific Communication (CCSD). Gala is Peruvian but lived for more than ten years in France. Today, she is based in Denmark. She loves meeting people from other cultures, trying local dishes or experiences: currently Gala goes winter bathing in the Limfjord, Denmark! She also loves running.'
+  bio: "Gala holds a Master's Degree in Information and Documentation from Lyon 3 University in France. Prior to joining DOAJ, she worked for the Digital Strategy and Data Directorate at The French National Research Agency (ANR) and for the Open Archive HAL at the Center for Direct Scientific Communication (CCSD). Gala is Peruvian but lived for more than ten years in France. Today, she is based in Denmark. She loves meeting people from other cultures, trying local dishes or experiences. Currently Gala goes winter bathing in the Limfjord, Denmark! She also loves running."
   coi:
     2023: https://drive.google.com/file/d/1R7XquFauefdmtjPIsfGfAWQoAw7NLIci/view?usp=sharing
 
@@ -55,28 +55,17 @@
     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
-  bio: 'Joanna has had over 25 years experience of working within research libraries in the UK and Denmark, most recently as Head of Roskilde University Library, before joining DOAJ in 2022. She has also been involved with UKSG as Chair of Insights Editorial Board and a Trustee, and is currently Vice Chair. Joanna lives with her family in Roskilde and enjoys running in her spare time.'
+  bio: 'Joanna has over 25 years of experience working within research libraries in the UK and Denmark, most recently as Head of Roskilde University Library, before joining DOAJ in 2022. She has also been involved with UKSG as Chair of Insights Editorial Board and a Trustee, and is currently Vice Chair. Joanna lives with her family in Roskilde and enjoys running in her spare time.'
   coi:
     2022: https://drive.google.com/file/d/1-3xzwkHMclREgLhj_XNF5n6Nr4q2_bnw/view?usp=sharing
 
 - name: Judith Barnsby
-  role: Senior Managing Editor
+  role: Head of Editorial
   photo: judith.jpg
-  bio: 'Judith has 25 years experience in the scholarly publishing industry, working for a range of non-profit society publishers and service providers before joining DOAJ. She has a keen interest in publishing standards and protocols, and has served on the board of CLOCKSS and as chair of the PALS (publisher and library solutions) working group in the UK. Judith loves books, especially detective fiction, and volunteers in her local library.'
+  bio: 'Judith has 25 years of experience in the scholarly publishing industry, working for a range of non-profit society publishers and service providers before joining DOAJ. She has a keen interest in publishing standards and protocols, and has served on the board of CLOCKSS and as chair of the PALS (publisher and library solutions) working group in the UK. Judith loves books, especially detective fiction, and volunteers in her local library.'
   coi:
     2016: https://drive.google.com/file/d/0B0fPCpIPjZlmb3JmVkFYbjN5aTh1OUhLd2lZaEV0ZlFwbTZV/view?usp=sharing&resourcekey=0-o_PXKLk5UFbPk_-4B61jVA
     2018: https://drive.google.com/file/d/0ByRf6PVViI-mV2lfMjByQjYxUkpMcXhuc2l5Q3ZDWlpiYUtZ/view?usp=sharing&resourcekey=0-6eiGIRal00eXvgJUTeN_lw
@@ -96,7 +85,7 @@ Based in Rome and Göttingen, Ilaria loves baking cakes; she speaks Italian, Eng
 - name: Katrine Sundsbø
   role: Community Manager
   photo: katrine.jpeg
-  bio: 'Katrine holds a Master’s degree in Cognitive Neuroscience, and has five years of experience in the field of scholarly communications. She has been an advocate for open access and visibility of research through various working groups, projects and through gamification of scholarly communications. Though Katrine is half Danish and half Norwegian, her son is named after a Swedish singer - and her British husband suggested the name!'
+  bio: "Katrine holds a Master’s degree in Cognitive Neuroscience, and has five years of experience in the field of scholarly communications. She has been an advocate for open access and visibility of research through various working groups, projects and through gamification of scholarly communications. Though Katrine is half Danish and half Norwegian, her son is named after a Swedish singer - and her British husband suggested the name!"
   coi:
     2023: https://drive.google.com/file/d/1yqK-Znq62T_QR_JjtcpQl6W_Ian2Ti4F/view?usp=share_link
 
@@ -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

cms/data/volunteers.yml

@@ -467,8 +467,8 @@ ass_ed:
 - name: Kadri Kıran
   area: Systematic Entomology
   year_since:
-  city: Tekirdag
-  country: Turkey
+  city: Edirne
+  country: Türkiye
   language: English, Turkish, German
   photo: "Kadri Kiran.jpg"