v1.5.0

This closes #126

invenio_theme_tugraz/search.py

@@ -21,5 +21,5 @@ class FrontpageRecordsSearch(RecordsSearch):
     class Meta:
         """Default index and filter for frontpage search."""
 
-        index = "rdmrecords"
+        index = "rdmrecords-records"
         default_filter = Q("query_string", query=("access.access_right:open"))

invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html

@@ -17,7 +17,7 @@
 
 <div class="ui container">
 
-  <div class="ui two column stackable centered grid switch-grid">
+  <div class="ui stackable two column grid">
     <div class="centered row">
       <h1 class="ui header">{{ _('Create an Account') }}</h1>
     </div>

invenio_theme_tugraz/templates/invenio_theme_tugraz/footer.html

@@ -30,15 +30,15 @@
       
         <h2>{{_ ("Repository")}}</h2>
         <p class="bodytext">
-          <a href="{{ url_for('invenio_rdm_records.coming_soon') }}">
+          <a href="{{ url_for('invenio_app_rdm.coming_soon') }}">
             {{_ ("Impressum")}}<i class="angle right icon"></i>
           </a>
           <br>
-          <a href="{{ url_for('invenio_rdm_records.coming_soon') }}">
+          <a href="{{ url_for('invenio_app_rdm.coming_soon') }}">
             {{_ ("Data protection")}}<i class="angle right icon"></i>
           </a>
           <br>
-          <a href="{{ url_for('invenio_rdm_records.coming_soon') }}">
+          <a href="{{ url_for('invenio_app_rdm.coming_soon') }}">
             {{_ ("Feedback")}}<i class="angle right icon"></i>
           </a>
         </p>

invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html

@@ -36,11 +36,17 @@
               </span>
               </a>
             </div>
