merge up from develop for template changes

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/ambassadors.yml

@@ -1,47 +1,21 @@
 # List of DOAJ ambassadors
 # ~~Ambassadors:Data~~
 
-- name: Adrian Stanley
-  region: North America
-  bio: "Adrian is past President of the <a href='https://www.sspnet.org/' target='_blank'>Society for Scholarly Publishing</a> (SSP). He has previously lived and worked in China and is well connected with the global publishing community, especially in places like Brazil (<a href='https://scielo.org/en/SciELO' target='_blank'>Scielo</a>) and Japan (<a href='https://www.jstage.jst.go.jp/' target='_blank'>J-STAGE</a>). He was also Managing Director, Publishers for <a href='https://www.digital-science.com/about-us/' target='_blank'>Digital Science</a>. Adrian serves on the <a href='https://www.oaswitchboard.org/about' target='_blank'>OA Switchboard</a> Client Advisor Group, and is the Chair of the <a href='https://fullyoapublishers.org/' target='_blank'>Fully OA Publishers Group</a> (a sub group formed out of OASPA working group), he is currently an Independent Contractor, and advisor for <a href='https://www.jmirpublications.com/' target='_blank'>JMIR Publications</a>, <a href='http://dataseer.ai/' target='_blank'>DataSeer.ai</a> and <a href='http://underline.io/' target='_blank'>Underline.io</a>."
-  photo: "Adrian.png"
-  coi:
-    2022: https://drive.google.com/file/d/1CC6bqk_JF_kovY6Z-SVhv01epY7dcYWq/view?usp=sharing
 
 - name: Amber Osman
   region: Pakistan
-  bio: "Amber is a passionate expert in open science and a research enthusiast. Over the last decade, she has been actively involved in different international academic, research & publishing organizations and with the Higher Education Commission (Govt. of Pakistan). She has been <a href='https://www.youtube.com/watch?v=n612FOybhIM' target='_blank'>an award-winning journal editor</a> for advancing the publishing process by adopting innovative research and publishing solutions. Amber advocates for best practices in open access scholarly content. She has Masters of Philosophy in marketing."
+  bio: "Amber is a passionate expert in open science and a research enthusiast. Over the last decade, she has been actively involved in different international academic, research & publishing organizations and with the Higher Education Commission (Govt. of Pakistan). She has been <a href='https://www.youtube.com/watch?v=n612FOybhIM' target='_blank'>an award-winning journal editor</a> for advancing the publishing process by adopting innovative research and publishing solutions. Amber advocates for best practices in open access scholarly content. She has a Masters of Philosophy in marketing."
   photo: "amber.jpeg"
   coi:
     2022: https://drive.google.com/file/d/18KLtcd-F4q1XbVxh5o54k7feQUY-e-uv/view?usp=sharing
 
-- name: Eriko Amano
-  region: Japan
-  bio: ""
-  photo: ""
-  coi:
-    2022: https://drive.google.com/file/d/1HXvSXTbgK5n5H3a-P_SPTM_IubmaYJzd/view?usp=sharing
-
 - name: Gimena del Rio Riande
   region: Latin America
-  bio: "Gimena is a researcher at <a href='http://www.iibicrit-conicet.gov.ar/' target='_blank'>IIBICRIT</a>, the Institute for Bibliographic Research and Textual Criticism at CONICET, the main agency that fosters science and technology in Argentina. Most of her research projects are related to Open Science and Digital Humanities, with a focus on the Global South. She is also the president of the <a href='https://aahd.net.ar/' target='_blank'>Asociación Argentina de Humanidades Digitales</a> (AAHD), and a member of the Board of Directors of <a href='https://www.force11.org/' target='_blank'>Force11</a>, <a href='https://openmethods.dariah.eu/' target='_blank'>OpenMethods-DARIAH</a>, <a href='https://en.hypotheses.org/'>Hypotheses</a>, and Area (Open Education Network in Argentina)."
+  bio: "Gimena is a researcher at <a href='http://www.iibicrit-conicet.gov.ar/' target='_blank'>IIBICRIT</a>, the Institute for Bibliographic Research and Textual Criticism at CONICET, the main agency that fosters science and technology in Argentina. Most of her research projects are related to Open Science and Digital Humanities, focusing on the Global South. She is also the president of the <a href='https://aahd.net.ar/' target='_blank'>Asociación Argentina de Humanidades Digitales</a> (AAHD), and a member of the Board of Directors of <a href='https://www.force11.org/' target='_blank'>Force11</a>, <a href='https://openmethods.dariah.eu/' target='_blank'>OpenMethods-DARIAH</a>, <a href='https://en.hypotheses.org/'>Hypotheses</a>, and Area (Open Education Network in Argentina)."
   photo: "del-rio-riande-gimena.jpg"
   coi:
     2022: https://drive.google.com/file/d/1wwxuAH15I4k-mQ3NW03x3W12ExUKJ7f9/view?usp=sharing
 
