release v4.11.2

* to solve the v11 compatibility problem. in particular the
  invenio-rdm-records to low dependency

.github/workflows/tests.yml

@@ -31,10 +31,10 @@ jobs:
           python-version: [3.8, 3.9]
           requirements-level: [pypi]
           db-service: [postgresql13]
-          search-service: [elasticsearch7]
+          search-service: [opensearch2]
           include:
-          - search-service: elasticsearch7
+          - search-service: opensearch2
-            SEARCH_EXTRAS: "elasticsearch7"
+            SEARCH_EXTRAS: "opensearch2"
 
     env:
       DB: ${{ matrix.db-service }}

CHANGES.rst

@@ -8,6 +8,39 @@
 Changes
 =======
 
+Version v4.11.2 (release 2023-06-01)
+
+- frontpage: layout changes
+- translation: add oer frontpage translation
+- WIP: oer upload button on frontpage
+
+
+Version v4.11.1 (release 2023-04-20)
+
+- fix: increase invenio-config-tugraz
+
+
+Version v4.11.0 (release 2023-04-20)
+
+- global: make dependencies compatible with v11
+
+
+Version v4.10.1 (release 2022-11-10)
+
+- dep: bump in invenio-assets
+
+
+Version v4.10.0 (release 2022-10-13)
+
+- global: migrate to v10 (#282)
+
+Version v4.0.2 (release 2022-09-09)
+
+- release v4.0.1
+- update translation
+- improve wording on search options
+
+
 Version v4.0.1 (release 2022-08-05)
 
 - update translation

docs/conf.py

@@ -62,7 +62,7 @@ release = __version__
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = "en"
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

invenio_theme_tugraz/__init__.py

@@ -10,6 +10,6 @@
 
 from .ext import InvenioThemeTugraz
 
-__version__ = "4.0.1"
+__version__ = "4.11.2"
 
 __all__ = ("__version__", "InvenioThemeTugraz")

invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/header.less

@@ -255,3 +255,10 @@ span.home-inline{
   border: solid @notificationBorder 1px;
   z-index: 100000;
 }
+
+#skip-to-main {
+  background-color: @primaryButton;
+  &:focus {
+    background-color: @primaryButtonInverted;
+  }
+}

invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/variables.less

@@ -46,7 +46,7 @@
 @primaryLinkHoverBackground   : @primaryText;
 @primaryButton                : @primaryBackground;
 @primaryButtonHoverBackground : @primaryText;
-@primaryButtonInverted        : #000f;
+@primaryButtonInverted        : @primaryText;
 
 
 

invenio_theme_tugraz/search.py

@@ -8,8 +8,8 @@
 
 """Frontpage records."""
 
-from elasticsearch_dsl.query import Q
 from invenio_search.api import RecordsSearch
+from invenio_search.engine import dsl
 
 
 class FrontpageRecordsSearch(RecordsSearch):
@@ -19,7 +19,7 @@ class FrontpageRecordsSearch(RecordsSearch):
         """Default index and filter for frontpage search."""
 
         index = "rdmrecords-records"
