From a9c22142462df53d0a2db0465f57715f1154253a Mon Sep 17 00:00:00 2001 From: "nozomu.akaike" Date: Tue, 21 Jan 2025 19:53:16 +0900 Subject: [PATCH 01/68] =?UTF-8?q?=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E5=89=8D=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/css/weko_accounts/wayf_custom.css | 22 +- .../templates/weko_accounts/login_user.html | 330 ++++++++++++++++-- 2 files changed, 330 insertions(+), 22 deletions(-) diff --git a/modules/weko-accounts/weko_accounts/static/css/weko_accounts/wayf_custom.css b/modules/weko-accounts/weko_accounts/static/css/weko_accounts/wayf_custom.css index 48c1a978ae..4b6e731e1c 100644 --- a/modules/weko-accounts/weko_accounts/static/css/weko_accounts/wayf_custom.css +++ b/modules/weko-accounts/weko_accounts/static/css/weko_accounts/wayf_custom.css @@ -187,4 +187,24 @@ label#wayf_remember_checkbox_label { input[type="radio"] { margin: 0 4px; -} \ No newline at end of file +} + +.text-divider { + display: flex; + align-items: center; + margin-bottom: 4rem; +} +.text-divider::before, +.text-divider::after { + content: ''; + height: 1px; + background-color: #a3a3a3; + flex-grow: 1; +} +.text-divider::before { + margin-right: 1rem; +} +.text-divider::after { + margin-left: 1rem; +} + diff --git a/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html b/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html index 7119c6163e..03d68c1ea4 100644 --- a/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html +++ b/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html @@ -26,10 +26,16 @@ {% from "invenio_accounts/_macros.html" import render_field, form_errors %} + {%- block css %} + {{ super() }} + {% assets "weko_accounts_css" %} + {% endassets %} + {%- endblock css %} {% block panel %} +
-
+
{%- block form_header %} {%- set site_info = site_info|get_site_info %} {% if site_info.get("enable_notify") %} @@ -41,31 +47,313 @@