-- name: Hea Lim Rhee
-  region: South Korea
-  bio: "Hea is a senior researcher at Korea Institute of Science and Technology Information (<a href='https://www.kisti.re.kr/eng/' target='_blank'>KISTI</a>), and also the managing editor of KISTI’s Journal of Information Science Theory and Practice (<a href='https://www.jistap.org/journal/intro.do?journalSeq=J000043' target='_blank'>JISTaP</a>), the first English journal on computer science in Korea.  Hea received her PhD from the University of Pittsburgh and her Master of Science in Information from the University of Michigan, where she specialised in archives and records management."
-  photo: "hea-lim-rhee.jpg"
-  coi:
-    2022: https://drive.google.com/file/d/1qBL2bfc9y1JufncY5bn1pn4zanD519Q_/view?usp=sharing
-
-- name: Hyun Jung Yi
-  region: South Korea
-  bio: "Hyun Jung Yi holds a PhD in Library and Information Science from Chung-Ang University and is a librarian at Hanyang University Guri Hospital. Currently, she also serves as a member of the Scholarly Committee at the Korean Medical Library Association and as a vice chair of the Committee of Information Management at the <a href='https://www.kcse.org/' target='_blank'>Korean Council of Science Editors</a> (KCSE). Her interests include observing trends in the scholarly publishing market, disseminating open access journals, and enhancing the publishing environment for researchers."
-  photo: "hyun-jung-yi.png"
-  coi:
-
 - name: Ikhwan Arief
   region: Indonesia
   bio: "Ikhwan is a faculty member in the Industrial Engineering Department at Universitas Andalas, Indonesia. He is an enthusiastic photography hobbyist. He joined DOAJ in 2018 as an ambassador and gradually became a volunteer editor. He used to manage the university's library information system, including establishing the online public access catalogue (OPAC) and the repository servers. He is keenly interested in data science, primarily in industrial and manufacturing systems research. He has been assisting Indonesian journal managers in their application to DOAJ."
@@ -58,7 +32,7 @@
 
 - name: Ivonne Lujano
   region: Latin America
-  bio: "Ivonne Lujano Vilchis is a PhD student in Education Policy and Evaluation at Arizona State University. She holds a Master’s degree in Social Sciences with an emphasis on Education. She has worked in scholarly communication and open access since 2011. As DOAJ ambassador she has collaborated with several universities and government agencies on the adoption of best practice for scholarly publications, and open science policies. She serves as a section editor of Current Issues of Education, a journal produced by doctoral students at Mary Lou Fulton Teachers College of Arizona State University. Her research interests focus on higher education systems, research evaluation, science policy, open access, scholarly communication, and open science. Ivonne also has a background in dance, and she is currently an amateur tango dancer."
+  bio: "Ivonne Lujano Vilchis is a PhD student in Education Policy and Evaluation at Arizona State University. She holds a Master’s degree in Social Sciences with an emphasis on Education. She has worked in scholarly communication and open access since 2011. As DOAJ ambassador, she has collaborated with several universities and government agencies on the adoption of best practices for scholarly publications and open science policies. She is a section editor of Current Issues of Education, a journal produced by doctoral students at Mary Lou Fulton Teachers College of Arizona State University. Her research interests focus on higher education systems, research evaluation, science policy, open access, scholarly communication, and open science. Ivonne also has a background in dance, and she is currently an amateur tango dancer."
   photo: "ivonne.jpg"
   coi:
     2022: https://drive.google.com/file/d/1HnGhYbvbzL34guWOmIqcthcwAN8NADX1/view?usp=sharing
