Merge branch 'develop' into feature/3490_apostrophes_in_titles

cms/README.md

@@ -177,19 +177,19 @@ frontmatter directives, then you can also import the template directly at any po
 
 This is done by wrapping a template import directive in an HTML `<div>` tag (to prevent the markdown
 interpreter from touching it).  This is done as follows.  Ensure that the import directive is formatted
-exactly as specified here.  You should just change the path to the template file (`data/sponsors.html`)
+exactly as specified here.  You should just change the path to the template file (`public/includes/_sponsors.html`)
 to the appropriate path for the template you wish to include:
 
 ```
-<div>{% include "data/sponsors.html" %}</div>
+<div>{% include "public/includes/_sponsors.html" %}</div>
 ```
 
 For example, to import a data template in the middle of some text:
 
 ```
 Here is some introductory text about the following data...
 
-<div>{% include "data/sponsors.html" %}</div>
+<div>{% include "public/includes/_sponsors.html" %}</div>
 
 Wasn't that data interesting?
 ```

cms/data/nav.yml

@@ -46,6 +46,8 @@ entries:
         route: doaj.ambassadors       # ~~->Ambassadors:WebRoute~~
       - label: Advisory Board & Council
         route: doaj.abc               # ~~->AdvisoryBoardCouncil:WebRoute~~
+      - label: Editorial Policy Advisory Group
+        route: doaj.epag              # ~~->EditorialPolicyAdvisoryGroup:WebRoute~~
       - label: Volunteers
         route: doaj.volunteers        # ~~->Volunteers:WebRoute~~
       - label: News
@@ -104,7 +106,7 @@ entries:
         url: '#'
         modal:
           id: wechat
-          include: "includes/_wechat_modal.html"
+          include: "public/includes/_wechat_modal.html"
       - label: Atom feed
         feather: rss
         route: atom.feed  # ~~->Atom:WebRoute~~

cms/data/notifications.yml

@@ -1,13 +1,13 @@
 # ~~Notifications:Data~~
 application:assed:assigned:notify:
   long: |
-    An application 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.
+    An application for **{journal_title}** has been assigned to you by the Editor of **{group_name}**. Please start work on this within 1 week.
   short:
     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.
+    The application for **{application_title}** that you marked as Completed has been assigned back to you with questions or changes.
   short:
     One of your applications ({issns}) has not passed review
 
@@ -20,19 +20,19 @@ application:editor:completed:notify:
 
 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.
