From 50ec8ebbfdb80cc9586c15f34cee33f4ce7084ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Kr=C3=A4gelin?=
 <8436596+karkraeg@users.noreply.github.com>
Date: Sat, 11 Jan 2025 01:43:54 +0100
Subject: [PATCH] records/macros/detail.html: Allow funding entry with award
 number only (#2912)

* records/macros/detail.html: Allow funding entry with award number only

* records/macros/detail.html: Simplify _show_funding_item macro

* Update detail.html: different styles for funder, number and title
---
 .../records/macros/detail.html                | 53 +++++++++----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html b/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html
index fd36855a1..fbcb8cf6a 100644
--- a/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html
+++ b/invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html
@@ -96,40 +96,37 @@ <h2>{{ add_description.type.title_l10n }} <span
 
 
 {% macro _show_funding_item(item, index) %}
+  <dt class="ui tiny header">{{ item.funder.name if item.funder }}</dt>
   {%- if item.award -%}
-    {%- if item.award.title_l10n -%}
-      <dt class="ui tiny header">
-        <span class="mr-5">
-          {% if item.award.acronym %}
-            {{ item.award.acronym }} –
-          {% endif %}
-
-          {{ item.award.title_l10n }}
-        </span>
+  <dt class="ui tiny header">
+    <span class="mr-0 text-muted">
+      {% if item.award.acronym %}
+        {{ item.award.acronym }} –
+      {% endif %}
+      
+      {%- if item.award.title_l10n -%}
+        {{ item.award.title_l10n }}
+      {%- endif -%}
+    </span>
 
-        {%- if item.award.number -%}
-          <span class="ui mini basic label ml-0 mr-5" id="number-label-{{ index }}">
-            {{ item.award.number }}
-          </span>
-        {%- endif -%}
+    {%- if item.award.number -%}
+      <span class="ui mini basic label {% if not item.award.title_l10n %}ml-0{% endif %}" id="number-label-{{ index }}">
+        {{ item.award.number }}
+      </span>
+    {%- endif -%}
 
-        {%- if item.award.identifiers -%}
-          {% for identifier in item.award.identifiers if 'url' == identifier.scheme %}
-            <a href="{{ identifier.identifier }}" target="_blank"
-               rel="noopener noreferrer" aria-label="{{ _('Open external link') }}">
-              <i class="external alternate icon"></i>
-            </a>
-          {%- endfor -%}
-        {%- endif -%}
-      </dt>
+    {%- if item.award.identifiers -%}
+      {% for identifier in item.award.identifiers if 'url' == identifier.scheme %}
+        <a href="{{ identifier.identifier }}" target="_blank"
+          rel="noopener noreferrer" aria-label="{{ _('Open external link') }}">
+          <i class="external alternate icon"></i>
+        </a>
+      {%- endfor -%}
     {%- endif -%}
-    <dd class="text-muted">{{ item.funder.name if item.funder }}</dd>
-  {%- else -%}
-    <dt class="ui tiny header">{{ item.funder.name if item.funder }}</dt>
-  {%- endif -%}
+  </dt>
+{%- endif -%}
 {% endmacro %}
 
-
 {% macro show_references(references) %}
   <ul class="ui bulleted list details-list">
     {% for reference in references %}