@@ -69,20 +43,11 @@
   photo: "mahmoud-new.jpg"
   coi:
     2022: https://drive.google.com/file/d/10s7B0WeTPqpaafhThv-i8q03uIFaAAue/view?usp=sharing
-
-- name: Maxim Mitrofanov
-  region: Russian Federation
-  bio: "Maxim was born in Moscow, graduated from the University of Foreign Relations and then worked for the Ministry of Foreign Affairs of Russia for nine years. After leaving the Ministry in 2007 he worked for the largest Russian exhibition company, Expocentre, and then joined NEICON in 2014. NEICON is the driving force to share open access ideas among the Russian journal and scholar community."
-  photo: "max.png"
-  coi:
-    2022: https://drive.google.com/file/d/1Dzb8QzS5V0KzjNnybkWFQpjBwk1Jy8il/view?usp=sharing
 
 - name: Melkamu Beyene
   region: East Africa
-  bio: "Dr.Melkamu Beyene is Assistant professor in the school of information science. He received his Ph.D in Information Retrieval from Addis Ababa University in a joint program with the Institut national des sciences appliquées de Lyon, France by 2017. He is
-serving as a chief librarian of Addis Ababa University Library system and Chairperson of the Consortium of Ethiopian Academic and Research Libraries from March 08, 2018 up
-to now."
-  photo: "Melkamu_Beyene.JPG"
+  bio: "Dr. Melkamu Beyene is an Assistant Professor in the School of Information Science at Addis Ababa University. He received his PhD in Information Retrieval from Addis Ababa University in a joint program with the Institut National des Sciences Appliquées de Lyon, France, in 2017. He is a Chief Librarian at Addis Ababa University Library system and Chairperson of the Consortium of Ethiopian Academic and Research Libraries from March 08, 2018."
+  photo: "melkamu.JPG"
   coi:
 
 - name: Muhammad Imtiaz Subhani
@@ -92,51 +57,16 @@ to now."
   coi:
     2022: https://drive.google.com/file/d/1nYQZ8h766UsNY_gWwCbRyVQ_yxdCyQN5/view?usp=sharing 
 
-- name: Narumi Shitara
-  region: Japan
-  bio: "Narumi is the head of the Editorial Office, Center for Southeast Asian Studies (CSEAS), Kyoto University. She has been the managing editor of CSEAS’s academic journals and monograph series since 2011. Her research interest is in bulletin journals published by Japanese universities and research institutes."
-  photo: "shitara.png"
-  coi:
-    2022: https://drive.google.com/file/d/1f_Od4aor5r9e2idA1gUNnNnPM8naZCcV/view?usp=sharing
-
-- name: Natalia Popova
-  region: Russian Federation
-  bio: "Natalia has been conducting research into academic communication for over 25 years. Currently, her research interests embrace sociology of science and technology, in particular the problems of open access, transformation in the role
-of scientific journals in academic communication, and academic publishing under the influence of globalization trends. Natalia is an active member of the International Sociological Association (ISA), Assistant Editor of the journal Changing societies &amp; personalities, editorial board member for Russian and international scientific journals, expert in the evaluation of the quality of scientific journals of the Association of Science Editors and Publishers (ASEP), and Deputy Chair of the Scopus Expert Content Selection and Advisory Board (ESCAB) in the Russian Federation."
-  photo: "Popova-1.jpeg"
-  coi:
-    2022: https://drive.google.com/file/d/1JHIibZcrJx6wPLXcn62SWS7R_tCRIJdv/view?usp=sharing
-
-- name: Olga Kirillova
-  region: Russian Federation
-  bio:
-  photo: 
-  coi:
-
 - name: Shuai Yan
   region: China
   bio: "Shuai Yan is an independent consultant since 2020. Since November 2021, Shuai has worked with STM as its China Consultant. From 2017 to 2020, he worked with Springer Nature Greater China as director of academic relationships (including government relations). From 2011 to 2017 he was at Tsinghua University Press (TUP) as an associate chief editor and was TUP's director of Journal Publishing. He was also the editor-in-chief of Journal of Tsinghua University (Science and Technology). He has served as the president of Society of China University Journals (CUJS) from 2004 to 2019, the vice president of China Periodicals Association (CPA) from 2012 to 2018, and the vice president of the China Editology Society for Scientific Periodicals (CESSP) from 2015 to 2021."
   photo: "Shuai.jpg"
   coi:
     2022: https://drive.google.com/file/d/1Xy9OPuTQZp5AS3wBs0Ittd3t_n4onKCy/view?usp=sharing
 
