diff --git a/src/journal/views.py b/src/journal/views.py index da3e6b163..8b62c4176 100755 --- a/src/journal/views.py +++ b/src/journal/views.py @@ -133,11 +133,15 @@ def serve_journal_cover(request): @has_journal def funder_articles(request, funder_id): - """ Renders the list of articles in the journal. + """ Deprecated. Renders the list of articles in the journal. :param request: the request associated with this call :return: a rendered template of all articles """ + raise DeprecationWarning( + 'This view is deprecated.' + ) + if request.POST and 'clear' in request.POST: return logic.unset_article_session_variables(request) diff --git a/src/templates/common/elements/funder_info_for_readers.html b/src/templates/common/elements/funder_info_for_readers.html new file mode 100644 index 000000000..784a51cf8 --- /dev/null +++ b/src/templates/common/elements/funder_info_for_readers.html @@ -0,0 +1,23 @@ +{% if article.funders.all %} +
+

{% trans "Funding" %}

+ {% trans "Name" as name_label %} + {% trans "FundRef ID" as fundref_id_label %} + {% trans "Funding ID" as funding_id_label %} + {% trans "Funding Statement" as statement_label %} + {% for funder in article.funders.all %} +
+ {% include "elements/layout/key_value_above.html" with key=name_label value=funder.name %} + {% if funder.fundref_id %} + {% include "elements/layout/key_value_above.html" with key=fundref_id_label value=funder.fundref_id %} + {% endif %} + {% if funder.funding_id %} + {% include "elements/layout/key_value_above.html" with key=funding_id_label value=funder.funding_id %} + {% endif %} + {% if funder.funding_statement %} + {% include "elements/layout/key_value_above.html" with key=statement_label value=funder.funding_statement|safe render_line_breaks=True %} + {% endif %} +
+ {% endfor %} +
+{% endif %} diff --git a/src/themes/OLH/templates/journal/article.html b/src/themes/OLH/templates/journal/article.html index 395876da4..4ee05b8ad 100644 --- a/src/themes/OLH/templates/journal/article.html +++ b/src/themes/OLH/templates/journal/article.html @@ -228,31 +228,7 @@

{% trans "Publisher Notes" %}

{% endif %} {% endif %} - - {% if article.funders.all %} -

{% trans "Funding" %}

- - {% for funder in article.funders.all %} -

- {% if funder.fundref_id %} - {{ funder.name }} - {% else %} - {{ funder.name }} - {% endif %} - {% if funder.funding_id %} - {% blocktranslate with id=funder.funding_id %} - ({{ id }}) - {% endblocktranslate %} - {% endif %} - {% if funder.funding_statement %} -
- {{ funder.funding_statement|safe|linebreaksbr }} - {% endif %} -

- {% endfor %} - - {% endif %} - + {% include "elements/funder_info_for_readers.html" %}
{% if article.is_published or proofing %} {% if not request.journal.disable_metrics_display %} diff --git a/src/themes/clean/templates/journal/article.html b/src/themes/clean/templates/journal/article.html index 667bd09e7..af0e04f8b 100644 --- a/src/themes/clean/templates/journal/article.html +++ b/src/themes/clean/templates/journal/article.html @@ -121,27 +121,9 @@

{% trans "Abstract" %}

{% endif %} - {% if article.funders.all %} - {% trans "Funding" %} - {% for funder in article.funders.all %} -

- {% if funder.fundref_id %} - {{ funder.name }} - {% else %} - {{ funder.name }} - {% endif %} - {% if funder.funding_id %} - {% blocktranslate with id=funder.funding_id %} - ({{ id }}) - {% endblocktranslate %} - {% endif %} - {% if funder.funding_statement %} -
- {{ funder.funding_statement|safe|linebreaksbr }} - {% endif %} -

- {% endfor %} - {% endif %} + + {% include "elements/funder_info_for_readers.html" %} + {% if article.publisher_notes.all %}

{% trans "Publisher Notes" %}

diff --git a/src/themes/material/templates/journal/article.html b/src/themes/material/templates/journal/article.html index 78fc3ec42..e64860959 100644 --- a/src/themes/material/templates/journal/article.html +++ b/src/themes/material/templates/journal/article.html @@ -147,30 +147,7 @@

{% trans "Downloads" %}

{% endif %} - - {% if article.funders.all %} -
-

{% trans "Funding" %}

- {% for funder in article.funders.all %} -

- {% if funder.fundref_id %} - {{ funder.name }} - {% else %} - {{ funder.name }} - {% endif %} - {% if funder.funding_id %} - {% blocktranslate with id=funder.funding_id %} - ({{ id }}) - {% endblocktranslate %} - {% endif %} - {% if funder.funding_statement %} -
- {{ funder.funding_statement|safe|linebreaksbr }} - {% endif %} -

- {% endfor %} -
- {% endif %} + {% include "elements/funder_info_for_readers.html" %}