invenio-app-rdm 8.0.0.dev9__py2.py3-none-any.whl → 14.0.0b4.dev4__py2.py3-none-any.whl

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/stats.html

@@ -1,101 +1,123 @@
 {#
-  Copyright (C) 2020 CERN.
+  Copyright (C) 2020-2025 CERN.
 
   Invenio RDM Records is free software; you can redistribute it and/or modify
   it under the terms of the MIT License; see LICENSE file for more details.
 #}
+{% from "invenio_app_rdm/records/macros/stats_popup.html" import stats_popup %}
 
-<div class="row stats-box">
-  <div class="ui padded grid">
-    <!-- Banner -->
-    <div class="two column row">
-      <div class="eight wide column centered">
-        <div><span class="stats-data">1,175</span></div>
-        <i class="eye icon"></i> views
-      </div>
-      <div class="eight wide column centered">
-        <div><span class="stats-data">52</span></div>
-        <i class="download icon"></i> downloads
-      </div>
+<div class="ui tiny two statistics rel-mt-1">
+  {% set all_versions = record_ui["stats"]["all_versions"] %}
+  {% set this_version = record_ui["stats"]["this_version"] %}
+
+  <div class="ui statistic">
+    <div class="value">{{ all_versions.unique_views|compact_number(max_value=1_000_000) }}</div>
+    <div class="label">
+      <i aria-hidden="true" class="eye icon"></i>
+      {{ _("Views") }}
     </div>
+  </div>
 
-    <!-- Collapsed details -->
-    <div class="centered row">
-      <div class="ui grid accordion">
-        <div class="title centered row">
-          <a style="cursor: pointer;" class="dropdown">
-            <span class="up">Show details<i class="angle right icon"></i></span>
-            <span class="down">Hide details<i class="angle down icon"></i></span>
-          </a>
-        </div>
-        <div class="centered row">
-          <div class="transition hidden">
-            <div class="ui padded grid">
-              <div class="centered row">
-                <table class="ui very basic table">
-                  <thead>
-                    <tr>
-                      <th></th>
-                      <th class="middle aligned">All versions</th>
-                      <th class="middle aligned">This version</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr class="centered">
-                      <td class="left aligned">Views
-                        <span class="ui tooltip-popup text-muted"
-                          data-content="Total views."
-                        ><i class="question circle outline icon"></i></span>
-                      </td>
-                      <td>1,175</td>
-                      <td>265</td>
-                    </tr>
-                    <tr class="centered">
-                      <td class="left aligned">Downloads
-                        <span class="ui tooltip-popup text-muted"
-                          data-content="Total downloads."
-                        ><i class="question circle outline icon"></i></span>
-                      </td>
-                      <td>52</td>
-                      <td>10</td>
-                    </tr>
-                    <tr class="centered">
-                      <td class="left aligned">Data volume
-                        <span class="ui tooltip-popup text-muted"
-                          data-content="Total download volume."
-                        ><i class="question circle outline icon"></i></span>
-                      </td>
-                      <td>191.3 MB</td>
-                      <td>21.8 MB</td>
-                    </tr>
-                    <tr class="centered">
-                      <td class="left aligned">Unique views
-                        <span class="ui tooltip-popup text-muted"
-                          data-content="Views in one hour user-sessions are counted only once."
-                        ><i class="question circle outline icon"></i></span>
-                      </td>
-                      <td>880</td>
-                      <td>192</td>
-                    </tr>
-                    <tr class="centered">
-                      <td class="left aligned">Unique downloads
-                        <span class="ui tooltip-popup text-muted"
-                          data-content="Downloads in one hour user-sessions are counted only once."
-                        ><i class="question circle outline icon"></i></span>
-                      </td>
-                      <td>46</td>
-                      <td>8</td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <div class="centered row">
-                <a href="/coming-soon">More info on how stats are collected.</a>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
+  <div class="ui statistic">
+    <div class="value">{{ all_versions.unique_downloads|compact_number(max_value=1_000_000) }}</div>
+    <div class="label">
+      <i aria-hidden="true" class="download icon"></i>
+      {{ _("Downloads") }}
     </div>
   </div>
 </div>
+
+<div class="ui accordion rel-mt-1 centered">
+  <div class="title trigger" tabindex="0">
+    <i class="caret right icon" aria-hidden="true"></i>
+    <span
+      data-open-text="{{ _('Show more details') }}"
+      data-close-text="{{ _('Show less details') }}"
+    >
+      {{ _('Show more details') }}
+    </span>
+  </div>
+
+  <div class="content">
+    <table id="record-statistics" class="ui definition table fluid">
+      <thead>
+        <tr>
+          <th></th>
+          <th class="right aligned">{{ _("All versions") }}</th>
+          <th class="right aligned">{{ _("This version") }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>
+            {{ _("Views") }}
+            <i
+              tabindex="0"
+              role="button"
+              style="position:relative"
+              class="popup-trigger question circle small icon"
+              aria-expanded="false"
+              aria-label="{{ _('More info') }}"
+              data-variation="mini inverted"
+            >
+            </i>
+            <p role="tooltip" class="popup-content ui flowing popup transition hidden">
+              {{ _('Total views') }}
+            </p>
+          </td>
+          <td data-label="{{_('All versions')}}" class="right aligned">{{ stats_popup(all_versions.unique_views) }}</td>
+          <td data-label="{{_('This version')}}" class="right aligned">{{ stats_popup(this_version.unique_views) }}</td>
+        </tr>
+        <tr>
+          <td>
+            {{ _("Downloads") }}
+            <i
+              tabindex="0"
+              role="button"
+              style="position:relative"
+              class="popup-trigger question circle small icon"
+              aria-expanded="false"
+              aria-label="{{ _('More info') }}"
+              data-variation="mini inverted"
+            >
+            </i>
+            <p role="tooltip" class="popup-content ui flowing popup transition hidden">
+              {{ _('Total downloads') }}
+            </p>
+          </td>
+          <td data-label="{{_('All versions')}}" class="right aligned">{{ stats_popup(all_versions.unique_downloads) }}</td>
+          <td data-label="{{_('This version')}}" class="right aligned">{{ stats_popup(this_version.unique_downloads) }}</td>
+        </tr>
+        <tr>
+          <td>
+            {{ _("Data volume") }}
+            <i
+              tabindex="0"
+              role="button"
+              style="position:relative"
+              class="popup-trigger question circle small icon"
+              aria-expanded="false"
+              aria-label="{{ _('More info') }}"
+              data-variation="mini inverted"
+            >
+            </i>
+            <p role="tooltip" class="popup-content ui flowing popup transition hidden">
+              {{ _('Total data volume') }}
+            </p>
+          </td>
+          {%- set binary_sizes = not config.APP_RDM_DISPLAY_DECIMAL_FILE_SIZES %}
+
+          <td data-label="{{_('All versions')}}" class="right aligned">{{ all_versions.data_volume|filesizeformat(binary=binary_sizes) }}</td>
+          <td data-label="{{_('This version')}}" class="right aligned">{{ this_version.data_volume|filesizeformat(binary=binary_sizes) }}</td>
+        </tr>
+      </tbody>
+    </table>
+    <p class="text-align-center rel-mt-1">
+      <small>
+        <a href="/help/statistics">{{ _("More info on how stats are collected.") }}...</a>
+      </small>
+    </p>
+  </div>
+
+</div>
+

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/details/subjects.html

@@ -1,45 +1,47 @@
 {#
   Copyright (C) 2020 CERN.
-  Copyright (C) 2020 Northwestern University.
+  Copyright (C) 2020-2022 Northwestern University.
   Copyright (C) 2021 New York University.
 
   Invenio RDM Records is free software; you can redistribute it and/or modify
   it under the terms of the MIT License; see LICENSE file for more details.
 #}
 
-{%- set subjects = record.metadata.subjects -%}
+{%- set subjects = record_ui["metadata"]["subjects"] -%}
 
 {% if subjects %}
   {% set keywords = subjects|rejectattr("scheme")|list %}
   {% if keywords %}
-  <dl class="details-list subjects" aria-label="{{ _('Keywords') }}">
-    <dt class="hidden">{{ _('Keywords') }}</dt>
+  <h3 class="hidden">{{ _('Keywords') }}</h3>
+  <ul class="ui horizontal list no-bullets subjects">
     {%- for subject in keywords %}
-      <dd>
-        <a href='/search?q=metadata.subjects.subject:"{{ subject.subject }}"'
-           class="subject"
-           title="{{ _('Search results for ') + subject.subject }}"
-        >
-          {{ subject.subject }}
-        </a>
-      </dd>
+    <li class="item">
+      {%- set q = 'metadata.subjects.subject:"' + subject.subject + '"' %}
+      <a href="{{ url_for('invenio_search_ui.search', q=q) }}"
+          class="subject"
+          title="{{ _('Search results for ') + subject.subject }}"
+      >
+        {{ subject.subject }}
+      </a>
+    </li>
     {%- endfor %}
-  </dl>
+  </ul>
   {% endif %}
 
   {%- for scheme, subjects in subjects|selectattr("scheme")|groupby('scheme')|sort(attribute='scheme') %}
-  <dl class="details-list subjects" aria-label="{{ _('Subjects') }}">
-    <dt class="ui tiny header">{{scheme}}</dt>
+  <h3 class="ui tiny header">{{scheme}}</h3>
+  <ul class="ui horizontal list no-bullets subjects">
     {%- for subject in subjects %}
-    <dd>
-      <a href='/search?q=metadata.subjects.subject:"{{ subject.subject }}"'
+    <li class="item">
+      {%- set q = 'metadata.subjects.id:"' + subject.id + '"' %}
+      <a href="{{ url_for('invenio_search_ui.search', q=q) }}"
          class="subject"
          title="{{ _('Search results for ') + subject.subject }}"
       >
         {{ subject.subject }}
       </a>
-    </dd>
+    </li>
     {%- endfor %}
-  </dl>
+  </ul>
   {%- endfor %}
 {% endif %}

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/draft_not_found.html

@@ -0,0 +1,17 @@
+{#
+  Copyright (C) 2024 CERN.
+
+  Invenio App RDM is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+
+{% extends config.THEME_ERROR_TEMPLATE %}
+
+{%- set title = _("Draft not found") + " | " + config.THEME_SITENAME -%}
+{%- set record_link = record_id %}
+
+{%- block message %}
+  <h1><i class="bolt icon"></i> {{_('Draft not found')}}</h1>
+  <p>{{_('This record has already been published and is not currently being edited, so no draft exists.')}}</p>
+  <a href="{{ record_link }}"> {{ _('Go to published record') }}</a>
+{% endblock message %}

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/export.html

@@ -5,7 +5,7 @@
   it under the terms of the MIT License; see LICENSE file for more details.
 #}
 
-{%- extends "invenio_app_rdm/records/detail.html" %}
+{%- extends config.APP_RDM_RECORD_LANDING_PAGE_TEMPLATE %}
 
 
 {%- block record_header_button -%}
@@ -23,12 +23,13 @@
 {% block record_content %}
 <h3>{{ export_format }} Export</h3>
 <div class="top-padded">
-  <pre class="export result">
+  <pre class="export result mb-10 ml-10">
   {{- exported_record -}}
   </pre>
 </div>
 {%- endblock record_content %}
 
 {% block record_files %}{% endblock %}
+{% block record_media_files %}{% endblock %}
 {% block record_details %}{% endblock %}
 {% block record_footer %}{% endblock %}

invenio_app_rdm/records_ui/templates/semantic-ui/invenio_app_rdm/records/iiif_preview.html

@@ -8,12 +8,8 @@
 
 {%- extends config.PREVIEWER_ABSTRACT_TEMPLATE %}
 
-{%- block head %}
-{% for css_bundle in css_bundles %}
-{{ webpack[css_bundle] }}
-{% endfor %}
-{%- endblock %}
-
 {% block panel %}
-<img class="iiif-preview-img" src="{{ file_url }}" style="max-width: 100%;">
+<div class="iiif-simple-preview">
+  <img src="{{ file_url }}" alt="{{ _('Preview for' )}} {{ file.filename }}" />
+</div>
 {% endblock %}

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

@@ -1,8 +1,9 @@
 {#
-    Copyright (C) 2020 CERN.
+    Copyright (C) 2020-2024 CERN.
     Copyright (C) 2020 Northwestern University.
     Copyright (C) 2021 Graz University of Technology.
     Copyright (C) 2021-2022 New York University.
+    Copyright (C) 2025 KTH Royal Institute of Technology.
 
     Invenio RDM Records is free software; you can redistribute it and/or modify
     it under the terms of the MIT License; see LICENSE file for more details.
@@ -11,39 +12,48 @@
 {% macro creatibutor_icon(creatibutor) %}
   {% set identifier_found = namespace(value=False) %}
 
-  {% for scheme, identifier in creatibutor.person_or_org.identifiers|groupby("scheme") %}
-    {%- if scheme == "orcid" %}
-      {% set identifier_found.value = True %}
-      <a class="identifier-link" href="{{ identifier[0]['identifier']|pid_url('orcid') }}" aria-label="{{ creatibutor.person_or_org.name }}'s ORCID {{ _('profile') }}" title="{{ creatibutor.person_or_org.name }}'s ORCID {{ _('profile') }}">
-        <img class="inline-id-icon" src="{{ url_for('static', filename='images/orcid.svg') }}" alt="ORCID icon"/>
-      </a>
-    {%- elif scheme == "ror" %}
-      {% set identifier_found.value = True %}
-      <a href="{{ identifier[0]['identifier']|pid_url('ror') }}" aria-label="{{ creatibutor.person_or_org.name }}'s ROR {{ _('profile') }}" title="{{ creatibutor.person_or_org.name }}'s ROR {{ _('profile') }}">
-        <img class="inline-id-icon" src="{{ url_for('static', filename='images/ror-icon.svg') }}" alt="ROR icon"/>
-      </a>
-    {%- endif %}
-  {% endfor %}
+  {% if config.APP_RDM_IDENTIFIER_SCHEMES_UI %}
+    {% for scheme, details in config.APP_RDM_IDENTIFIER_SCHEMES_UI.items() %}
+      {% for identifier in creatibutor.person_or_org.identifiers|selectattr("scheme", "equalto", scheme) %}
+        {% set identifier_found.value = True %}
+        <a href="{{ identifier.identifier|pid_url(scheme) }}"
+           aria-label="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}"
+           title="{{ creatibutor.person_or_org.name }}'s {{ details.label }} {{ _('profile') }}">
+          <img class="ml-5 inline-id-icon"
+               src="{{ url_for('static', filename=details.icon) }}"
+               alt="{{ details.label }} icon"/>
+        </a>
+      {% endfor %}
+    {% endfor %}
+  {% endif %}
 
-  {# if no identifiers: distinguish btw people and organizations #}
-  {%- if not identifier_found.value and creatibutor.person_or_org.type == 'organizational'%}
-    <i class="group icon"></i>
-  {%- endif %}
+  {# Fallback for missing identifiers #}
+  {% if not identifier_found.value %}
+    {% if creatibutor.person_or_org.type == 'organizational' %}
+      <i class="group icon"></i>
+    {% else %}
+      <i class="user icon"></i>
+    {% endif %}
+  {% endif %}
 {% endmacro %}
 
 
-{% macro show_creatibutors(creatibutors, show_affiliations=False) %}
-  {% for creatibutor in creatibutors %}
-  <dd class="creatibutor-wrap">
-    <a class="ui tooltip-popup creatibutor-link"
+
+{% macro show_creatibutors(creatibutors, show_affiliations=False, type="creators", show_role=False) %}
+  {% for creatibutor in creatibutors if creatibutor.person_or_org and creatibutor.person_or_org.name %}
+  <li class="creatibutor-wrap separated">
+    <a class="ui creatibutor-link"
       {% if show_affiliations and creatibutor.affiliations %}
-        data-content="{{ creatibutor.affiliations|join('; ', attribute='1') }}"
+        data-tooltip="{{ creatibutor.affiliations|join('; ', attribute='1') }}"
       {% endif %}
-      href="{{url_for('invenio_search_ui.search', q='metadata.creators.person_or_org.name:"' + creatibutor.person_or_org.name + '"')}}"
+      href="{{url_for('invenio_search_ui.search', q='metadata.' + type + '.person_or_org.name:"' + creatibutor.person_or_org.name + '"')}}"
     >
 
       <span class="creatibutor-name">
         {{- creatibutor.person_or_org.name -}}
+        {% if show_role and creatibutor.role %}
+          ({{- creatibutor.role.title -}})
+        {%- endif -%}
       </span>
       {%- if creatibutor.affiliations -%}
       <sup class="font-tiny">
@@ -54,40 +64,51 @@
       {%- endif -%}
     </a>
     {{- creatibutor_icon(creatibutor) -}}
-    {%- if not loop.last -%}
-       <span class="separator">;</span>
-    {%- endif -%}
-  </dd>
+  </li>
   {% endfor %}
 {%- endmacro %}
 
 
 {% macro affiliations_accordion(group, affiliations) %}
-<div class="ui sixteen wide tablet three wide computer column title">
-  <div class="dropdown button-wrapper">
-      <button class="ui affiliations-button button mini up" aria-controls="{{ group }}-affiliations">{{ _("Show affiliations") }}</button>
-      <button class="ui affiliations-button button mini down" aria-controls="{{ group }}-affiliations">{{ _("Hide affiliations") }}</button>
-  </div>
+<div class="ui sixteen wide tablet three wide computer column title right aligned bottom aligned">
+  <button class="ui affiliations-button trigger button mini mr-0"
+          aria-controls="{{ group }}-affiliations"
+          data-open-text="{{_('Show affiliations')}}"
+          data-close-text="{{ _('Hide affiliations') }}"
+          aria-expanded="false"
+  >
+    {{ _("Show affiliations") }}
+  </button>
 </div>
 
-<section class="ui sixteen wide column content affiliations-list" id="{{ group }}-affiliations" aria-label="{{ _('Affiliations for') }} {{ group }}">
-  <dl>
-  {% for affiliation in affiliations %}
-      <dd>
-          {{ affiliation[0] }}.
+<section class="ui sixteen wide column content" id="{{ group }}-affiliations" aria-label="{{ _('Affiliations for') }} {{ group }}">
+  <ul>
+    {% for affiliation in affiliations %}
+    <li>
+      {{ affiliation[0] }}.
+
+      {% if affiliation[2] %}
+        {% set scheme, identifier = (affiliation[2].split(':', 1) if ':' in affiliation[2] else ('ror', affiliation[2])) %}
+        {% set scheme_config = config.APP_RDM_IDENTIFIER_SCHEMES_UI.get(scheme) %}
 
-          {% if affiliation[2] %}
-          <a class="identifier-link"
-             href="https://ror.org/{{affiliation[2]}}"
-             aria-label="{{ affiliation[1] }}'s ROR {{ _('profile') }}"
-             title="{{ affiliation[1] }}'s ROR {{ _('profile') }}"
+        {% if scheme_config %}
+          <a class="no-text-decoration"
+             href="{{ scheme_config.url_prefix + identifier }}"
+             aria-label="{{ affiliation[1] }}'s {{ scheme_config.label }} {{ _('profile') }}"
+             title="{{ affiliation[1] }}'s {{ scheme_config.label }} {{ _('profile') }}"
           >
-              <img class="inline-id-icon" src="{{ url_for('static', filename='images/ror-icon.svg') }}" alt="ROR icon"/>
+            <img class="ml-5 inline-id-icon"
+                 src="{{ url_for('static', filename=scheme_config.icon) }}"
+                 alt="{{ scheme_config.label }} icon"
+            />
           </a>
-          {%- endif %}
-          {{affiliation[1]}}
-      </dd>
+        {% endif %}
+      {% endif %}
+
+      {{ affiliation[1] }}
+    </li>
   {% endfor %}
-  </dl>
+
+    </ul>
 </section>
 {% endmacro %}