Compare commits

..

11 Commits

Author SHA1 Message Date
Mojib Wali
2290dbe3cb v3.4.1 2021-06-04 12:02:12 +02:00
mb-wali
15f4d5fce3 dep: bump in config module 2021-06-04 11:55:41 +02:00
mb-wali
b76f27c037 global: route blueprint migrated to config-tugraz
This is required to make sure config module is independent
2021-06-04 11:55:41 +02:00
Mojib Wali
4aa72c003b v3.4.0 2021-06-01 12:37:16 +02:00
mb-wali
fb906bda72 global: refactor upon release changes
resource_type: change in index and values of resource type.

func: that will serialize list of records.
2021-06-01 12:32:03 +02:00
mb-wali
808aca3f60 details: modified resource_type 2021-06-01 12:32:03 +02:00
mb-wali
5f49389fb1 global: migrate v4 2021-06-01 12:32:03 +02:00
mb-wali
4930e78c3a documents: adds reference guide version 2 2021-05-27 12:53:59 +02:00
David Eckhard
1ad73cc001 ui: change title to data-tooltip 2021-05-27 12:24:45 +02:00
Mojib Wali
7623af2fb1 v3.0.3 2021-05-17 15:01:47 +02:00
mb-wali
b05d9cbf97 bugfix: removes overrides item 2021-05-17 15:01:26 +02:00
16 changed files with 31 additions and 59 deletions

View File

@@ -27,13 +27,13 @@
display: inline;
}
// align badges to the right
.ui.items > .item .extra.labels-actions {
float: right;
width: auto;
// // align badges to the right
// .ui.items > .item .extra.labels-actions {
// float: right;
// width: auto;
// remove action buttons from search results
.ui.small.compact.right.floated.button {
display: none;
}
}
// // remove action buttons from search results
// .ui.small.compact.right.floated.button {
// display: none;
// }
// }

View File

@@ -119,7 +119,4 @@ DEPOSITS_HEADER_TEMPLATE = "invenio_theme_tugraz/header.html"
TUG_ROUTES = {
"index": "/",
"comingsoon": "/comingsoon",
"guide": "/guide",
"terms": "/terms",
"gdpr": "/gdpr",
}

View File

@@ -34,7 +34,7 @@ details.
{{_ ("Documentation")}} <i class="external alternate icon"></i>
</a>
<br>
<a href="{{ url_for('invenio_theme_tugraz.guide') }}"
<a href="{{ url_for('invenio_config_tugraz.guide') }}"
title="Quick guide" target="_blank">
{{_ ("Reference Guide")}} <i class="download icon"></i>
</a>
@@ -44,12 +44,12 @@ details.
{{_ ("Search Guide")}}<i class="angle right icon"></i>
</a>
<br>
<a href="{{ url_for('invenio_theme_tugraz.gdpr') }}"
<a href="{{ url_for('invenio_config_tugraz.gdpr') }}"
title="General Data Protection Rights" target="_blank">
{{_ ("Data Protection")}} <i class="download icon"></i>
</a>
<br>
<a href="{{ url_for('invenio_theme_tugraz.terms') }}"
<a href="{{ url_for('invenio_config_tugraz.terms') }}"
title="Terms and Conditions" target="_blank">
{{_ ("Terms and Conditions")}} <i class="download icon"></i>
</a>

View File

@@ -58,15 +58,15 @@
-->
<div class="badges">
<!--Publication date/Version badge-->
<span class="ui label blue" title="{{_('Publication date')}}">
<span class="ui label blue" data-tooltip="{{_('Publication date')}}" data-inverted="">
{{ r.metadata.publication_date }} {{ '(' ~ r.metadata.version ~ ')' if r.metadata.version }}
</span>
<!--Resource type badge-->
<span class="ui label grey" title="{{_('Resource type')}}">
{{r.metadata.resource_type | cast_to_dict | vocabulary_title('resource_type') }}
<span class="ui label grey" data-tooltip="{{_('Resource type')}}" data-inverted>
{{ r.ui.resource_type.title_l10n }}
</span>
<span class="ui label access-status {{ r.ui.access_status.id }}" data-tooltip="{{ r.ui.access_status.description_l10n }}" data-inverted="">
{% if r.ui.access_status.icon %}<i class="icon {{ r.ui.access_status.icon }}"></i>{% endif %}
{{ r.ui.access_status.title_l10n }}

