From 327147e266b788108c1d59f8dc8007bea44bef8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl-Ulrich=20Kr=C3=A4gelin?= <k.kraegelin@uni-muenster.de>
Date: Wed, 13 Nov 2024 15:18:20 +0100
Subject: [PATCH 1/4] records/macros/detail.html: Allow funding entry with
 award number only

---
 .../records/macros/detail.html                | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

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..972a82b07 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
@@ -98,7 +98,8 @@ <h2>{{ add_description.type.title_l10n }} <span
 {% macro _show_funding_item(item, index) %}
   {%- if item.award -%}
     {%- if item.award.title_l10n -%}
-      <dt class="ui tiny header">
+    
+    <dt class="ui tiny header">
         <span class="mr-5">
           {% if item.award.acronym %}
             {{ item.award.acronym }} –
@@ -122,6 +123,29 @@ <h2>{{ add_description.type.title_l10n }} <span
           {%- endfor -%}
         {%- endif -%}
       </dt>
+    {%- else -%}
+    <dt class="ui tiny header">
+      <span class="">
+        {% if item.award.acronym %}
+          {{ item.award.acronym }} –
+        {% endif %}
+      </span>
+
+      {%- if item.award.number -%}
+        <span class="ui mini basic ml-0" 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>
     {%- endif -%}
     <dd class="text-muted">{{ item.funder.name if item.funder }}</dd>
   {%- else -%}

From b503c108390c9e326e7047a15d40f80d12ab8b1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Kr=C3=A4gelin?=
 <8436596+karkraeg@users.noreply.github.com>
Date: Mon, 18 Nov 2024 13:13:44 +0100
Subject: [PATCH 2/4] records/macros/detail.html: Simplify _show_funding_item
 macro

---
 .../records/macros/detail.html                | 75 ++++++-------------
 1 file changed, 24 insertions(+), 51 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 972a82b07..697ca11c5 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,64 +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>
-
-        {%- if item.award.number -%}
-          <span class="ui mini basic label ml-0 mr-5" id="number-label-{{ index }}">
-            {{ item.award.number }}
-          </span>
-        {%- endif -%}
+  <dt class="ui tiny header">
+    <span class="mr-0">
+      {% if item.award.acronym %}
+        {{ item.award.acronym }} –
+      {% endif %}
+      
+      {%- if item.award.title_l10n -%}
+        {{ item.award.title_l10n }}
+      {%- endif -%}
+    </span>
 
-        {%- 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>
-    {%- else -%}
-    <dt class="ui tiny header">
-      <span class="">
-        {% if item.award.acronym %}
-          {{ item.award.acronym }} –
-        {% endif %}
+    {%- if item.award.number -%}
+      <span class="ui mini basic ml-0 text-muted {% if item.award.title_l10n %}mr-5{% endif %}" id="number-label-{{ index }}">
+        {{ item.award.number }}
       </span>
+    {%- endif -%}
 
-      {%- if item.award.number -%}
-        <span class="ui mini basic ml-0" 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 %}

From 32bc035f4750a3ef151096158b07fe01c76539c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Kr=C3=A4gelin?=
 <8436596+karkraeg@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:45:08 +0100
Subject: [PATCH 3/4] Update detail.html: different styles for funder, number
 and title

---
 .../semantic-ui/invenio_app_rdm/records/macros/detail.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 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 697ca11c5..1a07a43c1 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
@@ -99,7 +99,7 @@ <h2>{{ add_description.type.title_l10n }} <span
   <dt class="ui tiny header">{{ item.funder.name if item.funder }}</dt>
   {%- if item.award -%}
   <dt class="ui tiny header">
-    <span class="mr-0">
+    <span class="mr-0 text-muted">
       {% if item.award.acronym %}
         {{ item.award.acronym }} –
       {% endif %}
@@ -110,7 +110,7 @@ <h2>{{ add_description.type.title_l10n }} <span
     </span>
 
     {%- if item.award.number -%}
-      <span class="ui mini basic ml-0 text-muted {% if item.award.title_l10n %}mr-5{% endif %}" id="number-label-{{ index }}">
+      <span class="ui mini basic ml-0 label {% if item.award.title_l10n %}mr-5{% endif %}" id="number-label-{{ index }}">
         {{ item.award.number }}
       </span>
     {%- endif -%}

From bf817a321249ca53ac9a37ef8f6308b1aac79fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Kr=C3=A4gelin?=
 <8436596+karkraeg@users.noreply.github.com>
Date: Mon, 6 Jan 2025 14:39:25 +0100
Subject: [PATCH 4/4] Update
 invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html

Co-authored-by: Tom Morrell <tmorrell@users.noreply.github.com>
---
 .../semantic-ui/invenio_app_rdm/records/macros/detail.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 1a07a43c1..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
@@ -110,7 +110,7 @@ <h2>{{ add_description.type.title_l10n }} <span
     </span>
 
     {%- if item.award.number -%}
-      <span class="ui mini basic ml-0 label {% if item.award.title_l10n %}mr-5{% endif %}" id="number-label-{{ index }}">
+      <span class="ui mini basic label {% if not item.award.title_l10n %}ml-0{% endif %}" id="number-label-{{ index }}">
         {{ item.award.number }}
       </span>
     {%- endif -%}