Skip to content

Commit 50ec8eb

Browse files
authored
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
1 parent af193c7 commit 50ec8eb

File tree

1 file changed

+25
-28
lines changed
  • invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros

1 file changed

+25
-28
lines changed

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/macros/detail.html

+25-28
Original file line numberDiff line numberDiff line change
@@ -96,40 +96,37 @@ <h2>{{ add_description.type.title_l10n }} <span
9696

9797

9898
{% macro _show_funding_item(item, index) %}
99+
<dt class="ui tiny header">{{ item.funder.name if item.funder }}</dt>
99100
{%- if item.award -%}
100-
{%- if item.award.title_l10n -%}
101-
<dt class="ui tiny header">
102-
<span class="mr-5">
103-
{% if item.award.acronym %}
104-
{{ item.award.acronym }} –
105-
{% endif %}
106-
107-
{{ item.award.title_l10n }}
108-
</span>
101+
<dt class="ui tiny header">
102+
<span class="mr-0 text-muted">
103+
{% if item.award.acronym %}
104+
{{ item.award.acronym }} –
105+
{% endif %}
106+
107+
{%- if item.award.title_l10n -%}
108+
{{ item.award.title_l10n }}
109+
{%- endif -%}
110+
</span>
109111

110-
{%- if item.award.number -%}
111-
<span class="ui mini basic label ml-0 mr-5" id="number-label-{{ index }}">
112-
{{ item.award.number }}
113-
</span>
114-
{%- endif -%}
112+
{%- if item.award.number -%}
113+
<span class="ui mini basic label {% if not item.award.title_l10n %}ml-0{% endif %}" id="number-label-{{ index }}">
114+
{{ item.award.number }}
115+
</span>
116+
{%- endif -%}
115117

116-
{%- if item.award.identifiers -%}
117-
{% for identifier in item.award.identifiers if 'url' == identifier.scheme %}
118-
<a href="{{ identifier.identifier }}" target="_blank"
119-
rel="noopener noreferrer" aria-label="{{ _('Open external link') }}">
120-
<i class="external alternate icon"></i>
121-
</a>
122-
{%- endfor -%}
123-
{%- endif -%}
124-
</dt>
118+
{%- if item.award.identifiers -%}
119+
{% for identifier in item.award.identifiers if 'url' == identifier.scheme %}
120+
<a href="{{ identifier.identifier }}" target="_blank"
121+
rel="noopener noreferrer" aria-label="{{ _('Open external link') }}">
122+
<i class="external alternate icon"></i>
123+
</a>
124+
{%- endfor -%}
125125
{%- endif -%}
126-
<dd class="text-muted">{{ item.funder.name if item.funder }}</dd>
127-
{%- else -%}
128-
<dt class="ui tiny header">{{ item.funder.name if item.funder }}</dt>
129-
{%- endif -%}
126+
</dt>
127+
{%- endif -%}
130128
{% endmacro %}
131129

132-
133130
{% macro show_references(references) %}
134131
<ul class="ui bulleted list details-list">
135132
{% for reference in references %}

0 commit comments

Comments
 (0)