@@ -23,5 +23,5 @@
Reset your password
@@ -17,5 +17,5 @@
Login
Related help
@@ -30,7 +30,7 @@
Register
@@ -20,6 +20,6 @@
Hi {{ account.name or account.email }}
{# todo: this nav was bumping into swagger
@@ -58,7 +58,7 @@
API
{% include "application_form/_backend_validation.html" %}
-
@@ -64,7 +64,7 @@
@@ -224,5 +224,5 @@
Published in {{jtitle}}
{% include "includes/search-help-modal.html" %}
-
+
{% endblock %}
{% block extra_js_bottom %}
diff --git a/portality/templates/doaj/contact.html b/portality/templates/doaj/contact.html
index 2a4739dec8..2ffb86985f 100644
--- a/portality/templates/doaj/contact.html
+++ b/portality/templates/doaj/contact.html
@@ -1,7 +1,7 @@
{% extends "layouts/public_base.html" %}
{% block content %}
- Submit your feedback and questions here. Feedback submitted about a particular journal is treated as confidential.
@@ -52,7 +52,7 @@DOAJ in numbers
{% endblock %} {% block content %} -
@@ -246,6 +246,6 @@
Recently-added journals
{% include "includes/search-help-modal.html" %}
-
+
{% endblock %}
{% block extra_js_bottom %}
diff --git a/portality/templates/editor/editor_base.html b/portality/templates/editor/editor_base.html
index 1fc7bfbc81..c116f3d622 100644
--- a/portality/templates/editor/editor_base.html
+++ b/portality/templates/editor/editor_base.html
@@ -9,10 +9,15 @@
{% endblock %}
{% block content %}
-
+
+ {% block editor_content %}
+ {% endblock %}
+
+
{% include "includes/_hotjar.html" %}
{% endblock %}
diff --git a/portality/templates/includes/contribution_rates.html b/portality/templates/includes/contribution_rates.html
index 29f28a8426..2449e24e3c 100644
--- a/portality/templates/includes/contribution_rates.html
+++ b/portality/templates/includes/contribution_rates.html
@@ -1,7 +1,7 @@
Editor dashboard
+ {% include 'editor/nav.html' %} + +-
-
For academic institutions, including:
+2023 pricing for academic institutions, including:
- Individual institutions
- Academic libraries @@ -134,7 +134,7 @@
-
-
For institutions that are members of:
+2023 pricing for institutions that are members of:
- A billing consortium
For institutions that are members of:
The definition as to Large/Small is at the discretion of the consortium.
+
For academic institutions, including:
{% include "includes/header.html" %} @@ -17,7 +18,9 @@ {% endif %} {% block main_panel %} - {% block content %}{% endblock %} + + {% block content %}{% endblock %} + {% endblock %} {% include "includes/footer.html" %} diff --git a/portality/templates/layouts/single_col_page.html b/portality/templates/layouts/single_col_page.html index 5e28ee87d3..a8bc801cf0 100644 --- a/portality/templates/layouts/single_col_page.html +++ b/portality/templates/layouts/single_col_page.html @@ -1,11 +1,11 @@ {% extends "layouts/public_base.html" %} {% block content %} -+ {% endblock %} diff --git a/portality/templates/layouts/toc_base.html b/portality/templates/layouts/toc_base.html index 0c27ac504d..dff69e334f 100644 --- a/portality/templates/layouts/toc_base.html +++ b/portality/templates/layouts/toc_base.html @@ -14,7 +14,7 @@ {% block content %} -{% block title %}{% endblock %}
{% block single_col_content %}{% endblock %}+ {% include "includes/_hotjar.html" %} {% endblock %} diff --git a/portality/templates/openurl/404.html b/portality/templates/openurl/404.html index 43d3b688f4..5f8379deb3 100644 --- a/portality/templates/openurl/404.html +++ b/portality/templates/openurl/404.html @@ -1,7 +1,7 @@ {% extends "layouts/public_base.html" %} {% block content %} -{% if journal.last_manually_updated_since(days=30) %} @@ -47,7 +47,7 @@
- {% if bibjson.discontinued_date %} + {% if bibjson.discontinued_date is not none and bibjson.discontinued_date | is_in_the_past %}Ceased publication on {{ bibjson.discontinued_datestamp.strftime("%d %B %Y") }}
{% endif %} @@ -141,7 +141,7 @@- +
+ {% endblock %} diff --git a/portality/templates/openurl/help.html b/portality/templates/openurl/help.html index 75332c5637..c1a4eb4424 100644 --- a/portality/templates/openurl/help.html +++ b/portality/templates/openurl/help.html @@ -1,7 +1,7 @@ {% extends "layouts/public_base.html" %} {% block content %} -OpenURL - no results
@@ -16,5 +16,5 @@What next?
+ {% endblock %} diff --git a/portality/templates/publisher/preservation.html b/portality/templates/publisher/preservation.html index c87a2fcb97..611eb380af 100644 --- a/portality/templates/publisher/preservation.html +++ b/portality/templates/publisher/preservation.html @@ -25,10 +25,10 @@Help
@@ -33,5 +33,5 @@Supported OpenURL version
Guidance before uploading your file
- Only the full text of articles whose metadata is already uploaded to DOAJ can be sent to us. Check that your article metadata appears in DOAJ first.
- Only articles for journals indexed in DOAJ can be uploaded. -
- Collect the full texts into a package consisting of folders and files. -
- Compress the package into a ZIP file. -
- Upload the zipped package (on this page). -
- Check that the file has uploaded correctly in the History of Uploads section and is not bigger than 50MB. +
- Collect the full text files into a package containing folders and files. +
- Compress the package into a ZIP file. Keep the name of the file simple: avoid spaces, hyphens, underscores, special characters, etc +
- Upload the zipped package (on this page). It may not be bigger than 50MB. +
- Check that the file has uploaded correctly in the History of Uploads section.
The package must have the following structure:
diff --git a/portality/templates/publisher/publisher_base.html b/portality/templates/publisher/publisher_base.html index d4873f1fb5..96ba47ca72 100644 --- a/portality/templates/publisher/publisher_base.html +++ b/portality/templates/publisher/publisher_base.html @@ -7,14 +7,14 @@ {% block page_title %}Publisher dashboard{% endblock %} {% block content %} -+ {% include "includes/_hotjar.html" %} {% endblock %} diff --git a/portality/ui/messages.py b/portality/ui/messages.py index ac7f9163bc..8eabd73f80 100644 --- a/portality/ui/messages.py +++ b/portality/ui/messages.py @@ -61,6 +61,7 @@ class Messages(object): EXCEPTION_NO_CONTRIBUTORS_EXPLANATION = "DOAJ requires at least one author for each article." EXCEPTION_TOO_MANY_ISSNS = "Too many ISSNs. Only 2 ISSNs are allowed: one Print ISSN and one Online ISSN." + EXCEPTION_MISMATCHED_ISSNS = "ISSNs provided don't match any journal." EXCEPTION_ISSNS_OF_THE_SAME_TYPE = "Both ISSNs have the same type: {type}" EXCEPTION_IDENTICAL_PISSN_AND_EISSN = "The Print and Online ISSNs supplied are identical. If you supply 2 ISSNs they must be different." EXCEPTION_NO_ISSNS = "Neither Print ISSN nor Online ISSN has been supplied. DOAJ requires at least one ISSN." diff --git a/portality/view/doaj.py b/portality/view/doaj.py index 80ff0b2195..4baac018ec 100644 --- a/portality/view/doaj.py +++ b/portality/view/doaj.py @@ -198,8 +198,13 @@ def public_data_dump_redirect(record_type): if not current_user.has_role(constants.ROLE_PUBLIC_DATA_DUMP): abort(404) - target_data = models.Cache.get_public_data_dump().get(record_type, {}) - if target_data is None: + # Make sure the PDD exists + pdd = models.Cache.get_public_data_dump() + if pdd is None: + abort(404) + + target_data = pdd.get(record_type, {}) + if not target_data: abort(404) main_store = store.StoreFactory.get(constants.STORE__SCOPE__PUBLIC_DATA_DUMP) diff --git a/setup.py b/setup.py index a83bf6daf2..8d951cb4eb 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name='doaj', - version='6.3.16', + version='6.4.2', packages=find_packages(), install_requires=[ "awscli==1.20.50",Publisher dashboard
{% include 'publisher/nav.html' %} {% block publisher_content %} {% endblock %} - +