-- name: Sun Huh
-  region: South Korea
-  bio: "Sun is a medical doctor and holds a PhD from Seoul National University in parasitology. He has been a Professor of Parasitology at College of Medicine, Hallym University, Korea since 1988. He has worked voluntarily as a board member of <a href='https://www.kamje.or.kr/en/main_en' target='_blank'>Korean Association of Medical Journal Editors</a> (1996-2011), <a href='https://www.kcse.org/' target='_blank'>Korean Council of Science Editors </a> (2011-present), and <a href='https://www.asianeditor.org/' target='_blank'>Council of Asian Science Editors</a> (2014-present).
-He has been an editor of Journal of Educational Evaluation for Health Professions since 2005. His goal with DOAJ is to pursue the registration of all open access journals from Korea to DOAJ."
-  photo: "sun-huh.jpg"
-  coi:
-
 - name: Vrushali Dandawate
   region: India
   bio: "Vrushali is Head Librarian at AISSMS College of Engineering College Pune, Maharashtra, India, and She holds a Ph.D. degree from Reva University Banglore, India. Her research topic is 'OPEN ACCESS E -RESOURCES DEVELOPMENT IN ASIA: A STUDY' Vrushali was the winner of the ALCTS Online Course Grant for Library Professionals from Developing Countries in 2014, and the INASP open access week competition in both 2015 and 2016. She was invited to OpenCon 2017 in Berlin, Germany, and subsequently worked as a member of the organizing committee for OpenCon 2018 in Toronto, Canada. She also served as an advisory committee member for Open Access Week 2018-2019. She is selected as an advisory committee member of OpenDOAR and conference committee member of the FORCE2021 Conference."
   photo: vrushali.jpg
   coi:
     2022: https://drive.google.com/file/d/18Z2wZ9KMxuD0WD_b3pfxg4QJy9-7lUO6/view?usp=sharing
-
-- name: Youngim Jung
-  region: South Korea
-  bio: "Youngim holds a PhD from Pusan National University in Computer Science and Engineering. She is now a Senior Researcher at Korea Institute of Science and Technology Information, developing and managing scholarly publishing systems for supporting domestic societies. Previously, she worked for <a href='http://icolc.net/consortia/135' target='_blank'>KESLI</a>, the national library consortium in South Korea and helped to establish the Korea DOI Center. She is a committee member of the <a href='https://www.kcse.org/' target='_blank'>Korean Council of Science Editors</a> (KCSE) and <a href='https://www.asianeditor.org/' target='_blank'>Council of Asian Science Editors</a> (CASE). She has authored publications and communications in the fields of Scientometrics, Library Systems and Natural Language Processing."
-  photo: "youngim-jung.jpg"
-  coi:
-    2022: https://drive.google.com/file/d/1aXpu85OEFnxEl9YJsOF_QBRkG8brVSz4/view?usp=sharing

cms/data/nav.yml

@@ -46,7 +46,7 @@ entries:
         route: doaj.ambassadors       # ~~->Ambassadors:WebRoute~~
       - label: Advisory Board & Council
         route: doaj.abc               # ~~->AdvisoryBoardCouncil:WebRoute~~
-      - label: Editorial Policy and Advisory Group
+      - label: Editorial Policy Advisory Group
         route: doaj.epag              # ~~->EditorialPolicyAdvisoryGroup:WebRoute~~
       - label: Volunteers
         route: doaj.volunteers        # ~~->Volunteers:WebRoute~~
@@ -106,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

@@ -84,11 +84,11 @@ application:publisher:inprogress:notify:
 
 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