v2.1.2

closes #184 #183

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2020 mojib wali.
+Copyright (C) 2020 Graz University of Technology.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

docs/conf.py

@@ -45,8 +45,8 @@ master_doc = "index"
 
 # General information about the project.
 project = u"invenio-theme-tugraz"
-copyright = u"2020, mojib wali"
+copyright = u"2020, Graz University of Technology"
-author = u"mojib wali"
+author = u"Graz University of Technology"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -251,7 +251,7 @@ latex_documents = [
         master_doc,
         "invenio-theme-tugraz.tex",
         u"invenio-theme-tugraz Documentation",
-        u"mojib wali",
+        u"Graz University of Technology",
         "manual",
     ),
 ]

invenio_theme_tugraz/assets/semantic-ui/js/invenio_theme_tugraz/theme.js

@@ -1,7 +1,12 @@
 import $ from 'jquery';
 import 'semantic-ui-css';
 
+// called on document ready
 $(function() {
+  importZammadScript();
+});
+
+function importZammadScript() {
   let scriptNode = document.createElement("hidden"); //needed for zammad script
   scriptNode.id = "zammad_form_script";
   scriptNode.src = "https://ub-support.tugraz.at/assets/form/form.js";
@@ -16,7 +21,8 @@ $(function() {
       modal: true
     });
   });
-});
+}
+
 
 // used for sticky test instance notification
 $('.ui.sticky.test-instance')

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

@@ -30,9 +30,19 @@
         text-decoration: none;
         color: @footerGrey;
 
-        &:hover, &:focus {
+        // :focus-visible activates on keyboard only
+        &:hover, &:focus:focus-visible {
           color: @primaryLink;
           background-color: @primaryLinkHoverBackground;
+
+          i.icon.download {
+            color: @tugrazRed;
+          }
+        }
+        
+        // remove blue focus outline if clicked with mouse
+        &:focus:not(:focus-visible) {
+          outline-style: none;
         }
       }
     }

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

@@ -152,8 +152,3 @@ pre {
 
   }
 }
-
-a:hover i.icon.download,
-i.icon.download:hover {
-  color: @tugrazRed;
-}

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

@@ -31,4 +31,5 @@
   color: inherit;
   text-decoration: none;
   transition: background-color 0.15s ease 0s, color 0.15s ease 0s;
+  outline: none;
 }

invenio_theme_tugraz/config.py