-            {%- for item in current_menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
+            <!--TODO: uncomment this once translation is on place-->
+            <!-- {%- for item in current_menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
             <div class="two wide column main-menu-entry">
               <a href="{{ item.url }}">{{ item.text|safe }}</a>
             </div>
-            {%- endfor %}
+            {%- endfor %} -->
+
+            <!--TODO: remove this once above is uncommented-->
+            <div class="two wide column main-menu-entry">
+              <a href="{{url_for('invenio_app_rdm.deposits_user')}}">{{_ ("Uploads")}}</a>
+            </div>
           </div>
        
           <div id="margin-divider" class="ui divider main-menu-underline-line">

invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html

@@ -48,18 +48,13 @@
         something with doi
         -->
         <div class="badges">
-          <!--Publication date badge-->
+          <!--Publication date/Version badge-->
-          <span class="ui label teal" title="{{_('Publication date')}}">
+          <span class="ui label record-version" title="{{_('Publication date')}}">
-            {{ r.metadata.publication_date }}
+            {{ r.metadata.publication_date }} {{ '(' ~ r.metadata.version ~ ')' if r.metadata.version }}
-          </span>
-
-          <!--Version badge-->
-          <span class="ui label record-version" title="{{_('Version')}}">
-            {{ (' Version ' ~ r.version ~ '') if r.version else 'Version' }}
           </span>
 
           <!--Resource type badge-->
-          <span class="ui label grey" title="{{_('Resource type')}}">
+          <span class="ui label teal" title="{{_('Resource type')}}">
             {{r.metadata.resource_type | cast_to_dict | vocabulary_title('resource_type') }}
           </span>
 
@@ -87,16 +82,22 @@
         <div class="ui grid">
           <div class="two column row">
             <div class="left floated column">
-              <small>
+              {%- for s in r.metadata.subjects %}
-                {% trans user=userprofile, date=creation_date | dateformat('long')%}
+              <div class="ui tiny label">{{s.subject}}</div>
-                Uploaded on {{date}}
+              {%- endfor %}
-                {% endtrans %}
+              <div>
-              </small>
+                <small>
+                  {% trans user=userprofile, date=creation_date | dateformat('long')%}
+                  Uploaded on {{date}}
+                  {% endtrans %}
+                </small>
+              </div>
             </div>
 
             <div class="right floated column">
               <span class="access-right">
-                {{ r.access.access_right | make_dict_like('access_right') | vocabulary_title('access_right') | lower }}
+                <i class="icon lock open"></i>
+                {{ r.access.access_right | make_dict_like('access_right') | vocabulary_title('access_right') }}
               </span>
             </div>
           </div>
@@ -106,7 +107,7 @@
       -->
 
       {%- endfor %}
-      <div class="ui two column centered grid">
+      <div class="ui centered grid">
         <a class="ui button more" href="{{url_for('invenio_search_ui.search')}}">{{_('More')}}</a>
       </div>
     </div>

invenio_theme_tugraz/translations/de/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: invenio-theme-tugraz 1.0.4\n"
 "Report-Msgid-Bugs-To: mojib.wali@tugraz.at\n"
-"POT-Creation-Date: 2020-12-14 09:17+0100\n"
+"POT-Creation-Date: 2021-01-04 14:18+0100\n"
 "PO-Revision-Date: 2020-10-06 10:27+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -57,7 +57,9 @@ msgstr "Vertrauenswürdig"
 msgid ""
 "built and operated by CERN and OpenAIRE to ensure that everyone can join "
 "in Open Science."
-msgstr "Gebaut und betrieben von CERN und OpenAIRE; um sicherzugehen, dass jedeR Zugang zu Open Science hat"
+msgstr ""
+"Gebaut und betrieben von CERN und OpenAIRE; um sicherzugehen, dass jedeR "
+"Zugang zu Open Science hat"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/benefits.html:5
 msgid "Citeable"
@@ -67,8 +69,9 @@ msgstr "Zitierfähig "
 msgid ""
 "every upload is assigned a Digital Object Identifier (DOI), to make them "
 "citable and trackable."
-msgstr "Jeder Upload erhält eine DOI um sicherzustellen,"
+msgstr ""
-"dass er zitierbar und auffindbar ist"
+"Jeder Upload erhält eine DOI um sicherzustellen,dass er zitierbar und "
+"auffindbar ist"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/benefits.html:6
 msgid "No waiting time"
@@ -78,7 +81,9 @@ msgstr "Keine Wartezeit"
 msgid ""
 "Uploads are made available online as soon as you hit publish, and your "
 "DOI is registered within seconds."
-msgstr "Uploads stehen sofort nach drücken auf “Veröffentlichen” zur Verfügung. Ihre DOI wird innerhalb von Sekunden registriert."
+msgstr ""
+"Uploads stehen sofort nach drücken auf “Veröffentlichen” zur Verfügung. "
+"Ihre DOI wird innerhalb von Sekunden registriert."
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/benefits.html:7
 msgid "Open or closed"
@@ -88,8 +93,9 @@ msgstr "Offen oder geschlossen"
 msgid ""
 "Share e.g. anonymized clinical trial data with only medical professionals"
 " via our restricted access mode."
-msgstr "Teilen Sie z.B. anonymisierte klinische Studiendaten nur mit medizinischem Fachpersonal"
+msgstr ""
-"über unseren eingeschränkten Zugriffsmodus."
+"Teilen Sie z.B. anonymisierte klinische Studiendaten nur mit "
+"medizinischem Fachpersonalüber unseren eingeschränkten Zugriffsmodus."
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/benefits.html:8
 msgid "Versioning"
@@ -179,6 +185,10 @@ msgstr "Um die Schriftgröße zu ändern."
 msgid "Home"
 msgstr "Startseite"
 
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html:48
+msgid "Uploads"
+msgstr "Hochladen"
+
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:24
 msgid "Type and press enter to search"
 msgstr "Suchbegriff eingeben und “Enter” drücken (?)"
@@ -205,7 +215,7 @@ msgid ""
 "\n"
 "                Uploaded on %(date)s\n"
 "                "
-msgstr "Hochgeladen am"
+msgstr "Hochgeladen am %(date)s\n"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:110
 msgid "More"
@@ -217,23 +227,23 @@ msgstr "Brauchen Sie Hilfe?"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:123
 msgid "Contact us"
-msgstr "Erreichen Sie uns"
+msgstr "Kontaktiere uns"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:127
 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:130
 msgid "We can help with:"
-msgstr "Dabei können wir Sie unterstützen"
+msgstr "Wir können helfen bei:"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:135
 msgid "Uploading your research data, software, preprints, etc."
-msgstr "Hochladen Ihrer Forschungsdaten, Software, Preprints, etc."
+msgstr "Hochladen Ihrer Forschungsdaten, Software, Preprints usw."
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:136
 msgid "One-on-one with"
-msgstr "Eins zu eins mit"
+msgstr "Eins-zu-eins mit"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:136
 msgid "supporters."
@@ -241,11 +251,11 @@ msgstr "Unterstützern"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:137
 msgid "Quota increases beyond our default policy."
-msgstr "Erhöhung Ihres Kontingents über das vertraglich Zugesicherte hinaus"
+msgstr "Erhöhung Ihres Kontingents über das vertraglich Zugesicherte hinaus."
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:138
 msgid "Scripts for automated uploading of larger datasets."
-msgstr "Programme, die den automatischen Upload großer Datenmengen unterstützen"
+msgstr "Skripte zum automatisierten Hochladen größerer Datensätze."
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:143
 msgid "Why use"
@@ -288,7 +298,7 @@ msgstr "Ausloggen"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:24
 msgid "Log in to Repository"
-msgstr "Ins repositorium einloggen"
+msgstr "Anmelden"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:32
 #, python-format
@@ -325,8 +335,9 @@ msgstr "Zitierfähig. Auffindbar."
 msgid ""
 "Uploads get a Digital Object Identifier (DOI) to make them easily and "
 "uniquely citeable."
-msgstr "Uploads erhalten eine DOI und werden damit leicht"
+msgstr ""
-"auffindbar und zitierfähig."
+"Uploads erhalten eine DOI und werden damit leichtauffindbar und "
+"zitierfähig."
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:30
 msgid "Communities."
@@ -336,8 +347,9 @@ msgstr "Communities"
 msgid ""
 "Accept or reject uploads to your own community (e.g workshops, EU "
 "projects, institutions or entire disciplines)."
-msgstr "Annehmen oder Ablehnen von Uploads in Ihrer eigenen Community (z.B. workshop, EU"
+msgstr ""
-"-Projekt, Forschungseinrichtung, Disziplin)"
+"Annehmen oder Ablehnen von Uploads in Ihrer eigenen Community (z.B. "
+"workshop, EU-Projekt, Forschungseinrichtung, Disziplin)"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:34
 msgid "Trusted Research Data Management"
@@ -347,8 +359,7 @@ msgstr "Vertrauenswürdiges Forschungsdatenmanagement"
 msgid ""
 "Built on top of TU Graz expertise in managing of the research data from "
 "the Graz University of Technology."
-msgstr "Gebaut basierend auf Expertise der"
+msgstr "Gebaut basierend auf Expertise derTU Graz im Bereich Data Management"
-"TU Graz im Bereich Data Management"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:51
 msgid "Sign up with TUGRAZ "
@@ -361,3 +372,4 @@ msgstr "RDM DOI Abzeichen"
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/details/doi.html:32
 msgid "DOI"
 msgstr "DOI"
+

invenio_theme_tugraz/translations/messages.pot

@@ -1,15 +1,15 @@
 # Translations template for invenio-theme-tugraz.
-# Copyright (C) 2020 mojib wali
+# Copyright (C) 2021 mojib wali
 # This file is distributed under the same license as the
 # invenio-theme-tugraz project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: invenio-theme-tugraz 1.1.0\n"
+"Project-Id-Version: invenio-theme-tugraz 1.3.1\n"
 "Report-Msgid-Bugs-To: mojib.wali@tugraz.at\n"
-"POT-Creation-Date: 2020-12-14 09:17+0100\n"
+"POT-Creation-Date: 2021-01-04 14:18+0100\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"
@@ -174,6 +174,10 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/header.html:48
+msgid "Uploads"
+msgstr ""
+
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html:24
 msgid "Type and press enter to search"
 msgstr ""

invenio_theme_tugraz/version.py

@@ -12,4 +12,4 @@ This file is imported by ``invenio_theme_tugraz.__init__``,
 and parsed by ``setup.py``.
 """
 
-__version__ = "1.3.1"
+__version__ = "1.5.0"

run-tests.sh

@@ -1,16 +1,33 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2020 mojib wali.
+# Copyright (C) 2019-2020 CERN.
+# Copyright (C) 2019-2020 Northwestern University.
+# Copyright (C) 2020 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
 # details.
 
+
+# Quit on errors
+set -o errexit
+
+# Quit on unbound symbols
+set -o nounset
+
+# Always bring down docker services
+
+function cleanup() {
+    eval "$(docker-services-cli down --env)"
+}
+trap cleanup EXIT
+
+
 python -m check_manifest --ignore ".*-requirements.txt"
 python -m sphinx.cmd.build -qnNW docs docs/_build/html
-docker-services-cli --verbose up es postgresql redis
+eval "$(docker-services-cli up --db ${DB:-postgresql} --search ${SEARCH:-elasticsearch} --cache ${CACHE:-redis} --env)"
 python -m pytest
 tests_exit_code=$?
-docker-services-cli down
+python -m sphinx.cmd.build -qnNW -b doctest docs docs/_build/doctest
 exit "$tests_exit_code"

setup.py

@@ -18,13 +18,12 @@ history = open("CHANGES.rst").read()
 tests_require = [
     "pytest-invenio>=1.4.0",
     'invenio-app>=1.3.0,<2.0.0',
-    # TODO: remove once a new release is out
+    "psycopg2-binary>=2.8.6",
-    'docker-services-cli>=0.2.1,<0.3.0'
 ]
 
 extras_require = {
     "docs": [
-        "Sphinx>=1.5.1",
+        "Sphinx>=3",
     ],
     "mysql": [
         "invenio-db[mysql]>=1.0.0",

tests/conftest.py

@@ -22,6 +22,7 @@ from flask_babelex import Babel
 from invenio_db import InvenioDB, db
 from invenio_i18n import InvenioI18N
 from invenio_search import InvenioSearch
+from sqlalchemy_utils.functions import create_database, database_exists, drop_database
 
 from invenio_theme_tugraz import InvenioThemeTugraz