resolve merge conflicts with 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

.gitignore

@@ -11,7 +11,11 @@ src*
 build/*
 dist/*
 tmp/*
+
 *.zip
+!doajtest/unit/resources/*.zip
+!doajtest/preservation_upload_test_package/*.zip
+
 scratch.py
 .coverage
 htmlcov/*

cms/data/ambassadors.yml

@@ -62,13 +62,6 @@
   photo: "ivonne.jpg"
   coi:
     2022: https://drive.google.com/file/d/1HnGhYbvbzL34guWOmIqcthcwAN8NADX1/view?usp=sharing
-
-- name: John G. Dove
-  region: North America
-  bio: "John has had a career in executive management, and is now an independent consultant and open access advocate who works with organisations seeking to accelerate their transition to open access.  He advises both for-profits and non-profits, and has a particular interest in identifying the steps necessary to flip an entire discipline’s scholarly record to open access. His ambassador activities focus on increasing the support to DOAJ from the community. He served for six years on NISO’s <a href='https://www.niso.org/topic-committees/information-discovery-interchange' target='_blank'>Information Discovery and Interchange Topic Committee</a>, and has written for <a href='https://onlinelibrary.wiley.com/doi/10.1002/leap.1086' target='_blank'>Learned Publishing</a>, <a href='https://against-the-grain.com/2011/12/v23-5-atg-interviews-john-g-dove-president-credo-reference/' target='_blank'>Against the Grain</a>, and <a href='https://scholarlykitchen.sspnet.org/2019/11/07/guest-post-transparency-what-can-one-learn-from-a-trove-of-invoices/' target='_blank'>Scholarly Kitchen</a>. John serves on the Board of Trustees of his local public library in Revere, Massachusetts. He has a B.A. in Mathematics from Oberlin College."
-  photo: "johndove.jpg"
-  coi:
-    2022: https://drive.google.com/file/d/1cWijl2xdmVjshsvaGTABOvC_chIIfuVA/view?usp=sharing
 
 - name: Mahmoud Khalifa
   region: Middle East and Persian Gulf

cms/data/nav.yml

@@ -27,7 +27,7 @@ entries:
         route: doaj.openurl           # ~~->OpenURLDocumentation:WebRoute~~
       - label: XML
         route: doaj.xml               # ~~->XMLDocumentation:WebRoute~~
-      - label: FAQs
+      - label: Metadata help
         route: doaj.faq               # ~~->FAQ:WebRoute~~
   - id: about
     label: About
@@ -56,11 +56,11 @@ entries:
     secondary_mobile: true
     route: doaj.support               # ~~->Support:WebRoute~~
     entries:
-      - label: Support DOAJ
+      - label: Institutions and libraries
         route: doaj.support           # ~~->Support:WebRoute~~
-      - label: Publisher supporters
+      - label: Publishers
         route: doaj.publisher_supporters      # ~~->PublisherSupporters:WebRoute~~
-      - label: Supporters
+      - label: Institutional and library supporters
         route: doaj.supporters        # ~~->Supporters:WebRoute~~
   - id: apply
     label: Apply
@@ -77,13 +77,10 @@ entries:
         route: doaj.seal              # ~~->Seal:WebRoute~~
       - label: Transparency & best practice
         route: doaj.transparency      # ~~->Transparency:WebRoute~~
-      - label: Why index your journal in DOAJ?
-        route: doaj.why_index         # ~~->WhyIndex:WebRoute~~
+      - label: Publisher information
+        route: doaj.publisher_responsibilities         # ~~->PublisherResponsibilities:WebRoute~~
       - label: Licensing & copyright
         route: doaj.copyright_and_licensing         # ~~->CopyrightAndLicensing:WebRoute~~
-      # Uncomment once this page is ready to be published
-      #- label: Publisher responsibilities
-      #  route: doaj.publisher_responsibilities         # ~~->PublisherResponsibilities:WebRoute~~
   - id: stay_up_to_date
     label: Stay up to date
     footer: true

cms/data/notifications.yml

@@ -1,40 +1,40 @@
 # ~~Notifications:Data~~
 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.
+    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.
   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