From 15ff93aa2209f10c3577997b89ac8ebec2fb429a Mon Sep 17 00:00:00 2001 From: mb-wali <44528277+mb-wali@users.noreply.github.com> Date: Fri, 1 May 2020 19:35:42 +0200 Subject: [PATCH] Dev (#3) * isort * manifest updated * manifest updated * tests * tests modify --- MANIFEST.in | 21 +++++++++++++++++++ .../assets/js/invenio_tugraz_theme/tugraz.js | 0 invenio_theme_tugraz/config.py | 14 ++++++------- invenio_theme_tugraz/webpack.py | 5 ++--- setup.py | 1 + 5 files changed, 31 insertions(+), 10 deletions(-) delete mode 100644 invenio_theme_tugraz/assets/js/invenio_tugraz_theme/tugraz.js diff --git a/MANIFEST.in b/MANIFEST.in index 077f4d1..f22e827 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -19,3 +19,24 @@ include .editorconfig include .tx/config prune docs/_build recursive-include invenio_theme_tugraz/translations *.po *.pot *.mo + +# added by check_manifest.py +include *.md +include *.rst +include *.sh +include *.txt +include *.rst +include LICENSE +include babel.ini +include pytest.ini +recursive-include docs *.bat +recursive-include docs *.py +recursive-include docs *.rst +recursive-include docs *.txt +recursive-include docs Makefile +recursive-include invenio_theme_tugraz *.html +recursive-include invenio_theme_tugraz *.js +recursive-include invenio_theme_tugraz *.png +recursive-include invenio_theme_tugraz *.scss +recursive-include invenio_theme_tugraz *.svg +recursive-include tests *.py diff --git a/invenio_theme_tugraz/assets/js/invenio_tugraz_theme/tugraz.js b/invenio_theme_tugraz/assets/js/invenio_tugraz_theme/tugraz.js deleted file mode 100644 index e69de29..0000000 diff --git a/invenio_theme_tugraz/config.py b/invenio_theme_tugraz/config.py index fef5936..cea9dc6 100644 --- a/invenio_theme_tugraz/config.py +++ b/invenio_theme_tugraz/config.py @@ -19,7 +19,7 @@ INVENIO_THEME_TUGRAZ_BASE_TEMPLATE = 'invenio_theme_tugraz/base.html' # Theme Logo -THEME_LOGO="images/tug_logo.png" +THEME_LOGO = 'images/tug_logo.png' # Instance's theme entrypoint file. Path relative to the ``assets/`` folder. INSTANCE_THEME_FILE = './scss/invenio_tugraz_theme/theme.scss' @@ -37,16 +37,16 @@ THEME_FRONTPAGE_TEMPLATE = 'invenio_theme_tugraz/frontpage.html' SECURITY_LOGIN_USER_TEMPLATE = 'invenio_theme_tugraz/accounts/login.html' # uncomment this to use the login with Tugraz @ login.html -#SHIBBOLETH_ISACTIVE = 'False' +SHIBBOLETH_ISACTIVE = 'False' # icon used in login page -TUG_ICON = "images/icon_use.png" +TUG_ICON = 'images/icon_use.png' # Frontpage title THEME_FRONTPAGE_TITLE = "RDM for TUGRAZ" # Mail server -#MAIL_SERVER='129.27.11.182' -#SECURITY_EMAIL_SENDER = "info@invenio-test.tugraz.at" -#SECURITY_EMAIL_SUBJECT_REGISTER = "Welcome to RDM!" -#MAIL_SUPPRESS_SEND = False +MAIL_SERVER = '129.27.11.182' +SECURITY_EMAIL_SENDER = 'info@invenio-rdm.tugraz.at' +SECURITY_EMAIL_SUBJECT_REGISTER = 'Welcome to RDM!' +MAIL_SUPPRESS_SEND = False diff --git a/invenio_theme_tugraz/webpack.py b/invenio_theme_tugraz/webpack.py index 6d00598..7dd6de4 100644 --- a/invenio_theme_tugraz/webpack.py +++ b/invenio_theme_tugraz/webpack.py @@ -2,13 +2,13 @@ # # Copyright (C) 2020 TUGRAZ. # -# 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. +# invenio-theme-tugraz is free software. """JS/CSS Webpack bundles for theme.""" from flask_webpackext import WebpackBundle + def theme(): """Returns module's webpack bundle. @@ -20,7 +20,6 @@ def theme(): 'assets', entry={ # TODO: - #'invenio-theme-tugraz-js': './js/invenio_tugraz_theme/tugraz.js', }, dependencies={ 'jquery': '3.1.0' diff --git a/setup.py b/setup.py index d6c659d..5d421a1 100644 --- a/setup.py +++ b/setup.py @@ -43,6 +43,7 @@ setup_requires = [ install_requires = [ 'Flask-BabelEx>=0.9.4', + 'Flask-WebpackExt>=1.0.0', ] packages = find_packages()