+    A new application for **{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 ({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.
+    The application for **{application_title}** has been assigned back to your group with questions or changes.
   short:
     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.
+    The application for **{application_title}** has been marked **Ready** by **{editor}** from **{group_name}** . Please review it within 1 week.
   short:
     Application ({issns}) marked as ready
 
@@ -42,13 +42,11 @@ application:publisher:accepted:notify:
 
     You may access the journal record from your Publisher dashboard: [{publisher_dashboard_url}]({publisher_dashboard_url}) using your DOAJ account ID or email address, and password.
 
-    If there are changes or updates to the information about your journal at any time after it has been accepted, please [submit an Update Request](https://doaj.org/publisher/journal) from your Publisher dashboard promptly. Failure to do this promptly may result in the withdrawal of your journal from DOAJ.
+    It is your responsibility to keep the information about your journal in DOAJ up to date. When there are changes or updates needed please [submit an Update Request](https://doaj.org/publisher/journal) from your Publisher dashboard promptly. Please be aware that failure to do this may result in removal of your journal from DOAJ.
 
-    [How to submit an Update Request](https://doaj.org/apply/publisher-responsibilities/#keeping-your-journal-records-up-to-date)
+    To increase the visibility, distribution and usage of your journal content, we encourage you to upload article metadata for this journal to DOAJ as soon as possible.
 
-    To increase the visibility, impact, distribution and usage of your journal content, we encourage you to upload article metadata for this journal to DOAJ as soon as possible.
-
-    [How to upload article metadata](https://doaj.org/docs/faq/#uploading-article-metadata)
+    [How to upload article metadata]({faq_url}#uploading-article-metadata)
 
     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:
@@ -64,37 +62,41 @@ application:publisher:created:notify:
   long: |
     {title} ([{journal_url}]({journal_url}))
 
-    Thank you for your application on {application_date}.
-
-    We receive hundreds of applications every month. We will review yours as soon as we can. You will receive an email from us when the review is complete or if we have questions.
+    Thank you for your application submitted to DOAJ on {application_date}.
 
-    If you need to make a change to your application, send an email to our Help desk: [[email protected]](mailto:[email protected]). Please include your ISSN. We cannot reply to emails requesting a status update for applications which are less than three months old.
-
-    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})
+    Our average review time is 3 months due to the large number of applications we receive. 
+    You may request a status update only after three months have passed since you submitted an application.  
+    
+    During the review, you may receive an email from us if we have questions. You may be contacted by one of our volunteer editors who will not be using a DOAJ email address so please check your spam folder regularly. 
+    You can see our volunteers listed here: [{volunteers_url}]({volunteers_url})
+    
+    If you need to make a change to your application, send an email to our Help desk: [[email protected]](mailto:[email protected]). Please include your ISSN. 
+    We cannot reply to emails requesting a status update within 3 months of application.
+    
   short:
     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.
+    The Associate Editor ([{volunteers_url}]({volunteers_url})) 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 ({issns}) is under review
 
 application:publisher:quickreject:notify:
   long: |
-    The application which you submitted for **{title}** on {date_applied} has been rejected as the journal does not meet our basic criteria ([{doaj_guide_url}]({doaj_guide_url})).
+    The application you submitted for **{title}** on {date_applied} has been rejected as the journal does not meet our criteria for inclusion. 
     
     {note}
     
-    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}))
+    You may submit a new application 6 months after the date of this email. Before you apply again, make the necessary changes to ensure your journal adheres to our criteria: ([{doaj_guide_url}]({doaj_guide_url}))
   short:
     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.
+    The update 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 ({issns}) needs revisions
 
@@ -118,9 +120,9 @@ journal:editor_group:assigned:notify:
 
 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}).
+    The changes which you submitted 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 edited by our editorial team. 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.
+    Thank you for helping to keep the DOAJ database up-to-date.
   short:
     Update request ({issns}) accepted
 
@@ -134,11 +136,10 @@ update_request:publisher:assigned:notify:
 
 update_request:publisher:rejected:notify:
   long: |
-    The update which you submitted for **{title}** on {date_applied} has been rejected. This is either because:
+    The update which you submitted for **{title}** on {date_applied} has been rejected. 
 
-    - We were unable to verify the information which you provided with the information stated on your website. Please double check your website and submit a new update when you are ready; or
+    If you have any questions about this or require further details, please contact our Help Desk: [email protected].
 
-    - We already have one active update in the system. Additional updates are rejected without review.
   short:
     Your update request ({issns}) was rejected
 

cms/data/team.yml

@@ -31,9 +31,9 @@
     2024: https://drive.google.com/file/d/1Gr7f_V5Of84_OmRr_4vYnJyAyOLMEySA/view?usp=drive_link
 
 - name: Dominic Mitchell
-  role: Operations Manager
+  role: Deputy Director, Platform Manager
   photo: dominic.jpg
-  bio: "Dominic has over 25 years of experience working with the publisher and library communities. He is responsible for operations, and the 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 is also Chair of the OASPA Board of Directors. His spare time is divided between looking after his twin sons and his vinyl record collection."
+  bio: "Dominic has over 25 years of experience working with the publisher and library communities. He is responsible for managing and developing the DOAJ platform in association with DOAJ's technical partners. He acts as Committee chair for the Think. Check. Submit. initiative, of which DOAJ is a founding organisation. He is also Chair of the OASPA Board of Directors. His spare time is divided between looking after his twin sons and his vinyl record collection."
   coi:
     2018: https://drive.google.com/file/d/13XX_GUrw2xRmXARjRrTxegULPT8Redka/view?usp=sharing
     2020: https://drive.google.com/file/d/1nxFOuAdXLb8A-LulhNpz9i5vSmr5DBwF/view?usp=sharing
@@ -116,7 +116,7 @@
 - name: Lars Bjørnshauge
   role: Advisor and Founder
   photo: lars.jpg
-  bio: "Lars worked at Danish university libraries for two decades and was Director of Libraries at Lund University, Sweden from 2001 to 2011. He founded the DOAJ in 2003, and was Managing Director from 2013-2021. He has vast experience in change management, re-engineering academic libraries, and developing information services for research & higher education. For more than two decades, Lars has strongly advocated open access and provided services to the open access movement. He is co-founder of <a href=\"http://www.opendoar.org/\" target=\"_blank\">OpenDOAR</a>, the <a href=\"https://www.doabooks.org/\" target=\"_blank\">Directory of Open Access Books</a> and <a href=\"https://thinkchecksubmit.org\" target=\"_blank\">Think. Check. Submit.</a> Lars lives outside Copenhagen and is married with four children and four grandchildren. He enjoys vegetable gardening, growing cacti and succulents, and playing internet chess."
+  bio: "Lars worked at Danish university libraries for two decades and was Director of Libraries at Lund University, Sweden from 2001 to 2011. He founded the DOAJ in 2003, and was Managing Director from 2013-2021. He has vast experience in change management, re-engineering academic libraries, and developing information services for research & higher education. For more than two decades, Lars has strongly advocated open access and provided services to the open access movement. He is co-founder of <a href=\"https://www.opendoar.org/\" target=\"_blank\">OpenDOAR</a>, the <a href=\"https://www.doabooks.org/\" target=\"_blank\">Directory of Open Access Books</a> and <a href=\"https://thinkchecksubmit.org\" target=\"_blank\">Think. Check. Submit.</a> Lars lives outside Copenhagen and is married with four children and four grandchildren. He enjoys vegetable gardening, growing cacti and succulents, and playing internet chess."
   coi:
     2018: https://drive.google.com/file/d/1mm1a8nbY5MQX9loqIs2ZQuVN-73RfPuN/view?usp=sharing
     2021: https://drive.google.com/file/d/1bNj5sqUsu4sRLmm_YOuh3JCSMERzQ1Ro/view?usp=sharing
@@ -132,6 +132,13 @@
     2022: https://drive.google.com/file/d/19rw-naMJqHkI5T7aDIDPUkwPutBdDpDm/view?usp=sharing
     2024: https://drive.google.com/file/d/1mE86YvfsmGtklIs4I_iwLI9iH5vefg0n/view?usp=drive_link
 
+- name: Lene Rasmussen
+  role: Operations Manager
+  photo: lene.jpg
+  bio: "Lene holds a master’s degree in mathematics and economics and spent 17 years in the financial industry before joining DOAJ. She has extensive leadership experience, including leading strategy and business development processes, managing key strategic projects and driving operational excellence while delivering senior management support and advice. Lene highly prioritizes time with close friends and family and loves to travel the world. Her spare time is spent coaching the local children’s soccer team and taking a run or bike ride in the nearby forest."
+  coi:
+    2024: https://drive.google.com/file/d/1GK8gX_8_yoDWiidDweF9CHVlG0N7a-ot/view?usp=sharing
+
 - name: Mahmoud Khalifa
   role: Managing Editor and Ambassador
   photo: mahmoud-new.jpg

cms/data/volunteers.yml

@@ -125,8 +125,16 @@ ass_ed:
   city: Florence
   country: Italy
   language: Italian, English, Spanish
-
-- name: Amber Osman
+
+- name: Ana Melisa Fernandes
+  area: Bird behavior and ecology
+  year_since:
+  city: Bogotá 
+  country: Colombia
+  language: Spanish, English, Portuguese
+  photo: "Ana Melisa Fernandes.jpg" 
+
+- name: Amber Osman 
   area: Open Science, Publication Ethics, Scholarly communication
   year_since:
   city: Karachi
@@ -193,7 +201,8 @@ ass_ed:
   city: York
   country: United Kingdom
   language: English
-
+  photo: "Ben Catt.jpg"
+
 - name: Busro Busro
   area: Humanities
   year_since:
@@ -463,7 +472,15 @@ ass_ed:
   country: Iraq
   language: Arabic, English, Swedish
   photo: "karima.jpg"
-
+
+- name: Kelly Anne Dumayne
+  area: Psychology, linguistics, creative writing
+  year_since:
+  city: Wales
+  country: United Kingdom
+  language: English
+  photo: 
+
 - name: Khoirul Fathoni
   area: Humanities
   year_since:

cms/pages/about/advisory-board-council.md

@@ -1,6 +1,6 @@
 ---
 layout: no-sidenav
-include: /data/advisory-board-council.html
+include: /public/includes/_advisory-board-council.html
 title: Advisory Board & Council
 section: About
 toc: true

cms/pages/about/ambassadors.md

@@ -1,12 +1,17 @@
 ---
-layout: no-sidenav
-include: /data/ambassadors.html
+layout: sidenav
+include: /public/includes/_ambassadors.html
 title: Ambassadors
 section: About
 toc: true
+sticky_sidenav: true
 highlight: true
 featuremap: ~~Ambassadors:Fragment->AmbassadorsData:Template~~
 
 ---
 
-DOAJ has 21 active ambassadors, who work with communities around the world. Ambassadors help journal editors understand the importance of standards in open access publishing; they raise DOAJ's profile and help to make the journals a more attractive place to publish research.
+DOAJ has 13 active Ambassadors, who work with local communities around the world. Ambassadors work within Low- or Middle-Income Countries (LMIC) to raise DOAJ's profile through local outreach and engagment activities. Ambassadors advocate for good practice in open access and publishing, assist with information around applying to DOAJ, and conduct training and events on behalf of DOAJ. 
+
+In 2024, we reveiwed the Ambassador Programme and have implemented a range of changes. In 2025, our Ambassador Programme will have a pilot year where our focus will be on projects led by Ambassadors, supported by DOAJ. If you are interested in becoming an Ambasador, please look out for calls and information that will be published on [our blog](https://blog.doaj.org/).
+
+#