-        default_filter = Q(
+        default_filter = dsl.Q(
             "query_string",
             query=("access.record:public " "AND versions.is_latest:true"),
         )

invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html

@@ -1,5 +1,5 @@
 {#
-  Copyright (C) 2020-2021 Graz University of Technology.
+  Copyright (C) 2020-2023 Graz University of Technology.
 
   invenio-theme-tugraz is free software; you can redistribute it and/or
   modify it under the terms of the MIT License; see LICENSE file for more
@@ -23,11 +23,11 @@
 
     <!---Recent uploads-->
     <div class="ten wide column random-records-frontpage">
-      <h2>{{_('Recent uploads')}}</h2>
+      <h2>{{ _('Recent uploads') }}</h2>
 
       {% if not records %}
       <div class="ui centered grid">
-        <p style="font-size: medium;">{{_('There are no public records to show.')}}</p>
+        <p style="font-size: medium;">{{ _('There are no public records to show.') }}</p>
       </div>
       {% endif %}
 
@@ -41,12 +41,12 @@
         -->
         <div class="badges">
           <!--Publication date/Version badge-->
-          <span class="ui label blue" data-tooltip="{{_('Publication date')}}" data-inverted="">
+          <span class="ui label blue" data-tooltip="{{ _('Publication date') }}" data-inverted="">
             {{ r.metadata.publication_date }} {{ '(' ~ r.metadata.version ~ ')' if r.metadata.version }}
           </span>
 
           <!--Resource type badge-->
-          <span class="ui label grey" data-tooltip="{{_('Resource type')}}" data-inverted>
+          <span class="ui label grey" data-tooltip="{{ _('Resource type') }}" data-inverted>
             {{ r.ui.resource_type.title_l10n }}
           </span>
 
@@ -62,7 +62,7 @@
 
         <h4>
           <a href="{{ record_url }}" class="no-decoration">
-            {{r.metadata.title}}
+            {{ r.metadata.title }}
           </a>
         </h4>
 
@@ -80,7 +80,7 @@
           <div class="two column row">
             <div class="left floated column">
               {%- for s in r.metadata.subjects %}
-              <div class="ui tiny label">{{s.subject}}</div>
+              <div class="ui tiny label">{{ s.subject }}</div>
               {%- endfor %}
               <div>
                 <small>
@@ -98,7 +98,7 @@
       {%- endfor %}
       {% if records %}
       <div class="ui centered grid">
-        <a class="ui button more" href="{{url_for('invenio_search_ui.search')}}">{{_('More')}}</a>
+        <a class="ui button more" href="{{ url_for('invenio_search_ui.search') }}">{{ _('More') }}</a>
       </div>
       {%- endif %}
     </div>
@@ -106,34 +106,57 @@
 
     <!---segments-->
     <div class="six wide column">
-      <!--contact us-->
       <div class="ui segment" style="padding-bottom: 10px;">
-        <h4>{{_ ("Need help?")}}</h4>
+        <h4>{{ _("You can upload different types of records:") }}</h4>
+
+        <p style="margin: 14px">
+          <span class="ui left floated" style="text-align: justify; width:260px; display:inline-block;">
+            {{ _("Visibility of uploaded content is maximized through synchronization with data hubs (DataCite).") }}
+          </span>
+          <a class="ui positive right floated button" style="width:250px; display:inline-block;" href="me/uploads" title="Research Data">
+            <i aria-hidden="true" class="upload icon"></i>
+            {{ _("Upload Research Output") }}
+          </a>
+        </p>
+        <p style="margin: 14px;">
+          <span class="ui left floated" style="text-align: justify; width:260px; display:inline-block;">
+            {{ _("Open Educational Resources (OER) will be visible on various discovery tools like the OERhub.") }}
+          </span>
+
+          <a class="ui positive right floated button" style="width:250px; display:inline-block;" href="lom/uploads" title="Open Educational Resources">
+            <i aria-hidden="true" class="upload icon"></i>
+            {{ _("Upload OER") }}
+          </a>
+        </p>
+      </div>
+
+      <!--contact us-->
+      <div class="ui segment">
+        <h4>{{ _("Need help?") }}</h4>
         {%- if config.THEME_TUGRAZ_CONTACT_FORM %}
         <div style="padding-bottom: 10px;">
           <a id="feedback-form" class="fluid ui button">
-            {{_ ("Contact us")}} 
+            {{ _("Contact us") }}
           </a>
         </div>
         {%- endif %}
         <p>
-          {{config.THEME_SITENAME}} {{_ ("prioritizes all Recent uploads.")}}
+          {{ config.THEME_SITENAME }} {{ _("prioritizes all Recent uploads.") }}
         </p>
         <p>
-          {{_ ("We can help with:")}} 
+          {{ _("We can help with:") }}
-          
         </p>
 
         <ul>
-          <li>{{_ ("Uploading your research data, software, preprints, etc.")}}</li>
+          <li>{{ _("Uploading your research data, software, preprints, etc.") }}</li>
-          <li>{{_ ("One-on-one with")}} {{config.THEME_SITENAME}} {{_ ("supporters.")}}</li>
+          <li>{{ _("One-on-one with") }} {{ config.THEME_SITENAME }} {{ _("supporters.") }}</li>
-          <li>{{_ ("Quota increases beyond our default policy.")}}</li>
+          <li>{{ _("Quota increases beyond our default policy.") }}</li>
-          <li>{{_ ("Scripts for automated uploading of larger datasets.")}}</li>
+          <li>{{ _("Scripts for automated uploading of larger datasets.") }}</li>
         </ul>
       </div>
 
       <div class="ui segment" style="padding-bottom: 10px;">
-        <h4>{{_ ("Why use")}} {{config.THEME_SITENAME}}?</h4>
+        <h4>{{ _("Why use") }} {{ config.THEME_SITENAME }}?</h4>
 
         {% include "invenio_theme_tugraz/benefits.html" %}
       </div>

invenio_theme_tugraz/translations/de/LC_MESSAGES/messages.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: invenio-theme-tugraz 1.0.4\n"
 "Report-Msgid-Bugs-To: mojib.wali@tugraz.at\n"
-"POT-Creation-Date: 2022-08-05 10:15+0200\n"
+"POT-Creation-Date: 2023-05-26 09:37+0200\n"
-"PO-Revision-Date: 2022-08-05 10:21+0200\n"
+"PO-Revision-Date: 2023-05-31 15:27+0200\n"
 "Last-Translator: \n"
 "Language-Team: de <LL@li.org>\n"
 "Language: de\n"
@@ -198,8 +198,8 @@ msgstr "Um die Schriftgröße zu ändern."
 #, fuzzy, python-format
 msgid ""
 "<strong>Powered by</strong>\n"
-"            <a href=\"%(invenio_rdm)s\" target=\"_blank\" title=\"invenioRDM"
+"            <a href=\"%(invenio_rdm)s\" target=\"_blank\" "
-"\">"
+"title=\"invenioRDM\">"
 msgstr ""
 "<strong>Powered by</strong> <a href=\"%(invenio_rdm)s\" target=\"_blank\">"
 
@@ -272,43 +272,71 @@ msgstr ""
 msgid "More"
 msgstr "Mehr"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:111
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:110
+msgid "You can upload different types of records:"
+msgstr "Upload verschiedener Arten von Datensätzen:"
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:114
+msgid ""
+"Visibility of uploaded content is maximized through synchronization with "
+"data hubs (DataCite)."
+msgstr ""
+"Steigerung der Sichtbarkeit der Datensätze durch Synchronisation mit "
+"Harvestern (DataCite)."
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:118
+msgid "Upload Research Output"
+msgstr "Upload Forschungsergebnisse"
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:123
+msgid ""
+"Open Educational Resources (OER) will be visible on various discovery tools "
+"like the OERhub."
+msgstr ""
+"Open Educational Resources (OER) werden auf Suchmaschinen wie OERhub "
+"sichtbar sein."
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:128
+msgid "Upload OER"
+msgstr "Upload OER"
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:135
 msgid "Need help?"
 msgstr "Brauchen Sie Hilfe?"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:115
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:139
 msgid "Contact us"
 msgstr "Kontaktiere uns"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:120
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:144
 msgid "prioritizes all Recent uploads."
 msgstr "reiht die neuesten Uploads vor."
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:123
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:147
 msgid "We can help with:"
 msgstr "Dabei können wir helfen:"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:128
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:151
 msgid "Uploading your research data, software, preprints, etc."
 msgstr "Hochladen Ihrer Forschungsdaten, Software, Preprints usw."
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:129
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:152
 msgid "One-on-one with"
 msgstr "One-on-one mit"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:129
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:152
 msgid "supporters."
 msgstr "Unterstützern"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:130
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:153
 msgid "Quota increases beyond our default policy."
 msgstr "Quota Erhöhungen über unsere Standard Policy hinaus."
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:131
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:154
 msgid "Scripts for automated uploading of larger datasets."
 msgstr "Skripte zum automatisierten Hochladen größerer Datensätze."
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:136
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:159
 msgid "Why use"
 msgstr "Warum"
 
@@ -458,9 +486,6 @@ msgstr "Mit Ihren Repository Daten registrieren"
 #~ msgid "DOI"
 #~ msgstr "DOI"
 
-#~ msgid "Uploads"
-#~ msgstr "Hochladen"
-
 #~ msgid "German"
 #~ msgstr "Deutsche"
 

invenio_theme_tugraz/translations/messages.pot

@@ -1,22 +1,22 @@
 # Translations template for invenio-theme-tugraz.
-# Copyright (C) 2022 Graz University of Technology
+# Copyright (C) 2023 Graz University of Technology
 # This file is distributed under the same license as the
 # invenio-theme-tugraz project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: invenio-theme-tugraz 4.0.0\n"
+"Project-Id-Version: invenio-theme-tugraz 4.11.1\n"
 "Report-Msgid-Bugs-To: mojib.wali@tugraz.at\n"
-"POT-Creation-Date: 2022-08-05 10:15+0200\n"
+"POT-Creation-Date: 2023-05-26 09:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.10.3\n"
+"Generated-By: Babel 2.10.1\n"
 
 #: invenio_theme_tugraz/config.py:13 invenio_theme_tugraz/config.py:60
 msgid "TU Graz Repository"
@@ -256,43 +256,67 @@ msgstr ""
 msgid "More"
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:111
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:110
-msgid "Need help?"
+msgid "You can upload different types of records:"
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:115
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:114
-msgid "Contact us"
+msgid ""
+"Visibility of uploaded content is maximized through synchronization with "
+"data hubs (DataCite)."
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:120
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:118
-msgid "prioritizes all Recent uploads."
+msgid "Upload Research Output"
 msgstr ""
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:123
-msgid "We can help with:"
+msgid ""
+"Open Educational Resources (OER) will be visible on various discovery "
+"tools like the OERhub."
 msgstr ""
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:128
+msgid "Upload OER"
+msgstr ""
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:135
+msgid "Need help?"
+msgstr ""
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:139
+msgid "Contact us"
+msgstr ""
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:144
+msgid "prioritizes all Recent uploads."
+msgstr ""
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:147
+msgid "We can help with:"
+msgstr ""
+
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:151
 msgid "Uploading your research data, software, preprints, etc."
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:129
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:152
 msgid "One-on-one with"
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:129
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:152
 msgid "supporters."
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:130
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:153
 msgid "Quota increases beyond our default policy."
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:131
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:154
 msgid "Scripts for automated uploading of larger datasets."
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:136
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:159
 msgid "Why use"
 msgstr ""
 

invenio_theme_tugraz/views.py

@@ -10,9 +10,9 @@
 
 from typing import Dict
 
-from elasticsearch_dsl.utils import AttrDict
 from flask import Blueprint, render_template
 from invenio_rdm_records.resources.serializers import UIJSONSerializer
+from opensearch_dsl.utils import AttrDict
 
 from .search import FrontpageRecordsSearch
 

setup.cfg

@@ -36,20 +36,19 @@ packages = find:
 python_requires = >=3.8
 zip_safe = False
 install_requires =
-    Flask-BabelEx>=0.9.4
+    flask-babel>=2,<3
-    Flask-WebpackExt>=1.0.0
+    invenio-assets>=2.0.0,<3.0.0
-    invenio-assets>=1.2.7,<1.3.0
     invenio-i18n>=1.3.1,<1.4.0
-    invenio_config_tugraz>=0.9.0,<0.10.0
+    invenio_config_tugraz>=0.11.0,<0.12.0
 
 [options.extras_require]
 tests =
-    pytest-black>=0.3.0,<0.3.10
+    pytest-black>=0.3.0
-    sphinx>=4.2.0,<5
+    Sphinx>=4.5.0
-    pytest-invenio>=1.4.7
+    pytest-invenio>=2.1.0,<3.0.0
-    invenio-app>=1.3.0,<2.0.0
+    invenio-app>=1.3.4,<1.4.0
-elasticsearch7 =
+opensearch2 =
-    invenio-search[elasticsearch7]>=1.4.2,<2.0
+    invenio-search[opensearch2]>=2.1.0,<3.0.0
 
 [options.entry_points]
 invenio_base.apps =
@@ -98,6 +97,10 @@ output-dir = invenio_theme_tugraz/translations/
 [isort]
 profile=black
 
+[check-manifest]
+ignore =
+    *-requirements.txt
+
 [tool:pytest]
 addopts = --black --isort --pydocstyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_theme_tugraz --cov-report=term-missing tests invenio_theme_tugraz
 testpaths = tests invenio_theme_tugraz