{{_(config.WEK

{{_('Log in to account') }}

{% endif %} {%- endblock form_header %} - {%- block form_outer %} + +
+ + +
+ + + + + + + + +
+ +
+
+ OR +
+ + {%- block form_outer %} {%- with form = login_user_form %}
- {{form.hidden_tag()}} - {{form_errors(form)}} - {{ render_field(form.email, icon="fa fa-user", autofocus=True, errormsg=False) }} - {{ render_field(form.password, icon="fa fa-lock", errormsg=False) }} - + {{form.hidden_tag()}} + {{form_errors(form)}} + {{ render_field(form.email, icon="fa fa-user", autofocus=True, errormsg=False) }} + {{ render_field(form.password, icon="fa fa-lock", errormsg=False) }} +
- {%- if config['WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED'] %} -
- - Shibboleth User -
- {%- endif %} {%- endwith %} {%- endblock form_outer %}
- {%- block registerable %} - {%- if security.registerable %} -
-

{% trans sitename=config.ACCOUNTS_SITENAME %}New to {{sitename}}?{% endtrans %} {{_('Sign Up')}}

-
- {%- endif %} - {%- endblock %} + + {%- block registerable %} + {%- if security.registerable %} +
+

{% trans sitename=config.ACCOUNTS_SITENAME %}New to {{sitename}}?{% endtrans %} {{_('Sign Up')}}

+
+ {%- endif %} + {%- endblock %}
{%- block recoverable %} {%- if security.recoverable %} @@ -74,4 +362,4 @@

{% trans sitename=config.ACCOUNTS_SITENAME %}New to {{sit {%- endblock %}

{% endblock panel %} -{%- endif %} + {%- endif %} From 0f8ff0c7c04ed8e567bf8239011812437dcf52f7 Mon Sep 17 00:00:00 2001 From: "nozomu.akaike" Date: Wed, 22 Jan 2025 10:48:13 +0900 Subject: [PATCH 02/68] =?UTF-8?q?=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E7=B5=90=E6=9E=9C=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/css/weko_accounts/wayf_custom.css | 5 ++++- .../weko_accounts/templates/weko_accounts/login_user.html | 8 +++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/weko-accounts/weko_accounts/static/css/weko_accounts/wayf_custom.css b/modules/weko-accounts/weko_accounts/static/css/weko_accounts/wayf_custom.css index 4b6e731e1c..d966e4e894 100644 --- a/modules/weko-accounts/weko_accounts/static/css/weko_accounts/wayf_custom.css +++ b/modules/weko-accounts/weko_accounts/static/css/weko_accounts/wayf_custom.css @@ -192,7 +192,10 @@ input[type="radio"] { .text-divider { display: flex; align-items: center; - margin-bottom: 4rem; + margin-top: 5rem; + margin-bottom: 5rem; + padding-left: 40px; + padding-right: 40px; } .text-divider::before, .text-divider::after { diff --git a/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html b/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html index 03d68c1ea4..d3c21f1ff7 100644 --- a/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html +++ b/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html @@ -18,7 +18,7 @@ # MA 02111-1307, USA. #} -{%- if config.WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED and config.WEKO_ACCOUNTS_SHIB_INST_LOGIN_DIRECTLY_ENABLED and config.WEKO_ACCOUNTS_SHIB_IDP_LOGIN_ENABLED %} +- if config.WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED and config.WEKO_ACCOUNTS_SHIB_INST_LOGIN_DIRECTLY_ENABLED and config.WEKO_ACCOUNTS_SHIB_IDP_LOGIN_ENABLED %} {%- set url_args = request.args.get('next', '/') | urlencode -%} {%- else %} @@ -48,6 +48,7 @@

{{_('Log in to account') }}

{% endif %} {%- endblock form_header %} + {%- if config['WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED'] %}
@@ -327,12 +328,10 @@

{{_('Log in to account') }}

-
- -
OR
+ {%- endif %} {%- block form_outer %} {%- with form = login_user_form %} @@ -346,7 +345,6 @@

{{_('Log in to account') }}

{%- endwith %} {%- endblock form_outer %}
- {%- block registerable %} {%- if security.registerable %}
From 0e9df26ffe7867d9a6166239f5839cf081341f9d Mon Sep 17 00:00:00 2001 From: "nozomu.akaike" Date: Thu, 23 Jan 2025 16:13:44 +0900 Subject: [PATCH 03/68] =?UTF-8?q?=E8=AA=A4=E8=A8=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weko_accounts/templates/weko_accounts/login_user.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html b/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html index d3c21f1ff7..5ae2666a90 100644 --- a/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html +++ b/modules/weko-accounts/weko_accounts/templates/weko_accounts/login_user.html @@ -18,7 +18,7 @@ # MA 02111-1307, USA. #} -- if config.WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED and config.WEKO_ACCOUNTS_SHIB_INST_LOGIN_DIRECTLY_ENABLED and config.WEKO_ACCOUNTS_SHIB_IDP_LOGIN_ENABLED %} +{%- if config.WEKO_ACCOUNTS_SHIB_LOGIN_ENABLED and config.WEKO_ACCOUNTS_SHIB_INST_LOGIN_DIRECTLY_ENABLED and config.WEKO_ACCOUNTS_SHIB_IDP_LOGIN_ENABLED %} {%- set url_args = request.args.get('next', '/') | urlencode -%} {%- else %} From 0735accc9a27926197a9e1a5db1b3f2c4e5613ce Mon Sep 17 00:00:00 2001 From: ivis-akagawa Date: Thu, 6 Feb 2025 10:33:01 +0900 Subject: [PATCH 04/68] =?UTF-8?q?=E3=82=B5=E3=83=96=E3=83=AA=E3=83=9D?= =?UTF-8?q?=E3=82=B8=E3=83=88=E3=83=AA=E8=A1=A8=E7=A4=BA=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=20=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invenio_communities/admin.py | 392 +++++++++++++++++- .../invenio_communities/config.py | 6 + .../invenio_communities/models.py | 59 ++- .../schemas/jsonschema.json | 1 + .../static/js/invenio_communities/app.js | 323 +++++++++++++++ .../invenio_communities/communities_list.js | 44 ++ .../scss/invenio_communities/extra_fields.css | 13 + .../invenio_communities/admin/edit.html | 123 +++++- .../communities_list_body.html | 21 +- .../invenio_communities/community_base.html | 2 +- .../templates/invenio_communities/curate.html | 2 +- .../templates/invenio_communities/macros.html | 24 +- .../templates/invenio_communities/search.html | 2 +- .../invenio_communities/utils.py | 31 ++ .../invenio_communities/views/ui.py | 3 +- .../js/weko_gridlayout/widget.design.js | 9 +- .../weko_gridlayout/pages/default_page.html | 2 +- .../translations/en/messages.json | 8 + .../translations/ja/messages.json | 8 +- .../weko_indextree_journal/models.py | 12 + .../schemas/jsonschema.json | 16 + .../schemas/schemaform.json | 18 + .../templates/weko_items_ui/export.html | 2 +- .../weko_items_ui/iframe/item_index.html | 2 +- .../weko-records-ui/weko_records_ui/config.py | 13 +- .../static/css/weko_records_ui/style.css | 17 + .../weko_records_ui/body_contents.html | 7 +- .../weko_records_ui/box/communities.html | 23 + .../templates/weko_records_ui/detail.html | 4 +- .../weko_records_ui/file_details.html | 4 +- .../weko-records-ui/weko_records_ui/views.py | 47 ++- modules/weko-records/weko_records/utils.py | 225 +++++++--- .../weko-search-ui/weko_search_ui/config.py | 6 + .../weko-search-ui/weko_search_ui/query.py | 5 +- modules/weko-search-ui/weko_search_ui/rest.py | 18 +- .../static/css/weko_search_ui/dot_leaders.css | 99 ++++- .../static/js/weko_search_ui/app.js | 11 +- .../templates/weko_search_ui/indexlist.html | 50 ++- .../templates/weko_search_ui/itemlist.html | 113 +++-- .../weko_search_ui/itemtablecontents.html | 243 ++++++++--- .../admin/item_management_display.html | 2 +- .../templates/weko_search_ui/search.html | 2 +- .../weko_theme/static/js/weko_theme/widget.js | 56 ++- .../admin/item_management_init.html | 2 +- .../templates/weko_theme/body_index.html | 46 +- .../templates/weko_theme/frontpage.html | 2 +- .../weko_theme/macros/footer-community.html | 4 +- .../weko_theme/macros/tabs_selector.html | 2 +- modules/weko-theme/weko_theme/utils.py | 10 +- modules/weko-workflow/weko_workflow/api.py | 29 +- .../weko_workflow/activity_detail.html | 2 +- .../weko_workflow/activity_list.html | 4 +- .../weko_workflow/item_login_success.html | 2 +- .../weko_workflow/workflow_list.html | 2 +- 54 files changed, 1852 insertions(+), 321 deletions(-) create mode 100644 modules/invenio-communities/invenio_communities/schemas/jsonschema.json create mode 100644 modules/invenio-communities/invenio_communities/static/js/invenio_communities/app.js create mode 100644 modules/invenio-communities/invenio_communities/static/js/invenio_communities/communities_list.js create mode 100644 modules/invenio-communities/invenio_communities/static/scss/invenio_communities/extra_fields.css create mode 100644 modules/weko-records-ui/weko_records_ui/templates/weko_records_ui/box/communities.html diff --git a/modules/invenio-communities/invenio_communities/admin.py b/modules/invenio-communities/invenio_communities/admin.py index 13f3b282f4..6bd7af8a2b 100644 --- a/modules/invenio-communities/invenio_communities/admin.py +++ b/modules/invenio-communities/invenio_communities/admin.py @@ -25,18 +25,27 @@ from __future__ import absolute_import, print_function +import os +import json import re +import sys +from flask import request, abort, jsonify, redirect, url_for, flash from flask.globals import current_app from flask_admin.contrib.sqla import ModelView +from flask_admin import expose from flask_login import current_user from invenio_db import db from sqlalchemy import func, or_ from weko_index_tree.models import Index from wtforms.validators import ValidationError +from wtforms import FileField, RadioField +from wtforms.utils import unset_value +from invenio_i18n.ext import current_i18n +from weko_gridlayout.services import WidgetDesignPageServices from .models import Community, FeaturedCommunity, InclusionRequest -from .utils import get_user_role_ids +from .utils import get_user_role_ids, delete_empty def _(x): @@ -53,7 +62,7 @@ class CommunityModelView(ModelView): can_view_details = True column_display_all_relations = True form_columns = ('id', 'owner', 'index', 'title', 'description', 'page', - 'curation_policy', 'ranking', 'fixed_points') + 'curation_policy', 'ranking', 'fixed_points', 'thumbnail','login_menu_enabled') column_list = ( 'id', @@ -69,6 +78,379 @@ class CommunityModelView(ModelView): column_searchable_list = ('id', 'title', 'description') edit_template = "invenio_communities/admin/edit.html" + @expose('/new/', methods=['GET', 'POST']) + def create_view(self): + + def validate_input_id(id): + the_patterns = { + "ASCII_LETTER_PATTERN": "[a-zA-Z0-9_-]+$", + "FIRST_LETTER_PATTERN1": "^[a-zA-Z_-].*", + "FIRST_LETTER_PATTERN2": "^[-]+[0-9]+", + } + the_result = { + "ASCII_LETTER_PATTERN": "Don't use space or special " + "character except `-` and `_`.", + "FIRST_LETTER_PATTERN1": 'The first character cannot ' + 'be a number or special character. ' + 'It should be an ' + 'alphabet character, "-" or "_"', + "FIRST_LETTER_PATTERN2": "Cannot set negative number to ID.", + } + + m = re.match(the_patterns['FIRST_LETTER_PATTERN1'], id) + if m is None: + raise ValidationError(the_result['FIRST_LETTER_PATTERN1']) + m = re.match(the_patterns['FIRST_LETTER_PATTERN2'], id) + if m is not None: + raise ValidationError(the_result['FIRST_LETTER_PATTERN2']) + m = re.match(the_patterns['ASCII_LETTER_PATTERN'], id) + if m is None: + raise ValidationError(the_result['ASCII_LETTER_PATTERN']) + + form = self.create_form() + + if(request.method == 'POST'): + try: + pageaddFlag = True + form_data = request.form.to_dict() + model = Community() + validate_input_id(form_data['id']) + model.id = form_data['id'] + model.id_role = form_data['owner'] + model.root_node_id = form_data['index'] + model.title = form_data['title'] + model.description = form_data['description'] + model.page = form_data['page'] + model.curation_policy = form_data['curation_policy'] + model.ranking = form_data['ranking'] + model.fixed_points = form_data['fixed_points'] + if form_data['login_menu_enabled'] == 'True': + model.login_menu_enabled = True + else: + model.login_menu_enabled = False + the_result = { + "FILE_PATTERN": "Thumbnail file only 'jpeg', 'jpg', 'png', 'gif' format.", + } + fp = request.files.get('thumbnail') + if '' != fp.filename: + directory = os.path.join( + current_app.instance_path, + current_app.config['WEKO_THEME_INSTANCE_DATA_DIR'], + 'c') + if not os.path.exists(directory): + os.makedirs(directory) + + ext = os.path.splitext(fp.filename)[1].lower() + allowed_extensions = {'.png', '.jpg', '.jpeg', '.gif'} + if ext not in allowed_extensions: + raise ValidationError(the_result['FILE_PATTERN']) + filename = os.path.join( + directory, + model.id + '_' + fp.filename) + file_uri = '/data/' + 'c/' + model.id + '_' + fp.filename + fp.save(filename) + model.thumbnail_path = file_uri + + catalog_json = json.loads(form_data['catalog_data']) + flg, result_json = delete_empty(catalog_json['metainfo']) + if flg: + model.catalog_json = result_json['parentkey'] + else: + model.catalog_json = None + model.id_user = current_user.get_id() + + comm = Community.create( + id=model.id, + id_role=model.id_role, + id_user=model.id_user, + root_node_id=model.root_node_id, + title=model.title, + description=model.description, + page=model.page, + curation_policy=model.curation_policy, + ranking=model.ranking, + fixed_points=model.fixed_points, + login_menu_enabled=model.login_menu_enabled, + thumbnail_path=model.thumbnail_path, + catalog_json=model.catalog_json, + ) + db.session.commit() + data = [ + { + "is_edit": False, + "page_id": 0, + "repository_id": model.id, + "title": "About", + "url": "/c/" + model.id + "/about", + "content": "", + "settings": "", + "multi_lang_data": {"en": "About"}, + "is_main_layout": False, + }, + { + "is_edit": False, + "page_id": 0, + "repository_id": model.id, + "title": "Editorial board", + "url": "/c/" + model.id + "/eb", + "content": "", + "settings": "", + "multi_lang_data": {"en": "Editorial board"}, + "is_main_layout": False, + }, + { + "is_edit": False, + "page_id": 0, + "repository_id": model.id, + "title": "OA Policy", + "url": "/c/" + model.id + "/oapolicy", + "content": "", + "settings": "", + "multi_lang_data": {"en": "OA Policy"}, + "is_main_layout": False, + } + ] + for page in data: + addPageResult = WidgetDesignPageServices.add_or_update_page(page) + if addPageResult['result'] == False: + print(page['url'] + "のページの追加に失敗しました。") + pageaddFlag = False + + if pageaddFlag == False: + return redirect(url_for('.index_view', pageaddFlag=pageaddFlag)) + else: + return redirect(url_for('.index_view')) + except Exception as e: + db.session.rollback() + return jsonify({"error": str(e)}), 400 + + else: + form.login_menu_enabled.data = 'False' + + return self.render( + "invenio_communities/admin/edit.html", + form=form, + jsonschema="/admin/community/jsonschema", + schemaform="/admin/community/schemaform", + pid=None, + record=None, + type = 'create', + + return_url=request.args.get('url'), + c_id=id, + ) + + @expose('/edit//', methods=['GET', 'POST']) + def edit_view(self, id): + model = self.get_one(id) + form=super(CommunityModelView, self).edit_form(id) + if model: + form.id.data = model.id or '' + form.title.data = model.title or '' + form.owner.data = model.owner or '' + form.index.data = model.index or '' + form.description.data = model.description or '' + form.page.data = model.page or '' + form.curation_policy.data = model.curation_policy or '' + form.ranking.data = model.ranking or '0' + form.fixed_points.data = model.fixed_points or '0' + if model.login_menu_enabled: + form.login_menu_enabled.data = 'True' + else: + form.login_menu_enabled.data = 'False' + + if(request.method == 'POST'): + form_data = request.form.to_dict() + try: + model.id_role = form_data['owner'] + model.root_node_id = form_data['index'] + model.title = form_data['title'] + model.description = form_data['description'] + model.page = form_data['page'] + model.curation_policy = form_data['curation_policy'] + model.ranking = form_data['ranking'] + model.fixed_points = form_data['fixed_points'] + if form_data['login_menu_enabled'] == 'True': + model.login_menu_enabled = True + else: + model.login_menu_enabled = False + the_result = { + "FILE_PATTERN": "Thumbnail file only 'jpeg', 'jpg', 'png', 'gif' format.", + } + fp = request.files.get('thumbnail') + if '' != fp.filename: + directory = os.path.join( + current_app.instance_path, + current_app.config['WEKO_THEME_INSTANCE_DATA_DIR'], + 'c') + if not os.path.exists(directory): + os.makedirs(directory) + + ext = os.path.splitext(fp.filename)[1].lower() + allowed_extensions = {'.png', '.jpg', '.jpeg', '.gif'} + if ext not in allowed_extensions: + raise ValidationError(the_result['FILE_PATTERN']) + filename = os.path.join( + directory, + model.id + '_' + fp.filename) + file_uri = '/data/' + 'c/' + model.id + '_' + fp.filename + if model.thumbnail_path is not None: + currentfile = os.path.join( + current_app.instance_path, + current_app.config['WEKO_THEME_INSTANCE_DATA_DIR'], + 'c', + model.thumbnail_path[8:]) + if os.path.exists(currentfile): + try: + os.remove(currentfile) + print(f"{currentfile} を削除しました。") + except Exception as e: + print(f"ファイルの削除中にエラーが発生しました: {e}") + else: + print(f"{currentfile} は存在しません。") + fp.save(filename) + model.thumbnail_path = file_uri + + catalog_json = json.loads(form_data['catalog_data']) + flg, result_json = delete_empty(catalog_json['metainfo']) + if flg: + model.catalog_json = result_json['parentkey'] + else: + model.catalog_json = None + + db.session.commit() + return redirect(url_for('.index_view')) + except Exception as e: + db.session.rollback() + return jsonify({"error": str(e)}), 400 + + else: + + record = {} + if model.catalog_json is not None: + record['parentkey'] = model.catalog_json + else: + record = None + return self.render( + "invenio_communities/admin/edit.html", + form=form, + jsonschema="/admin/community/jsonschema", + schemaform="/admin/community/schemaform", + pid=None, + record=record, + type = 'edit', + + return_url=request.args.get('url'), + c_id=id, + ) + + + @expose('/jsonschema', methods=['GET']) + def get_json_schema(self): + """Get json schema. + + :return: The json object. + """ + try: + json_schema = None + # cur_lang = current_i18n.language + + """Log error for output info of journal, level: ERROR, status code: 101, + content: Invalid setting file error""" + filepath = "schemas/jsonschema.json" + if (filepath + != filepath)\ + or (filepath + == "" + or (current_app.config[ + 'WEKO_INDEXTREE_JOURNAL_SCHEMA_JSON_FILE' + ] is None)): + current_app.logger.error( + '[{0}] Invalid setting file error'.format(101) + ) + + schema_file = os.path.join( + os.path.dirname(__file__), + filepath) + + json_schema = json.load(open(schema_file)) + if json_schema == {}: + return '{}' + + result = db.session.execute("SELECT schema FROM item_type_property WHERE id = 1057;").fetchone() + catalogschema = result[0] + tempschema = catalogschema["properties"] + keys_to_keep = [ 'catalog_contributors', 'catalog_identifiers', 'catalog_subjects', 'catalog_licenses', 'catalog_rights', 'catalog_access_rights'] + keys_to_remove = [k for k in tempschema.keys() if k not in keys_to_keep] + for key in keys_to_remove: + tempschema.pop(key) + + json_schema["properties"]["parentkey"]["items"]["properties"] = tempschema + + except BaseException: + current_app.logger.error( + "Unexpected error: {}".format(sys.exc_info())) + abort(500) + return jsonify(json_schema) + + @expose('/schemaform', methods=['GET']) + def get_schema_form(self): + """Get schema form. + + :return: The json object. + """ + try: + schema_form = None + cur_lang = current_i18n.language + + """Log error for output info of journal, level: ERROR, status code: 101, + content: Invalid setting file error.""" + + result = db.session.execute("SELECT forms FROM item_type_property WHERE id = 1057;").fetchone() + temp_schema_form = [result[0]] + + schema_form = temp_schema_form + + i = 1 + for elem in schema_form: + if 'title_i18n' in elem: + if cur_lang in elem['title_i18n']: + if len(elem['title_i18n'][cur_lang]) > 0: + elem['title'] = elem['title_i18n'][cur_lang] + if 'items' in elem: + for sub_elem in elem['items'][:]: + if sub_elem['key'] in ['parentkey[].catalog_contributors', 'parentkey[].catalog_identifiers', 'parentkey[].catalog_subjects', 'parentkey[].catalog_licenses', 'parentkey[].catalog_rights', 'parentkey[].catalog_access_rights']: + if 'title_i18n' in sub_elem: + if cur_lang in sub_elem['title_i18n']: + if len(sub_elem['title_i18n'] + [cur_lang]) > 0: + sub_elem['title'] = sub_elem['title_i18n'][ + cur_lang] + if 'items' in sub_elem: + for sub_sub_elem in sub_elem['items'][:]: + if 'title_i18n' in sub_sub_elem: + if cur_lang in sub_sub_elem['title_i18n']: + if len(sub_sub_elem['title_i18n'] + [cur_lang]) > 0: + sub_sub_elem['title'] = sub_sub_elem['title_i18n'][ + cur_lang] + if 'items' in sub_sub_elem: + for sub_sub_sub_elem in sub_sub_elem['items'][:]: + if 'title_i18n' in sub_sub_sub_elem: + if cur_lang in sub_sub_sub_elem['title_i18n']: + if len(sub_sub_sub_elem['title_i18n'] + [cur_lang]) > 0: + sub_sub_sub_elem['title'] = sub_sub_sub_elem['title_i18n'][ + cur_lang] + else: + elem['items'].remove(sub_elem) + + except BaseException: + current_app.logger.error( + "Unexpected error: {}".format(sys.exc_info())) + abort(500) + return jsonify(schema_form) + def on_model_change(self, form, model, is_created): """Perform some actions before a model is created or updated. @@ -115,7 +497,11 @@ def _validate_input_id(self, field): form_args = { 'id': { 'validators': [_validate_input_id] - } + }, + } + form_extra_fields = { + 'thumbnail': FileField(), + 'login_menu_enabled': RadioField('login_menu_enabled', choices=[('False', 'Disabled'), ('True', 'Enabled')] ), } form_widget_args = { diff --git a/modules/invenio-communities/invenio_communities/config.py b/modules/invenio-communities/invenio_communities/config.py index 62a9ebcde9..400a00f426 100644 --- a/modules/invenio-communities/invenio_communities/config.py +++ b/modules/invenio-communities/invenio_communities/config.py @@ -164,3 +164,9 @@ COMMUNITIES_LIMITED_ROLE_ACCESS_PERMIT = 2 """Allowed Role's id higher than this number full access to list Indexes.""" + +COMMUNITIES_LIST_THUMBNAIL_WIDTH = 256 +"""community thumbnail width in community list.""" + +COMMUNITIES_LIST_THUMBNAIL_HEIGHT = 256 +"""community thumbnail height in community list.""" diff --git a/modules/invenio-communities/invenio_communities/models.py b/modules/invenio-communities/invenio_communities/models.py index c3dd98e55e..906dbe14ec 100644 --- a/modules/invenio-communities/invenio_communities/models.py +++ b/modules/invenio-communities/invenio_communities/models.py @@ -45,7 +45,9 @@ InclusionRequestObsoleteError from .signals import inclusion_request_created from .utils import save_and_validate_logo - +from sqlalchemy.dialects import postgresql +from sqlalchemy_utils.types import JSONType +from sqlalchemy import cast, String class InclusionRequest(db.Model, Timestamp): """Association table for Community and Record models. @@ -221,6 +223,28 @@ class Community(db.Model, Timestamp): deleted_at = db.Column(db.DateTime, nullable=True, default=None) """Time at which the community was soft-deleted.""" + thumbnail_path = db.Column(db.Text, nullable=True, default='') + """thumbnail_path.""" + + login_menu_enabled = db.Column(db.Boolean, nullable=False, default='false') + """login_menu enabled or Disabled.""" + + catalog_json = db.Column( + db.JSON().with_variant( + postgresql.JSONB(none_as_null=True), + 'postgresql', + ).with_variant( + JSONType(), + 'sqlite', + ).with_variant( + JSONType(), + 'mysql', + ), + default=[], + nullable=True + ) + """catalog.""" + # root_node_id = db.Column(db.Text, nullable=False, default='') root_node_id = db.Column( @@ -266,6 +290,29 @@ def create(cls, community_id, role_id, root_node_id, **data): db.session.add(obj) return obj + @classmethod + def create(cls, id, id_role, id_user, root_node_id, title, description, page, curation_policy, ranking, fixed_points, login_menu_enabled, thumbnail_path, catalog_json, **data): + """Get a community.""" + with db.session.begin_nested(): + obj = cls( + id=id, + id_role=id_role, + id_user=id_user, + root_node_id=root_node_id, + title=title, + description=description, + page=page, + curation_policy=curation_policy, + ranking=ranking, + fixed_points=fixed_points, + login_menu_enabled=login_menu_enabled, + thumbnail_path=thumbnail_path, + catalog_json=catalog_json, + **data + ) + db.session.add(obj) + return obj + def save_logo(self, stream, filename): """Get a community.""" logo_ext = save_and_validate_logo(stream, filename, self.id) @@ -293,6 +340,15 @@ def get_by_user(cls, role_ids, with_deleted=False): return query.order_by(db.asc(Community.title)) + @classmethod + def get_by_root_node_id(cls, root_node_id, with_deleted=False): + """Get communities by root_node_id.""" + q = cls.query.filter_by(root_node_id=root_node_id) + if not with_deleted: + q = q.filter(cls.deleted_at.is_(None)) + + return q.order_by(db.asc(Community.title)).all() + @classmethod def filter_communities(cls, p, so, with_deleted=False): """Search for communities. @@ -314,6 +370,7 @@ def filter_communities(cls, p, so, with_deleted=False): cls.id.ilike('%' + p + '%'), cls.title.ilike('%' + p + '%'), cls.description.ilike('%' + p + '%'), + cast(cls.catalog_json, String).ilike('%' + p + '%'), )) if so in current_app.config['COMMUNITIES_SORTING_OPTIONS']: diff --git a/modules/invenio-communities/invenio_communities/schemas/jsonschema.json b/modules/invenio-communities/invenio_communities/schemas/jsonschema.json new file mode 100644 index 0000000000..22bd3dd199 --- /dev/null +++ b/modules/invenio-communities/invenio_communities/schemas/jsonschema.json @@ -0,0 +1 @@ +{"type": "object", "$schema": "http://json-schema.org/draft-04/schema#", "description": "", "required": ["pubdate"], "properties": { "parentkey": {"type": "array", "title": "カタログ", "maxItems": 9999, "minItems": 1, "items": {"type": "object", "properties": {} }}}} diff --git a/modules/invenio-communities/invenio_communities/static/js/invenio_communities/app.js b/modules/invenio-communities/invenio_communities/static/js/invenio_communities/app.js new file mode 100644 index 0000000000..95115060bd --- /dev/null +++ b/modules/invenio-communities/invenio_communities/static/js/invenio_communities/app.js @@ -0,0 +1,323 @@ +(function (angular) { + // Bootstrap it! + angular.element(document).ready(function() { + angular.module('wekoRecords.controllers', []); + + function WekoRecordsCtrl($scope, $rootScope, $modal, InvenioRecordsAPI){ + $rootScope.$on('invenio.records.loading.stop', function (ev) { + setTimeout(function () { + let model = $rootScope.recordsVM.invenioRecordsModel; + CustomBSDatePicker.setDataFromFieldToModel(model, true); + }, 1000); + }); + $scope.saveData = function(){ + + const form1Data = new FormData(document.getElementsByClassName('admin-form form-horizontal')[0]); + + var metainfo = { 'metainfo': $rootScope.recordsVM.invenioRecordsModel }; + form2Data = new FormData(); + form2Data.append('catalog_data', JSON.stringify(metainfo)); + + for (const [key, value] of form2Data) { + form1Data.append(key, value); + } + + fetch('', { + method: 'POST', + body: form1Data, + }).then(response => { + if (response.ok) { + const url = new URL(response.url); + let params = url.searchParams; + if (params.get('pageaddFlag') == 'False') { + alert('The community was successfully saved, but there are additional pages that failed to be created.'); + window.location.href = url.pathname; + } + else { + alert('Successfully saved.'); + window.location.href = response.url; + } + } else { + return response.json().then(err => { throw new Error(err.error); }); + } + }).catch(error => { + alert("An error has occurred. : " + error.message); // エラーメッセージを表示 + }); + } + } + + // Inject depedencies + WekoRecordsCtrl.$inject = [ + '$scope', + '$rootScope', + '$modal', + 'InvenioRecordsAPI', + ]; + angular.module('wekoRecords.controllers') + .controller('WekoRecordsCtrl', WekoRecordsCtrl); + + var ModalInstanceCtrl = function($scope, $modalInstance, items) { + $scope.items = items; + $scope.searchKey = ''; + $scope.selected = { + item : $scope.items[0] + }; + $scope.ok = function() { + $modalInstance.close($scope.selected); + }; + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + $scope.search = function() { + $scope.items.push($scope.searchKey); + } + }; + + angular.module('wekoRecords', [ + 'invenioRecords', + 'wekoRecords.controllers', + ]); + + angular.bootstrap( + document.getElementById('weko-records'), [ + 'wekoRecords', 'invenioRecords', 'schemaForm', 'mgcrea.ngStrap', + 'mgcrea.ngStrap.modal', 'pascalprecht.translate', 'ui.sortable', + 'ui.select', 'mgcrea.ngStrap.select', 'mgcrea.ngStrap.datepicker', + 'mgcrea.ngStrap.helpers.dateParser', 'mgcrea.ngStrap.tooltip', + 'invenioFiles' + ] + ); +}); +})(angular); + + +/** + * Custom bs-datepicker. + * Default bs-datepicker: just support one pattern for input. + * Custom bs-datepicker: support validate three pattern. + * Used way: + * templateUrl: /static/templates/weko_deposit/datepicker_multi_format.html + * customFormat: enter your pattern. + * if it none, pattern are yyyy-MM-dd, yyyy-MM, yyyy. +*/ +var Pattern = { + yyyy: '\\d{4}', + MM: '(((0)[1-9])|((1)[0-2]))', + dd: '([0-2][0-9]|(3)[0-1])', + sep: '(-)' +} +var Format = { + yyyyMMdd: '^(' + Pattern.yyyy + Pattern.sep + + Pattern.MM + Pattern.sep + Pattern.dd + ')$', + yyyyMM: '^(' + Pattern.yyyy + Pattern.sep + Pattern.MM + ')$', + yyyy: '^(' + Pattern.yyyy + ')$', +} +var CustomBSDatePicker = { + option: { + element: undefined, + defaultFormat: Format.yyyyMMdd + '|' + Format.yyyyMM + '|' + Format.yyyy, + cls: 'multi_date_format' + }, + /** + * Clear validate status for this element. + */ + init: function () { + let $element = $(CustomBSDatePicker.option.element); + let $this_parent = $element.parent().parent(); + $element.removeClass('ng-invalid ng-invalid-date ng-invalid-parse'); + $element.next().next().addClass('hide'); + $this_parent.removeClass('has-error'); + }, + /** + * Get format from defined user on form schema. + * If user don't defined, this pattern get default pattern. + * Default pattern: option.defaultFormat. + * @return {String} return pattern. + */ + getPattern: function () { + let def_pattern = CustomBSDatePicker.option.defaultFormat; + let $element = $(CustomBSDatePicker.option.element); + let pattern = $element.data('custom-format'); + return (pattern.length == 0) ? def_pattern : pattern; + }, + /** + * Check data input valid with defined pattern. + * @return {Boolean} return true if value matched + */ + isMatchRegex: function () { + let $element = $(CustomBSDatePicker.option.element); + let val = $element.val(); + let pattern = CustomBSDatePicker.getPattern(); + let reg = new RegExp(pattern); + return reg.test(val); + }, + /** + * Check input required. + * @return {Boolean} return true if input required + */ + isRequired: function () { + let $lement = $(CustomBSDatePicker.option.element); + let $this_parent = $lement.parent().parent(); + let label = $this_parent.find('label'); + return label.hasClass('field-required'); + }, + /** + * Get the number of days in any particular month + * @param {number} m The month (valid: 0-11) + * @param {number} y The year + * @return {number} The number of days in the month + */ + daysInMonth: function (m, y) { + switch (m) { + case 1: + return (y % 4 == 0 && y % 100) || y % 400 == 0 ? 29 : 28; + case 8: case 3: case 5: case 10: + return 30; + default: + return 31 + } + }, + /** + * Check if a date is valid + * @param {number} d The day + * @param {number} m The month + * @param {number} y The year + * @return {Boolean} Returns true if valid + */ + isValidDate: function (d, m, y) { + let month = parseInt(m, 10) - 1; + let checkMonth = month >= 0 && month < 12; + let checkDay = d > 0 && d <= CustomBSDatePicker.daysInMonth(month, y); + return checkMonth && checkDay; + }, + /** + * Check all validate for this. + * All validation valid => return true. + * @return {Boolean} Returns true if valid + */ + isValidate: function () { + let $element = $(CustomBSDatePicker.option.element); + let val = $element.val(); + if (val.length == 0) { + //Required input invalid. + if (CustomBSDatePicker.isRequired()) return false; + } else { + //Data input is not match with defined pattern. + if (!CustomBSDatePicker.isMatchRegex()) return false; + //Check day by month and year. + let arr = val.split('-'); + if (arr.length == 3 && !CustomBSDatePicker.isValidDate(arr[2], arr[1], arr[0])) return false; + } + return true; + }, + /** + * Check validate and apply css for this field. + */ + validate: function () { + let $element = $(CustomBSDatePicker.option.element); + let $this_parent = $element.parent().parent(); + if (!CustomBSDatePicker.isValidate()) { + $element.next().next().removeClass('hide'); + $this_parent.addClass('has-error'); + $element.addClass('ng-invalid'); + } else { + $element.removeClass('ng-invalid'); + $this_parent.removeClass('has-error'); + } + }, + /** + * This is mean function in order to validate. + * @param {[type]} element date field + */ + process: function (element) { + CustomBSDatePicker.option.element = element; + CustomBSDatePicker.init(); + CustomBSDatePicker.validate(); + }, + /** + * Init attribute of model object if them undefine. + * @param {[object]} model + * @param {[object]} element is date input control. + */ + initAttributeForModel: function (model, element) { + if($(element).val().length == 0) return; + let ng_model = $(element).attr('ng-model').replace(/']/g, ''); + let arr = ng_model.split("['"); + //Init attribute of model object if them undefine. + let str_code = ''; + $.each(arr, function (ind_01, val_02) { + str_code += (ind_01 == 0) ? val_02 : "['" + val_02 + "']"; + let chk_str_code = ''; + if (ind_01 != arr.length - 1) { + chk_str_code = "if(!" + str_code + ") " + str_code + "={};"; + } + eval(chk_str_code); + }); + }, + /** + * Excute this function before 'Save' and 'Next' processing + * Get data from fields in order to fill to model. + * @param {[object]} model + * @param {[Boolean]} reverse + */ + setDataFromFieldToModel: function (model, reverse) { + let cls = CustomBSDatePicker.option.cls; + let element_arr = $('.' + cls); + $.each(element_arr, function (ind, val) { + CustomBSDatePicker.initAttributeForModel(model, val); + if (reverse) { + //Fill data from model to fields + str_code = "$(val).val(" + $(val).attr('ng-model') + ")"; + try { + eval(str_code); + } catch (e) { + // If the date on model is undefined, we can safetly ignore it. + if (!e instanceof TypeError) { + throw e; + } + } + } else { + //Fill data from fields to model + str_code = 'if ($(val).val().length != 0) {' + $(val).attr('ng-model') + '=$(val).val()}'; + eval(str_code); + } + }); + }, + /** + * Get date fields name which invalid. + * @return {array} Returns name list. + */ + getInvalidFieldNameList: function () { + let cls = CustomBSDatePicker.option.cls; + let element_arr = $('.' + cls); + let result = []; + $.each(element_arr, function (ind, val) { + let $element = $(val); + let $parent = $element.parent().parent(); + if ($parent.hasClass('has-error')) { + let name = $element.attr('name'); + let label = $("label[for=" + name + "]").text().trim(); + result.push(label); + } + }); + return result; + }, + /** + * If input empty, this attribute delete. + * Fix bug: not enter data for date field. + */ + removeLastAttr: function(model){ + let cls = CustomBSDatePicker.option.cls; + let element_arr = $('.' + cls); + $.each(element_arr, function (ind, val) { + if($(val).val().length > 0){ + CustomBSDatePicker.initAttributeForModel(model, val); + let ng_model = $(val).attr('ng-model'); + let last_index = ng_model.lastIndexOf('['); + let previous_attr = ng_model.substring(0, last_index); + let str_code = "if("+ng_model+"==''){"+previous_attr+"={}}"; + eval(str_code); + } + }); + } +} diff --git a/modules/invenio-communities/invenio_communities/static/js/invenio_communities/communities_list.js b/modules/invenio-communities/invenio_communities/static/js/invenio_communities/communities_list.js new file mode 100644 index 0000000000..c9c7e28a1b --- /dev/null +++ b/modules/invenio-communities/invenio_communities/static/js/invenio_communities/communities_list.js @@ -0,0 +1,44 @@ +function printCatalogInfo(data) { + if (data == "None" || data == "[]") { + console.log("data is null"); + return; + } + console.log(data); + + string_contributors = "" + string_subjects = "" + const cleanedString = data.replaceAll("'", "\""); + jsonString = "\{\"catalog\":" + cleanedString + "\}"; + const json = JSON.parse(jsonString); + + console.log(json.catalog); + json.catalog.forEach(item => { + if ("catalog_subjects" in item) { + item.catalog_subjects.forEach(subject => { + string_subjects = subject.catalog_subject + ", "; + string_subjects += subject.catalog_subject_uri + ", "; + string_subjects += subject.catalog_subject_scheme + ", "; + string_subjects += subject.catalog_subject_language; + }); + document.write("

" + string_subjects + "

"); + } + if ("catalog_contributors" in item) { + item.catalog_contributors.forEach(contributor => { + if ("contributor_type" in contributor) { + string_contributors = contributor.contributor_type; + } + if ("contributor_names" in contributor) { + contributor.contributor_names.forEach(name => { + if ("contributor_name" in name) { + string_contributors += ", " + name.contributor_name; + } + if ("contributor_name_language" in name) { + string_contributors += ", " + name.contributor_name_language; + } + }); + } + document.write("

" + string_contributors + "

"); + }); + } + }); +} diff --git a/modules/invenio-communities/invenio_communities/static/scss/invenio_communities/extra_fields.css b/modules/invenio-communities/invenio_communities/static/scss/invenio_communities/extra_fields.css new file mode 100644 index 0000000000..4c48520aea --- /dev/null +++ b/modules/invenio-communities/invenio_communities/static/scss/invenio_communities/extra_fields.css @@ -0,0 +1,13 @@ +#login_menu_enabled { + border: none; + box-shadow: none; + display: flex; + list-style: none; + padding: 5px 0 0 0; + gap: 20px; +} + +#thumbnail { + border: none; + box-shadow: none; +} diff --git a/modules/invenio-communities/invenio_communities/templates/invenio_communities/admin/edit.html b/modules/invenio-communities/invenio_communities/templates/invenio_communities/admin/edit.html index eff5dd9bb7..cdaee73d53 100644 --- a/modules/invenio-communities/invenio_communities/templates/invenio_communities/admin/edit.html +++ b/modules/invenio-communities/invenio_communities/templates/invenio_communities/admin/edit.html @@ -2,6 +2,19 @@ {% import 'admin/lib.html' as lib with context %} {% from 'admin/lib.html' import extra with context %} {# backward compatible #} +{%- block css %} + {% assets "invenio_deposit_css" %}{% endassets %} + {{ super() }} + +{%- endblock css %} + +{%- block javascript %} + {% assets "invenio_deposit_dependencies_js" %}{% endassets %} + {{ super() }} + {% assets "invenio_deposit_js" %}{% endassets %} + +{%- endblock javascript %} + {% block head %} {{ super() }} {{ lib.form_css() }} @@ -13,33 +26,109 @@
  • {{ _gettext('List') }}
    • - {%- if admin_view.can_create -%} -
  • - {{ _gettext('Create') }} -
    • + {% if type == 'edit' %} + {%- if admin_view.can_create -%} +
  • + {{ _gettext('Create') }} +
    • + {%- endif -%} + {% else %} +
  • + {{ _gettext('Create') }} +
    • {%- endif -%} -
  • - {{ _gettext('Edit') }} -
    • - {%- if admin_view.can_view_details -%} -
  • - {{ _gettext('Details') }} -
    • + {% if type == 'edit' %} +
  • + {{ _gettext('Edit') }} +
    • + {%- if admin_view.can_view_details -%} +
  • + {{ _gettext('Details') }} +
    • + {%- endif -%} {%- endif -%} {% endblock %} {% block edit_form %} - {{ lib.render_form(form, return_url, extra(), form_opts) }} + {% call lib.form_tag(None) %} + {{ lib.render_form_fields([form.id]) }} + {{ lib.render_form_fields([form.owner]) }} + {{ lib.render_form_fields([form.index]) }} + {{ lib.render_form_fields([form.title]) }} + {{ lib.render_form_fields([form.description]) }} + {{ lib.render_form_fields([form.page]) }} + {{ lib.render_form_fields([form.curation_policy]) }} + {{ lib.render_form_fields([form.ranking]) }} + {{ lib.render_form_fields([form.fixed_points]) }} + {{ lib.render_form_fields([form.login_menu_enabled]) }} + {{ lib.render_form_fields([form.thumbnail]) }} + {% endcall %} +
    +
    + + + + + +
    + + + +
    +
    + + + {{ _('Cancel') }} + +
    +
    +
    +     +
    +
    {% endblock %} {% endblock %} {% block tail %} {{ super() }} {{ lib.form_js() }} - + {% if type == 'edit' %} + + {% else %} + + {% endif %} {% endblock %} diff --git a/modules/invenio-communities/invenio_communities/templates/invenio_communities/communities_list_body.html b/modules/invenio-communities/invenio_communities/templates/invenio_communities/communities_list_body.html index a31af4fe32..e4da1479c8 100644 --- a/modules/invenio-communities/invenio_communities/templates/invenio_communities/communities_list_body.html +++ b/modules/invenio-communities/invenio_communities/templates/invenio_communities/communities_list_body.html @@ -17,6 +17,9 @@ # Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307, USA. #} +{%- block javascript %} + +{%- endblock javascript %}
    @@ -85,11 +88,21 @@

    {{ featured_community.title }}

    {% if obj %}
    -

    - {{ obj.title }} -

    -
    +
    + {% if obj.thumbnail_path is not none and obj.thumbnail_path != "" %} + + {% endif %} +

    + {{ obj.title }} +

    +
    +

    {{ obj.description|striptags|truncate }}

    +
    {% endif %} diff --git a/modules/invenio-communities/invenio_communities/templates/invenio_communities/community_base.html b/modules/invenio-communities/invenio_communities/templates/invenio_communities/community_base.html index d2685786d5..e9f1b77fdf 100644 --- a/modules/invenio-communities/invenio_communities/templates/invenio_communities/community_base.html +++ b/modules/invenio-communities/invenio_communities/templates/invenio_communities/community_base.html @@ -23,7 +23,7 @@ {% extends config.SEARCH_UI_BASE_TEMPLATE %} -{%- from "invenio_communities/macros.html" import community_header, community_footer %} +{%- from "invenio_communities/macros.html" import community_header, community_footer with context %} {% set title = community.title + " | " + config.THEME_SITENAME %} diff --git a/modules/invenio-communities/invenio_communities/templates/invenio_communities/curate.html b/modules/invenio-communities/invenio_communities/templates/invenio_communities/curate.html index fd3f7b0e4d..5c6e109ea3 100644 --- a/modules/invenio-communities/invenio_communities/templates/invenio_communities/curate.html +++ b/modules/invenio-communities/invenio_communities/templates/invenio_communities/curate.html @@ -23,7 +23,7 @@ {% extends config.SEARCH_UI_SEARCH_TEMPLATE %} -{%- from "invenio_communities/macros.html" import community_header, community_footer %} +{%- from "invenio_communities/macros.html" import community_header, community_footer with context %} diff --git a/modules/invenio-communities/invenio_communities/templates/invenio_communities/macros.html b/modules/invenio-communities/invenio_communities/templates/invenio_communities/macros.html index c0d530b0a4..e4f0989661 100644 --- a/modules/invenio-communities/invenio_communities/templates/invenio_communities/macros.html +++ b/modules/invenio-communities/invenio_communities/templates/invenio_communities/macros.html @@ -21,18 +21,38 @@ # as an Intergovernmental Organization or submit itself to any jurisdiction. #} {% macro community_header(community, link=True, subtitle=None) %} +