@@ -119,6 +119,9 @@ DEPOSITS_HEADER_TEMPLATE = "invenio_theme_tugraz/header.html"
 TUG_ROUTES = {
     "index": "/",
     "comingsoon": "/comingsoon",
+    "guide": "/guide",
+    "terms": "/terms",
+    "gdpr": "/gdpr",
     "deposit_create": "/uploads/new",
     "deposit_edit": "/uploads/<pid_value>",
     "getdoi": "/getdoi",

invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html

@@ -25,12 +25,10 @@
         <div class="ui divider"></div>
         <!--Log in with SSO-->
         {%- if config.INVENIO_CONFIG_TUGRAZ_SHIBBOLETH %}
-        <div class="login-page-button ui fluid large button">
+        <a href="{{ url_for('sso_saml.sso', idp='idp') }}" class="login-page-button ui fluid large button">
-          <a href="{{ url_for('sso_saml.sso', idp='idp') }}" class="inverted tiny image label">
+          {% trans type='TUGRAZ' %} Log in with {{ type }}{% endtrans %}
-            {% trans type='TUGRAZ' %} Log in with {{ type }}{% endtrans %}
+          <img src="{{ url_for('static', filename=config.INVENIO_THEME_TUGRAZ_ICON)}}" height="20px" />
-            <img src="{{ url_for('static', filename=config.INVENIO_THEME_TUGRAZ_ICON)}}" height="20px" />
+        </a>
-          </a>
-        </div>
         <div class="spacer-long"></div>
         <div class="ui inverted horizontal divider"><span class="text-color">{{_ ("Or")}}</span></div>
         {%- endif %}

invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html

@@ -1,7 +1,5 @@
 {#
-  Copyright (C) 2020 TUGRAZ
+  Copyright (C) 2020 Graz University of Technology.
-  Copyright (C) 2020 mojib wali
-  Copyright (C) 2020 Nikita Lvov
 
   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
@@ -46,11 +44,10 @@
         <!--Sigup with SSO-->
         {%- if config.INVENIO_CONFIG_TUGRAZ_SHIBBOLETH %}
         <div class="ui divider"></div>
-        <div class="login-page-button ui fluid large button">
+        <a href="{{ url_for('sso_saml.sso', idp='idp') }}" class="login-page-button ui fluid large button">
-          <a href="{{ url_for('sso_saml.sso', idp='idp') }}" class="inverted tiny image label">
+          <span style="font-size: 18px;">{{ _('Sign up with TUGRAZ ') }}</span>
-            <span style="font-size: 18px;">{{ _('Sign up with TUGRAZ ') }}</span>
+          <img src="{{ url_for('static', filename=config.INVENIO_THEME_TUGRAZ_ICON)}}" height="20px" />
-            <img src="{{ url_for('static', filename=config.INVENIO_THEME_TUGRAZ_ICON)}}" height="20px" />
+        </a>
-          </a>
         </div>
         <div class="ui inverted horizontal divider"><span class="text-color">{{_ ("Or")}}</span></div>
         {%- endif %}

invenio_theme_tugraz/templates/invenio_theme_tugraz/footer.html

@@ -34,17 +34,22 @@ details.
               {{_ ("Documentation")}} <i class="external alternate icon"></i>
             </a>
             <br>
-            <a href="{{ url_for('static', filename='documents/TUGraz_Repository_Guide_01_de.pdf') }}"
+            <a href="{{ url_for('invenio_theme_tugraz.guide') }}"
               title="Quick guide" target="_blank">
               {{_ ("Reference Guide")}} <i class="download icon"></i>
             </a>
             <br>
-            <a href="{{ url_for('static', filename='documents/TUGraz_Repository_General_Data_Protection_Rights_de.pdf') }}"
+            <a href="{{ url_for('invenio_app_rdm.help_search') }}"
+              title="Search guide">
+              {{_ ("Search Guide")}}<i class="angle right icon"></i>
+            </a>
+            <br>
+            <a href="{{ url_for('invenio_theme_tugraz.gdpr') }}"
               title="General Data Protection Rights" target="_blank">
               {{_ ("Data Protection")}} <i class="download icon"></i>
             </a>
             <br>
-            <a href="{{ url_for('static', filename='documents/TUGraz_Repository_Terms_And_Conditions_de.pdf') }}"
+            <a href="{{ url_for('invenio_theme_tugraz.terms') }}"
               title="Terms and Conditions" target="_blank">
               {{_ ("Terms and Conditions")}} <i class="download icon"></i>
             </a>

invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html

@@ -49,7 +49,7 @@
       {% endif %}
 
       {%- for r in records %}
-      {%- set creation_date = r._created|from_isodatetime -%}
+      {%- set creation_date = r.created|from_isodatetime -%}
       {%- set record_url = url_for('invenio_app_rdm_records.record_detail', pid_value=r.id) %}
 
       <article>

invenio_theme_tugraz/translations/de/LC_MESSAGES/messages.po

@@ -1,5 +1,5 @@
 # German translations for invenio-theme-tugraz.
-# Copyright (C) 2020 mojib wali
+# Copyright (C) 2020-2021 Graz University of Technology
 # This file is distributed under the same license as the
 # invenio-theme-tugraz project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
@@ -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: 2021-04-12 13:20+0200\n"
+"POT-Creation-Date: 2021-04-26 09:08+0200\n"
 "PO-Revision-Date: 2020-10-06 10:27+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -307,8 +307,8 @@ msgid "TECHNOLOGY"
 msgstr "LEIDENSCHAFT"
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/header_login.html:8
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:61
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:59
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:81
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:80
 msgid "Sign up"
 msgstr "Registrierung"
 
@@ -324,26 +324,26 @@ msgstr "Ausloggen"
 msgid "Log in to Repository"
 msgstr "Anmelden"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:30
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:29
 #, python-format
 msgid " Log in with %(type)s"
 msgstr "Einloggen mit"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:35
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:33
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:55
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:54
 msgid "Or"
 msgstr "Oder"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:47
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:45
 msgid "Log In"
 msgstr "Einloggen"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:60
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:58
 #, python-format
 msgid "New to %(sitename)s?"
 msgstr "Neu im %(sitename)s?"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:70
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:68
 msgid "Forgot password?"
 msgstr "Passwort vergessen"
 
@@ -385,7 +385,7 @@ msgid ""
 "the Graz University of Technology."
 msgstr "Gebaut basierend auf Expertise derTU Graz im Bereich Data Management"
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:51
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:50
 msgid "Sign up with TUGRAZ "
 msgstr "Mit Ihrem TUGonline-Account einloggen"
 

invenio_theme_tugraz/translations/messages.pot

@@ -1,5 +1,5 @@
 # Translations template for invenio-theme-tugraz.
-# Copyright (C) 2021 mojib wali
+# Copyright (C) 2021 Graz University of Technology
 # This file is distributed under the same license as the
 # invenio-theme-tugraz project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
@@ -7,9 +7,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: invenio-theme-tugraz 2.0.7\n"
+"Project-Id-Version: invenio-theme-tugraz 2.1.0\n"
 "Report-Msgid-Bugs-To: mojib.wali@tugraz.at\n"
-"POT-Creation-Date: 2021-04-12 13:20+0200\n"
+"POT-Creation-Date: 2021-04-26 09:08+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"
@@ -295,8 +295,8 @@ msgid "TECHNOLOGY"
 msgstr ""
 
 #: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/header_login.html:8
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:61
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:59
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:81
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:80
 msgid "Sign up"
 msgstr ""
 
@@ -312,26 +312,26 @@ msgstr ""
 msgid "Log in to Repository"
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:30
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:29
 #, python-format
 msgid " Log in with %(type)s"
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:35
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:33
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:55
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:54
 msgid "Or"
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:47
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:45
 msgid "Log In"
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:60
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:58
 #, python-format
 msgid "New to %(sitename)s?"
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:70
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/login_user.html:68
 msgid "Forgot password?"
 msgstr ""
 
@@ -369,7 +369,7 @@ msgid ""
 "the Graz University of Technology."
 msgstr ""
 
-#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:51
+#: invenio_theme_tugraz/templates/invenio_theme_tugraz/accounts/register_user.html:50
 msgid "Sign up with TUGRAZ "
 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__ = "2.0.8"
+__version__ = "2.1.2"

invenio_theme_tugraz/views.py

@@ -14,7 +14,8 @@ from typing import Dict
 
 import requests
 from elasticsearch_dsl.utils import AttrDict
-from flask import Blueprint, current_app, g, render_template, request
+from flask import Blueprint, current_app, g, redirect, render_template, request, url_for
+from flask_babelex import get_locale
 from flask_login import login_required
 from flask_menu import current_menu
 from invenio_app_rdm.records_ui.views.decorators import (
@@ -49,6 +50,9 @@ def ui_blueprint(app):
 
     blueprint.add_url_rule(routes["index"], view_func=index)
     blueprint.add_url_rule(routes["comingsoon"], view_func=comingsoon)
+    blueprint.add_url_rule(routes["guide"], view_func=guide)
+    blueprint.add_url_rule(routes["terms"], view_func=terms)
+    blueprint.add_url_rule(routes["gdpr"], view_func=gdpr)
     blueprint.add_url_rule(routes["deposit_create"], view_func=deposit_create)
     blueprint.add_url_rule(routes["record_detail"], view_func=record_detail)
     blueprint.add_url_rule(routes["getdoi"], view_func=retrieve_doi, methods=["POST"])
@@ -82,6 +86,30 @@ def comingsoon():
     return render_template("invenio_theme_tugraz/comingsoon.html")
 
 
+def guide():
+    """TUGraz_Repository_Guide."""
+    locale = get_locale()
+    return redirect(url_for('static',
+                            filename=f'documents/TUGraz_Repository_Guide_01_{locale}.pdf',
+                            _external=True))
+
+
+def terms():
+    """Terms_And_Conditions."""
+    locale = get_locale()
+    return redirect(url_for('static',
+                            filename=f'documents/TUGraz_Repository_Terms_And_Conditions_{locale}.pdf',
+                            _external=True))
+
+
+def gdpr():
+    """General_Data_Protection_Rights."""
+    locale = get_locale()
+    return redirect(url_for('static',
+                            filename=f'documents/TUGraz_Repository_General_Data_Protection_Rights_{locale}.pdf',
+                            _external=True))
+
+
 def get_datacite_details():
     """Application credentials for DOI."""
     prefix = environ.get("INVENIO_DATACITE_PREFIX")

setup.cfg

@@ -24,7 +24,7 @@ add_ignore = D401
 directory = invenio_theme_tugraz/translations/
 
 [extract_messages]
-copyright_holder = mojib wali
+copyright_holder = Graz University of Technology
 msgid_bugs_address = mojib.wali@tugraz.at
 mapping-file = babel.ini
 output-file = invenio_theme_tugraz/translations/messages.pot

setup.py

@@ -58,7 +58,7 @@ install_requires = [
     "invenio-i18n>=1.2.0",
     "elasticsearch_dsl>=7.2.1",
     "invenio_search>=1.4.0,<2.0.0",
-    "invenio_config_tugraz>=0.5.1",
+    "invenio_config_tugraz>=0.5.1,<0.5.8",
     # keep this package updated.
     "invenio_app_rdm==2.0.1",
 ]
@@ -79,7 +79,7 @@ setup(
     long_description=readme + "\n\n" + history,
     keywords="invenio, theme, invenioRDM, TU-Graz, Graz University of Technology, statistics",
     license="MIT",
-    author="mojib wali",
+    author="Graz University of Technology",
     author_email="mojib.wali@tugraz.at",
     url="https://github.com/tu-graz-library/invenio-theme-tugraz",
     packages=packages,