Merge branch 'hotfix/2023-11-02_atatic_pages'

DOAJ · Nov 2, 2023 · dfc3e89 · dfc3e89
2 parents e3db96e + 9e09999
commit dfc3e89
Show file tree

Hide file tree

Showing 12 changed files with 107 additions and 406 deletions.
diff --git a/cms/data/notifications.yml b/cms/data/notifications.yml
@@ -1,7 +1,7 @@
 # ~~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 ({issns}) assigned to you
 
@@ -146,4 +146,4 @@ journal:assed:discontinuing_soon:notify:
   long: |
     Journal "{title}" (id: {id}) will discontinue in {days} days.
   short:
-     Journal discontinuing
+     Journal discontinuing
diff --git a/cms/pages/about/at-20.md b/cms/pages/about/at-20.md
@@ -37,6 +37,7 @@ There is also an opportunity for you to [support DOAJ during its 20th year](/at-
    - Event Time: 13:00 UTC
    - Duration: 2 hours
 - {% include "includes/svg/at-20/theme_trusted.svg" %}
+   - **[Registration is open](https://us02web.zoom.us/webinar/register/WN_sePTjc09QbWHUDhgmZ28-A#/registration)**
    - Name: _DOAJ at 20: Trusted_
    - Date: _7th December 2023_
    - Event Time: 14:00 UTC ([Check the event time](https://www.timeanddate.com/worldclock/fixedtime.html?msg=DOAJ+at+20%3A+Trusted&iso=20231207T14&p1=1440&ah=1&am=30) where you are.)
@@ -48,11 +49,11 @@ Our first of three events marking our 20th anniversary took place on the 15th Ju
 
 ## Global
 
-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).
+Our second event was around the theme Global and took place on the 28th September 2023. The event consisted of eight lighting talks from speakers from around the world. Our moderator and DOAJ Ambassador, Ivonne Lujano, introduced speakers and managed two Q&As, where the audience could ask our speakers questions. A recording of the event is [available on YouTube](https://www.youtube.com/watch?v=TRjtc-7tg8w).
 
 ## Trusted
 
-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. 
+Our third and last DOAJ at 20 event will be around the theme Trusted, where our four speakers, Judith Barnsby, Ivan Oransky, Ixchel Faniel and Dr Haseeb Irfanullah will discuss what trust and mistrust means in scholarly communications. The event will be moderated by Joy Owango, Founding Director of TCC Africa, and there will be a Q&A where the audience can ask questions. [Registration is open](https://us02web.zoom.us/webinar/register/WN_sePTjc09QbWHUDhgmZ28-A#/registration) for this event, and the event is free to attend. 
 
 ## Timeline 
 

diff --git a/cms/pages/apply/guide.md b/cms/pages/apply/guide.md
diff --git a/cms/pages/legal/contact.md b/cms/pages/legal/contact.md
@@ -7,11 +7,14 @@ featuremap: ~~ContactUs:Fragment~~
 
 ---
 
-We welcome your feedback, comments and questions about the DOAJ web site and our services, or if you have feedback on a journal in the index.
+Use this page to:
 
-All communication with us is treated as confidential.
+- send feedback and questions about our website or services
+- send feedback about a journal in our index
+- submit a complaint about our website or services
 
-Read our [FAQs](/docs/faq/) before you contact us. If you cannot find the answer to your question, send an email to [the DOAJ helpdesk](mailto:[email protected]). If your email is about a journal, please include the title and ISSN(s).
-
-
-
+Both complaints and feedback sent to us about specific journals are treated as confidential.
+
+If you're a publisher and need help, read our [publisher help page](/publisher/help/).
+
+Send an email to [the DOAJ helpdesk](mailto:[email protected]). If you're emailing about a journal or application, please include the title and ISSN(s).
diff --git a/cms/pages/preservation/index.md b/cms/pages/preservation/index.md
diff --git a/cms/pages/support/publisher-supporters.md b/cms/pages/support/publisher-supporters.md
@@ -12,11 +12,11 @@ featuremap:
 
 DOAJ relies on the support of publishers and [libraries](/support/) to ensure that its metadata and services remain free for all. The publishers on this page have chosen to show their commitment to quality, peer-reviewed open access by supporting DOAJ. We thank them as without them, our work would not be possible.
 
-## 2024 pricing
+## Pricing
 
 We are introducing a revised and simplified model for publishers to support DOAJ for 2024 and publishing this openly in line with [our commitment to the Principles of Open Scholarly Infrastructure](https://blog.doaj.org/2022/10/06/doaj-commits-to-the-principles-of-open-scholarly-infrastructure-posi/).  We are also relaunching the set of benefits for publishers choosing to support us.
 
-We only accept support through our publisher supporter model from publishers with journals already indexed in DOAJ. Other routes to support DOAJ are as [an institution](/support/) or as [an individual via Paypal](https://www.paypal.com/donate/?campaign_id=4VXR4TJ69MDJJ). Non-commercial/institutional rates are only available to community-led, smaller publishers with limited funding. Please contact [[email protected]](mailto:[email protected]) if unsure which category applies.
+We only accept support through our publisher supporter model from publishers with journals already indexed in DOAJ. Non-commercial/institutional rates are only available to community-led, smaller publishers with limited funding. Please contact [[email protected]](mailto:[email protected]) if you are unsure which category applies.
 
 Please contact [[email protected]](mailto:[email protected]) if you want to contribute to DOAJ’s operating costs as a publisher supporter.
 
@@ -46,7 +46,7 @@ Please contact [[email protected]](mailto:[email protected]) if you want to
 
 *A 50% discount is available for supporters in Low- and Middle-Income Countries according to the World Bank classification.
 
-## 2024 publisher benefits
+## Benefits
 
 1. Your logo on the DOAJ website
 2. A post from all our social media platforms (Twitter, Facebook, LinkedIn, Mastodon, Instagram) acknowledging your organisation as a Supporter
@@ -65,20 +65,7 @@ We are particularly grateful to those publishers who can contribute over and abo
 
 Please get in touch to discuss.
 
-## 2023 benefits for publisher supporters
-
-([A downloadable version](https://docs.google.com/document/d/1xTVxUvqLkh2-r53cYlWdSIHsPGSnhcE7gi7bRFCaJik/edit?usp=sharing) of these benefits is available.)
-
-| Basic contribution       | Sustaining contribution (25% higher than Basic) | Premier contribution (50% higher than Basic) |
-|--------------------------|-------------------------------------------------|----------------------------------------------|
-| Your logo on our website | Your logo on our website                        | Your logo on our website                     |
-| A Tweet from the DOAJ account (21,900 followers) acknowledging your organisation as a Supporter | An interview-style blog post on [blog.doaj.org](https://blog.doaj.org/) (12,000 views per month) acknowledging your organisation as a Contributor, with questions about the state of open access and other current developments in open access scholarly publishing | An interview-style blog post on [blog.doaj.org](https://blog.doaj.org/) (12,000 views per month) acknowledging your organisation as a Contributor with questions about the state of open access and other current developments in open access scholarly publishing|
-|                          | A one-pager for  journal editors explaining, in general terms, how article metadata is ingested, and then pulled downstream by discovery services. | A one-pager for journal editors explaining, in general terms, how article metadata is ingested, and then pulled downstream by discovery services.|
-|                          | General presentation or documentation, for raising awareness among your stakeholders, about the benefits of DOAJ, the work we do and how DOAJ benefits individual journal titles. | Dedicated presentation or documentation, tailored to your organisation, about the benefits of DOAJ, the work we do and how DOAJ benefits individual journal titles. Written as a joint document with the publisher. |
-|                          | A report, (a Google Sheet), collecting metadata errors, as reported to us by discovery services. | A report, (a Google Sheet), collecting metadata errors, as reported to us by discovery services. |
-|                          |                                                 | A yearly account review between the customer and DOAJ. The agenda can be determined by the publisher contact and a DOAJ representative. |
-|                          |                                                 | A CSV file, generated annually, for recording changes in and which DOAJ updates your live records with. |
-|                          |                                                 | Exposure across all our social media channels: Twitter, Instagram, LinkedIn, Facebook, WeChat. (Stats available.) | 
+## Publisher supporters
 
 <div>{% include '/data/sponsors.html' %}</div>
 

diff --git a/portality/settings.py b/portality/settings.py
@@ -9,7 +9,7 @@
 # Application Version information
 # ~~->API:Feature~~
 
-DOAJ_VERSION = "6.4.5"
+DOAJ_VERSION = "6.4.6"
 API_VERSION = "3.0.1"
 
 ######################################

diff --git a/portality/static/js/edges/public.journal.edge.js b/portality/static/js/edges/public.journal.edge.js
@@ -274,7 +274,7 @@ $.extend(true, doaj, {
                                     value: false
                                 })
                             ],
-                            display : "Without article processing charges (APCs)"
+                            display : "Without any fees"
                         }
                     ],
                     fieldDisplays : {

diff --git a/portality/templates/data/sponsors.html b/portality/templates/data/sponsors.html
@@ -1,4 +1,4 @@
-<h2>Contributors</h2>
+
 <div class="row">
     {% for i in data.sponsors %}
         <div class="col-xs-6 sponsor">

diff --git a/portality/templates/doaj/index.html b/portality/templates/doaj/index.html
@@ -51,7 +51,7 @@ <h2 class="sr-only">DOAJ in numbers</h2>
                     {% set source = search_query_source(term=[{"bibjson.apc.has_apc":False},{"bibjson.other_charges.has_other_charges":False}]) %}
                     <a href='{{ url_for('doaj.journals_search') }}?source={{ source }}'>
                         <span class="stat__number">{{ statistics.no_apc }}</span>
-                        <span class="stat__description">journals without APC<span style="text-transform: lowercase;">s</span></span>
+                        <span class="stat__description">journals without fees</span>
                     </a>
                 </p>
                 <p class="col-md-2 stat">