Compare commits

..

16 Commits

Author SHA1 Message Date
Christoph Ladurner
c8035571be release v4.11.3 2023-06-07 23:36:30 +02:00
Christoph Ladurner
6aba6bcaa0 fix: frontpage upload buttons small monitor 2023-06-07 23:36:08 +02:00
Christoph Ladurner
1022fa45f4 release v4.11.2 2023-06-01 12:45:40 +02:00
Christoph Ladurner
eb95994afa frontpage: layout changes 2023-06-01 12:00:30 +02:00
Christoph Ladurner
bcacce0644 translation: add oer frontpage translation 2023-06-01 12:00:30 +02:00
Christoph Ladurner
c2494401e9 WIP: oer upload button on frontpage 2023-06-01 12:00:30 +02:00
Christoph Ladurner
3afaca51c6 release v4.11.1 2023-04-20 23:28:57 +02:00
Christoph Ladurner
3a9fe9f385 fix: increase invenio-config-tugraz
* to solve the v11 compatibility problem. in particular the
  invenio-rdm-records to low dependency
2023-04-20 23:28:36 +02:00
Christoph Ladurner
02e9b3f90c release v4.11.0 2023-04-20 22:09:40 +02:00
Christoph Ladurner
9320fe3d5d global: make dependencies compatible with v11 2023-04-20 22:08:14 +02:00
Christoph Ladurner
d38e50a489 release v4.10.1 2022-11-10 09:21:59 +01:00
Mojib Wali
f1fc4d8b9e dep: bump in invenio-assets 2022-10-13 11:57:18 +02:00
Mojib Wali
b286b9adaa release: v4.10.0 2022-10-13 11:38:53 +02:00
Mojib Wali
19fada5940 global: migrate to v10 2022-10-13 11:32:22 +02:00
Christoph Ladurner
7cb3b5a83b release v4.0.2 2022-09-09 10:37:05 +02:00
David
936c085f05 css: adapt skip-to-main button (#280) 2022-08-18 18:32:09 +02:00
12 changed files with 197 additions and 72 deletions

View File

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

View File

@@ -8,6 +8,44 @@
Changes Changes
======= =======
Version v4.11.3 (release 2023-06-07)
- fix: frontpage upload buttons small monitor
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) Version v4.0.1 (release 2022-08-05)
- update translation - update translation

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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 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 modify it under the terms of the MIT License; see LICENSE file for more
@@ -106,8 +106,37 @@
<!---segments--> <!---segments-->
<div class="six wide column"> <div class="six wide column">
<!--contact us-->
<div class="ui segment" style="padding-bottom: 10px;"> <div class="ui segment" style="padding-bottom: 10px;">
<h4>{{ _("You can upload different types of records:") }}</h4>
<div class="ui grid">
<div class="sixteen wide mobile eight wide computer column">
<span>
{{ _("Visibility of uploaded content is maximized through synchronization with data hubs (DataCite).") }}
</span>
</div>
<div class="sixteen wide mobile eight wide computer column">
<a class="ui fluid positive button" href="me/uploads" title="Research Data">
<i aria-hidden="true" class="upload icon"></i>
{{ _("Upload Research Output") }}
</a>
</div>
<div class="sixteen wide mobile eight wide computer column">
<span>
{{ _("Open Educational Resources (OER) will be visible on various discovery tools like the OERhub.") }}
</span>
</div>
<div class="sixteen wide mobile eight wide computer column">
<a class="ui fluid positive button" href="lom/uploads" title="Open Educational Resources">
<i aria-hidden="true" class="upload icon"></i>
{{ _("Upload OER") }}
</a>
</div>
</div>
</div>
<!--contact us-->
<div class="ui segment">
<h4>{{ _("Need help?") }}</h4> <h4>{{ _("Need help?") }}</h4>
{%- if config.THEME_TUGRAZ_CONTACT_FORM %} {%- if config.THEME_TUGRAZ_CONTACT_FORM %}
<div style="padding-bottom: 10px;"> <div style="padding-bottom: 10px;">
@@ -121,7 +150,6 @@
</p> </p>
<p> <p>
{{ _("We can help with:") }} {{ _("We can help with:") }}
</p> </p>
<ul> <ul>

View File

