From dd0160e7a4af1ae2d6fd2c7af76f9d4eeaab0fbe Mon Sep 17 00:00:00 2001
From: Joseph Muller <j.muller@bbk.ac.uk>
Date: Fri, 25 Oct 2024 12:13:08 +0100
Subject: [PATCH] Make display of funding metadata clearer #4461

---
 .../elements/funder_info_for_readers.html     | 30 +++++++++++++++++++
 src/themes/OLH/templates/journal/article.html | 26 +---------------
 .../clean/templates/journal/article.html      | 24 ++-------------
 .../material/templates/journal/article.html   | 25 +---------------
 4 files changed, 35 insertions(+), 70 deletions(-)
 create mode 100644 src/templates/common/elements/funder_info_for_readers.html

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..827da15ee
--- /dev/null
+++ b/src/templates/common/elements/funder_info_for_readers.html
@@ -0,0 +1,30 @@
+{% if article.funders.all %}
+  <div class="callout primary">
+    <h2>{% trans "Funding" %}</h2>
+    {% 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 %}
+      <dl>
+        {% 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 %}
+      </dl>
+      {% if funder.fundref_id %}
+        <p>
+          <a href="{% url "funder_articles" funder.fundref_id %}">
+            {% trans "Browse all articles funded by" %} {{ funder.name }}
+          </a>
+        </p>
+      {% endif %}
+    {% endfor %}
+  </div>
+{% endif %}
diff --git a/src/themes/OLH/templates/journal/article.html b/src/themes/OLH/templates/journal/article.html
index 57a2fd215..032dda760 100644
--- a/src/themes/OLH/templates/journal/article.html
+++ b/src/themes/OLH/templates/journal/article.html
@@ -228,31 +228,7 @@ <h2>{% trans "Publisher Notes" %}</h2>
                                     {% endif %}
                                 </div>
                             {% endif %}
-
-                            {% if article.funders.all %}
-                                <h2>{% trans "Funding" %}</h2>
-
-                                {% for funder in article.funders.all %}
-                                    <p>
-                                        {% if funder.fundref_id %}
-                                            <a href="{% url "funder_articles" funder.fundref_id %}">{{ funder.name }}</a>
-                                        {% else %}
-                                            {{ funder.name }}
-                                        {% endif %}
-                                        {% if funder.funding_id %}
-                                            {% blocktranslate with id=funder.funding_id %}
-                                                ({{ id }})
-                                            {% endblocktranslate %}
-                                        {% endif %}
-                                        {% if funder.funding_statement %}
-                                            <br/>
-                                            {{ funder.funding_statement|safe|linebreaksbr }}
-                                        {% endif %}
-                                    </p>
-                                {% endfor %}
-
-                            {% endif %}
-
+                            {% include "elements/funder_info_for_readers.html" %}
                             <div class="summary">
                                 {% 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 e89419a11..3a64ee4d2 100644
--- a/src/themes/clean/templates/journal/article.html
+++ b/src/themes/clean/templates/journal/article.html
@@ -121,27 +121,9 @@ <h2>{% trans "Abstract" %}</h2>
                         </p>
                     </div>
                 {% endif %}
-                {% if article.funders.all %}
-                    <strong>{% trans "Funding" %}</strong>
-                    {% for funder in article.funders.all %}
-                        <p>
-                            {% if funder.fundref_id %}
-                                <a href="{% url "funder_articles" funder.fundref_id %}">{{ funder.name }}</a>
-                            {% else %}
-                                {{ funder.name }}
-                            {% endif %}
-                            {% if funder.funding_id %}
-                                {% blocktranslate with id=funder.funding_id %}
-                                    ({{ id }})
-                                {% endblocktranslate %}
-                            {% endif %}
-                            {% if funder.funding_statement %}
-                                <br/>
-                                {{ funder.funding_statement|safe|linebreaksbr }}
-                            {% endif %}
-                        </p>
-                    {% endfor %}
-                {% endif %}
+
+                {% include "elements/funder_info_for_readers.html" %}
+
                 {% if article.publisher_notes.all %}
                     <div class="callout primary">
                         <h2>{% trans "Publisher Notes" %}</h2>
diff --git a/src/themes/material/templates/journal/article.html b/src/themes/material/templates/journal/article.html
index 302d3bfe8..3283b7f9d 100644
--- a/src/themes/material/templates/journal/article.html
+++ b/src/themes/material/templates/journal/article.html
@@ -147,30 +147,7 @@ <h2>{% trans "Downloads" %}</h2>
                             </div>
                         </div>
                     {% endif %}
-
-                    {% if article.funders.all %}
-                        <div class="callout primary">
-                            <h2>{% trans "Funding" %}</h2>
-                            {% for funder in article.funders.all %}
-                                <p>
-                                    {% if funder.fundref_id %}
-                                        <a href="{% url "funder_articles" funder.fundref_id %}">{{ funder.name }}</a>
-                                    {% else %}
-                                        {{ funder.name }}
-                                    {% endif %}
-                                    {% if funder.funding_id %}
-                                        {% blocktranslate with id=funder.funding_id %}
-                                            ({{ id }})
-                                        {% endblocktranslate %}
-                                    {% endif %}
-                                    {% if funder.funding_statement %}
-                                        <br/>
-                                        {{ funder.funding_statement|safe|linebreaksbr }}
-                                    {% endif %}
-                                </p>
-                            {% endfor %}
-                        </div>
-                    {% endif %}
+                    {% include "elements/funder_info_for_readers.html" %}
                 </div>
             </div>
             <div class="row">