View File

@@ -94,7 +94,7 @@
<span class="label text-muted"> | Version {{ record.ui.version }}</span>
</div>
<div class="right floated right aligned column">
<span class="ui label small grey">{{ record.ui.resource_type }}</span>
<span class="ui label small grey">{{ record.ui.resource_type.title_l10n }}</span>
<span class="ui label small access-status {{ record.ui.access_status.id }}" data-tooltip="{{ record.ui.access_status.description_l10n }}" data-inverted="">
{% if record.ui.access_status.icon %}<i class="icon {{ record.ui.access_status.icon }}"></i>{% endif %}
{{ record.ui.access_status.title_l10n }}

View File

@@ -15,7 +15,7 @@
<a href="{{creators.identifiers.orcid|pid_url('orcid')}}" target="_blank" ><img class="inline-orcid" src="{{ url_for('static', filename='extra/orcid.png')}}" /></a>
{%- endif %}
<span class="text-muted" {% if creators.affiliations %} {% for affiliation in creators.affiliations %} data-toggle="tooltip" title="{{affiliation.name}}" {%- endfor %} {% endif %}>{{creators.person_or_org.name}}</span>
<span class="text-muted" {% if creators.affiliations %} {% for affiliation in creators.affiliations %} data-tooltip="{{affiliation.name}}" data-inverted="" {%- endfor %} {% endif %}>{{creators.person_or_org.name}}</span>
{% if not loop.last %}; {% endif %}
{%- endfor %}

View File

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

View File

@@ -12,12 +12,8 @@ import binascii
from os import environ
from typing import Dict
import requests
from elasticsearch_dsl.utils import AttrDict
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 flask import Blueprint, render_template
from invenio_app_rdm.records_ui.views.decorators import (
pass_is_preview,
pass_record_files,
@@ -41,9 +37,6 @@ 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.app_template_filter("make_dict_like")
def make_dict_like(value: str, key: str) -> Dict[str, str]:
@@ -61,15 +54,21 @@ def ui_blueprint(app):
return blueprint
def records_serializer(records=None):
"""Serialize list of records."""
record_list = []
for record in records:
record_list.append(UIJSONSerializer().serialize_object_to_dict(record.to_dict()))
return record_list
def index():
"""Frontpage."""
records = FrontpageRecordsSearch()[:5].sort("-created").execute()
for r in records:
r = UIJSONSerializer().serialize_object_to_dict(r.to_dict())
return render_template(
"invenio_theme_tugraz/index.html",
records=records
records=records_serializer(records)
)
@@ -78,30 +77,6 @@ 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))
@pass_is_preview
@pass_record_or_draft
@pass_record_files

View File

@@ -30,7 +30,7 @@ theme = WebpackThemeBundle(
'prop-types': '^15.7.2',
'react-dnd': '^11.1.3',
'react-dnd-html5-backend': '^11.1.3',
'react-invenio-deposit': '^0.13.5',
'react-invenio-deposit': '^0.14.0',
'react-invenio-forms': '^0.7.0',
'react-dropzone': "^11.0.3",
'yup': '^0.27.0',

View File

@@ -56,7 +56,7 @@ install_requires = [
"Flask-WebpackExt>=1.0.0",
"invenio-assets>=1.2.0",
"invenio-i18n>=1.2.0",
"invenio_config_tugraz>=0.5.8",
"invenio_config_tugraz>=0.6.1",
]
packages = find_packages()