@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: invenio-theme-tugraz 1.0.4\n" "Project-Id-Version: invenio-theme-tugraz 1.0.4\n"
"Report-Msgid-Bugs-To: mojib.wali@tugraz.at\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" "Last-Translator: \n"
"Language-Team: de <LL@li.org>\n" "Language-Team: de <LL@li.org>\n"
"Language: de\n" "Language: de\n"
@@ -198,8 +198,8 @@ msgstr "Um die Schriftgröße zu ändern."
#, fuzzy, python-format #, fuzzy, python-format
msgid "" msgid ""
"<strong>Powered by</strong>\n" "<strong>Powered by</strong>\n"
" <a href=\"%(invenio_rdm)s\" target=\"_blank\" title=\"invenioRDM" " <a href=\"%(invenio_rdm)s\" target=\"_blank\" "
"\">" "title=\"invenioRDM\">"
msgstr "" msgstr ""
"<strong>Powered by</strong> <a href=\"%(invenio_rdm)s\" target=\"_blank\">" "<strong>Powered by</strong> <a href=\"%(invenio_rdm)s\" target=\"_blank\">"
@@ -272,43 +272,71 @@ msgstr ""
msgid "More" msgid "More"
msgstr "Mehr" 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?" msgid "Need help?"
msgstr "Brauchen Sie Hilfe?" 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" msgid "Contact us"
msgstr "Kontaktiere uns" 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." msgid "prioritizes all Recent uploads."
msgstr "reiht die neuesten Uploads vor." 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:" msgid "We can help with:"
msgstr "Dabei können wir helfen:" 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." msgid "Uploading your research data, software, preprints, etc."
msgstr "Hochladen Ihrer Forschungsdaten, Software, Preprints usw." 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" msgid "One-on-one with"
msgstr "One-on-one mit" 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." msgid "supporters."
msgstr "Unterstützern" 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." msgid "Quota increases beyond our default policy."
msgstr "Quota Erhöhungen über unsere Standard Policy hinaus." 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." msgid "Scripts for automated uploading of larger datasets."
msgstr "Skripte zum automatisierten Hochladen größerer Datensätze." 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" msgid "Why use"
msgstr "Warum" msgstr "Warum"
@@ -458,9 +486,6 @@ msgstr "Mit Ihren Repository Daten registrieren"
#~ msgid "DOI" #~ msgid "DOI"
#~ msgstr "DOI" #~ msgstr "DOI"
#~ msgid "Uploads"
#~ msgstr "Hochladen"
#~ msgid "German" #~ msgid "German"
#~ msgstr "Deutsche" #~ msgstr "Deutsche"

View File

@@ -1,22 +1,22 @@
# Translations template for invenio-theme-tugraz. # 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 # This file is distributed under the same license as the
# invenio-theme-tugraz project. # invenio-theme-tugraz project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2022. # FIRST AUTHOR <EMAIL@ADDRESS>, 2023.
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" 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" "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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\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 #: invenio_theme_tugraz/config.py:13 invenio_theme_tugraz/config.py:60
msgid "TU Graz Repository" msgid "TU Graz Repository"
@@ -256,43 +256,67 @@ msgstr ""
msgid "More" msgid "More"
msgstr "" 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 "" 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 "" 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 "" msgstr ""
#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:123 #: 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 "" msgstr ""
#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:128 #: 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." msgid "Uploading your research data, software, preprints, etc."
msgstr "" 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" msgid "One-on-one with"
msgstr "" msgstr ""
#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:129 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:152
msgid "supporters." msgid "supporters."
msgstr "" 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." msgid "Quota increases beyond our default policy."
msgstr "" 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." msgid "Scripts for automated uploading of larger datasets."
msgstr "" msgstr ""
#: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:136 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:159
msgid "Why use" msgid "Why use"
msgstr "" msgstr ""

View File

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

View File

@@ -36,20 +36,19 @@ packages = find:
python_requires = >=3.8 python_requires = >=3.8
zip_safe = False zip_safe = False
install_requires = 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-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] [options.extras_require]
tests = 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] [options.entry_points]
invenio_base.apps = invenio_base.apps =
@@ -98,6 +97,10 @@ output-dir = invenio_theme_tugraz/translations/
[isort] [isort]
profile=black profile=black
[check-manifest]
ignore =
*-requirements.txt
[tool:pytest] [tool:pytest]
addopts = --black --isort --pydocstyle --doctest-glob="*.rst" --doctest-modules --cov=invenio_theme_tugraz --cov-report=term-missing tests invenio_theme_tugraz 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 testpaths = tests invenio_theme_tugraz