Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
eRA public
GRO - Plan
Commits
b1867098
Verified
Commit
b1867098
authored
May 20, 2022
by
Ubbo Veentjer
Browse files
update to rdmo 1.8 and adapt templates
parent
57a92030
Pipeline
#298441
passed with stages
in 4 minutes and 36 seconds
Changes
10
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
gro_rdmo_theme/templates/core/base_footer.html
View file @
b1867098
{% load i18n core_tags %}
{% load static %}
<footer>
<div
class=
"container"
>
<div
class=
"row"
>
<div
class=
"col-xs-12 col-sm-4"
>
<h3>
{% trans "About" %}
</h3>
{% url 'about' as about_url %}
{% if about_url %}
<a
href=
"{{ about_url }}"
>
{% trans 'About RDMO' %}
</a><br>
{% endif %}
<a
target=
"_blank"
rel=
"noopener"
href=
"https://www.gwdg.de/about-us/catalog/terms-and-conditions"
>
{% trans "Terms and Conditions" %}
</a><br>
<a
target=
"_blank"
rel=
"noopener"
href=
"https://www.gwdg.de/privacy-notice"
>
{% trans "Privacy" %}
</a><br>
<a
target=
"_blank"
rel=
"noopener"
href=
"https://www.eresearch.uni-goettingen.de/imprint/"
>
{% trans "Imprint" %}
</a><br>
</div>
<div
class=
"col-xs-12 col-sm-4"
>
<h3>
{% trans "Contact" %}
</h3>
<address>
<strong>
{% trans "Support Team: Göttingen eResearch Alliance" %}
</strong><br
/><a
href=
"mailto:info@eresearch.uni-goettingen.de "
>
info@eresearch.uni-goettingen.de
</a>
</address>
</div>
<div
class=
"col-xs-12 col-sm-4"
>
<h3>
Göttingen Research Online
</h3>
<div>
Göttingen Research Online bundles various services for Göttingen researchers:
</div><br>
<a
href=
"https://data.gro.uni-goettingen.de"
>
{% trans "GRO.data (research data repository)" %}
</a>
<br>
<a
href=
"https://plan.goettingen-research-online.de"
>
{% trans "GRO.plan (data management planning)" %}
</a>
<a
href=
"https://publications.goettingen-research-online.de"
>
{% trans "GRO.publications (publication data repository)" %}
</a>
</div>
</div>
<div
class=
"row footer__logo-row"
>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"https://www.uni-goettingen.de/"
>
<img
src=
"{% static 'core/img/logo_uni_goe_white.svg' %}"
alt=
"Logo Uni Göttingen"
>
</a>
</div>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"https://www.goettingen-campus.de//"
>
<img
src=
"{% static 'core/img/logo_goecampus.svg' %}"
alt=
"Logo Campus Göttingen"
>
</a>
</div>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"https://www.sub.uni-goettingen.de/"
>
<img
src=
"{% static 'core/img/logo_sub_goe_left_white.svg' %}"
alt=
"Logo SUB Göttingen"
>
</a>
</div>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"http://www.eresearch.uni-goettingen.de/"
>
<img
src=
"{% static 'core/img/logo_era_white.svg' %}"
alt=
"Logo eResearch Alliance"
>
</a>
</div>
</div>
</div>
<div
class=
"container"
>
{% render_lang_template 'core/footer_text' %}
</div>
</footer>
<div
class=
"container"
style=
"margin-top: 1em"
>
<div
class=
"row"
>
<div
class=
"col-sm-12 small text-uppercase"
>
<p>
<p>
{% blocktrans %}
Except where otherwise noted, content on this site is licensed under
a
<a
href=
"https://creativecommons.org/licenses/by/4.0/"
>
Creative Commons Attribution 4.0 International
</a>
license.
{% endblocktrans %}
</p>
</p>
</div>
</div>
</div>
gro_rdmo_theme/templates/core/footer_text_de.html
0 → 100644
View file @
b1867098
{% load i18n core_tags %}
{% load static %}
<div
class=
"row"
>
<div
class=
"col-xs-12 col-sm-4"
>
<h3>
{% trans "About" %}
</h3>
{% url 'about' as about_url %}
{% if about_url %}
<a
href=
"{{ about_url }}"
>
{% trans 'About RDMO' %}
</a><br>
{% endif %}
<a
target=
"_blank"
rel=
"noopener"
href=
"https://www.gwdg.de/about-us/catalog/terms-and-conditions"
>
{% trans "Terms and Conditions" %}
</a><br>
<a
target=
"_blank"
rel=
"noopener"
href=
"https://www.gwdg.de/privacy-notice"
>
{% trans "Privacy" %}
</a><br>
<a
target=
"_blank"
rel=
"noopener"
href=
"https://www.eresearch.uni-goettingen.de/imprint/"
>
{% trans "Imprint" %}
</a><br>
</div>
<div
class=
"col-xs-12 col-sm-4"
>
<h3>
{% trans "Contact" %}
</h3>
<address>
<strong>
{% trans "Support Team: Göttingen eResearch Alliance" %}
</strong><br
/><a
href=
"mailto:info@eresearch.uni-goettingen.de "
>
info@eresearch.uni-goettingen.de
</a>
</address>
</div>
<div
class=
"col-xs-12 col-sm-4"
>
<h3>
Göttingen Research Online
</h3>
<div>
Göttingen Research Online bündelt verschiedene Dienstleistungen für die Göttinger Forschenden:
</div><br>
<a
href=
"https://data.gro.uni-goettingen.de"
>
{% trans "GRO.data (research data repository)" %}
</a>
<br>
<a
href=
"https://plan.goettingen-research-online.de"
>
{% trans "GRO.plan (data management planning)" %}
</a>
<a
href=
"https://publications.goettingen-research-online.de"
>
{% trans "GRO.publications (publication data repository)" %}
</a>
</div>
</div>
<div
class=
"row footer__logo-row"
>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"https://www.uni-goettingen.de/"
>
<img
src=
"{% static 'core/img/logo_uni_goe_white.svg' %}"
alt=
"Logo Uni Göttingen"
>
</a>
</div>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"https://www.goettingen-campus.de//"
>
<img
src=
"{% static 'core/img/logo_goecampus.svg' %}"
alt=
"Logo Campus Göttingen"
>
</a>
</div>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"https://www.sub.uni-goettingen.de/"
>
<img
src=
"{% static 'core/img/logo_sub_goe_left_white.svg' %}"
alt=
"Logo SUB Göttingen"
>
</a>
</div>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"http://www.eresearch.uni-goettingen.de/"
>
<img
src=
"{% static 'core/img/logo_era_white.svg' %}"
alt=
"Logo eResearch Alliance"
>
</a>
</div>
</div>
gro_rdmo_theme/templates/core/footer_text_en.html
0 → 100644
View file @
b1867098
{% load i18n core_tags %}
{% load static %}
<div
class=
"row"
>
<div
class=
"col-xs-12 col-sm-4"
>
<h3>
{% trans "About" %}
</h3>
{% url 'about' as about_url %}
{% if about_url %}
<a
href=
"{{ about_url }}"
>
{% trans 'About RDMO' %}
</a><br>
{% endif %}
<a
target=
"_blank"
rel=
"noopener"
href=
"https://www.gwdg.de/about-us/catalog/terms-and-conditions"
>
{% trans "Terms and Conditions" %}
</a><br>
<a
target=
"_blank"
rel=
"noopener"
href=
"https://www.gwdg.de/privacy-notice"
>
{% trans "Privacy" %}
</a><br>
<a
target=
"_blank"
rel=
"noopener"
href=
"https://www.eresearch.uni-goettingen.de/imprint/"
>
{% trans "Imprint" %}
</a><br>
</div>
<div
class=
"col-xs-12 col-sm-4"
>
<h3>
{% trans "Contact" %}
</h3>
<address>
<strong>
{% trans "Support Team: Göttingen eResearch Alliance" %}
</strong><br
/><a
href=
"mailto:info@eresearch.uni-goettingen.de "
>
info@eresearch.uni-goettingen.de
</a>
</address>
</div>
<div
class=
"col-xs-12 col-sm-4"
>
<h3>
Göttingen Research Online
</h3>
<div>
Göttingen Research Online bundles various services for Göttingen researchers:
</div><br>
<a
href=
"https://data.gro.uni-goettingen.de"
>
{% trans "GRO.data (research data repository)" %}
</a>
<br>
<a
href=
"https://plan.goettingen-research-online.de"
>
{% trans "GRO.plan (data management planning)" %}
</a>
<a
href=
"https://publications.goettingen-research-online.de"
>
{% trans "GRO.publications (publication data repository)" %}
</a>
</div>
</div>
<div
class=
"row footer__logo-row"
>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"https://www.uni-goettingen.de/"
>
<img
src=
"{% static 'core/img/logo_uni_goe_white.svg' %}"
alt=
"Logo Uni Göttingen"
>
</a>
</div>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"https://www.goettingen-campus.de//"
>
<img
src=
"{% static 'core/img/logo_goecampus.svg' %}"
alt=
"Logo Campus Göttingen"
>
</a>
</div>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"https://www.sub.uni-goettingen.de/"
>
<img
src=
"{% static 'core/img/logo_sub_goe_left_white.svg' %}"
alt=
"Logo SUB Göttingen"
>
</a>
</div>
<div
class=
"col-xs-12 col-sm-3 footer__logos"
>
<a
href=
"http://www.eresearch.uni-goettingen.de/"
>
<img
src=
"{% static 'core/img/logo_era_white.svg' %}"
alt=
"Logo eResearch Alliance"
>
</a>
</div>
</div>
\ No newline at end of file
gro_rdmo_theme/templates/projects/project_detail_header.html
View file @
b1867098
...
...
@@ -2,7 +2,6 @@
{% load rules %}
{% load mptt_tags %}
{% load accounts_tags %}
{% load projects_tags %}
{% has_perm 'projects.change_project_object' request.user project as can_change_project %}
...
...
@@ -16,18 +15,7 @@
<strong>
{% trans 'Description' %}
</strong>
</td>
<td>
{% if can_change_project %}
<p
class=
"pull-right"
>
<a
href=
"{% url 'project_update_information' project.pk %}"
title=
"{% trans 'Update project information' %}"
>
<i
class=
"fa fa-pencil"
></i>
</a>
</p>
{% endif %}
{% if project.description %}
{{ project.description }}
{% else %}
{% trans 'No description available.' %}
{% endif %}
{% include 'projects/project_detail_header_description.html' %}
</td>
</tr>
<tr
id=
"project-catalog"
>
...
...
@@ -35,15 +23,7 @@
<strong>
{% trans 'Catalog' %}
</strong>
</td>
<td>
{% if can_change_project %}
<p
class=
"pull-right"
>
<a
href=
"{% url 'project_update_catalog' project.pk %}"
title=
"{% trans 'Update project catalog' %}"
>
<i
class=
"fa fa-pencil"
></i>
</a>
</p>
{% endif %}
<strong>
{{ project.catalog.title }}
</strong><br/>
{{ project.catalog.help }}
{% include 'projects/project_detail_header_catalog.html' %}
</td>
</tr>
<tr>
...
...
@@ -62,28 +42,7 @@
<strong>
{% trans 'Project hierarchy' %}
</strong>
</td>
<td>
{% if can_change_project %}
<p
class=
"pull-right"
>
<a
href=
"{% url 'project_update_parent' project.pk %}"
title=
"{% trans 'Update parent project' %}"
>
<i
class=
"fa fa-pencil"
></i>
</a>
</p>
{% endif %}
<ul
class=
"list-unstyled"
>
{% for node in project_tree %}
<li>
{% projects_indent node.level %}
<a
href=
"{% url 'project' node.id %}"
>
{% if node.id == project.id %}
<strong>
{{ node.title }}
</strong>
{% else %}
{{ node.title }}
{% endif %}
</a>
</li>
{% endfor %}
</ul>
{% include 'projects/project_detail_header_hierarchy.html' %}
</td>
</tr>
{% endif %}
...
...
gro_rdmo_theme/templates/projects/project_detail_sidebar.html
View file @
b1867098
...
...
@@ -134,6 +134,22 @@
{% url 'project_update_import' project.id as upload_url %}
{% include 'core/upload_form.html' with upload_url=upload_url label=True %}
</li>
{% if settings.PROJECT_IMPORTS_LIST %}
<li>
<p>
<strong>
{% trans 'Import directly' %}
</strong>
</p>
</li>
{% for key, label, class in settings.PROJECT_IMPORTS %}
{% if key in settings.PROJECT_IMPORTS_LIST %}
<li>
<a
href=
"{% url 'project_update_import' project.id key %}"
target=
"_blank"
>
{{ label }}
</a>
</li>
{% endif %}
{% endfor %}
{% endif %}
{% if settings.NESTED_PROJECTS and project.get_ancestors %}
<li>
<p>
...
...
gro_rdmo_theme/templates/projects/projects.html
View file @
b1867098
...
...
@@ -78,9 +78,29 @@
<ul
class=
"list-unstyled"
>
<li
id=
"import-project"
>
<p>
<strong>
{% trans 'Import from file' %}
</strong>
</p>
{% url 'project_create_import' as upload_url %}
{% include 'core/upload_form.html' with upload_url=upload_url %}
</li>
{% if settings.PROJECT_IMPORTS_LIST %}
<li>
<p>
<strong>
{% trans 'Import directly' %}
</strong>
</p>
</li>
{% for key, label, class in settings.PROJECT_IMPORTS %}
{% if key in settings.PROJECT_IMPORTS_LIST %}
<li>
<a
href=
"{% url 'project_create_import' key %}"
target=
"_blank"
>
{{ label }}
</a>
</li>
{% endif %}
{% endfor %}
{% endif %}
</ul>
{% endblock %}
...
...
requirements/base.in
View file @
b1867098
rdmo==1.
7
.0
rdmo==1.
8
.0
psycopg2
requirements/base.txt
View file @
b1867098
...
...
@@ -8,7 +8,7 @@ asgiref==3.5.2
# via django
attrs==21.4.0
# via pytest
certifi==202
1.10.
8
certifi==202
2.5.1
8
# via requests
cffi==1.15.0
# via cryptography
...
...
@@ -145,7 +145,7 @@ pytz==2022.1
# via django
rcssmin==1.0.6
# via django-compressor
rdmo==1.
7
.0
rdmo==1.
8
.0
# via -r requirements/base.in
requests==2.27.1
# via
...
...
requirements/dev.txt
View file @
b1867098
...
...
@@ -12,7 +12,7 @@ attrs==21.4.0
# via
# -r requirements/base.txt
# pytest
certifi==202
1.10.
8
certifi==202
2.5.1
8
# via
# -r requirements/base.txt
# requests
...
...
@@ -259,7 +259,7 @@ rcssmin==1.0.6
# via
# -r requirements/base.txt
# django-compressor
rdmo==1.
7
.0
rdmo==1.
8
.0
# via -r requirements/base.txt
requests==2.27.1
# via
...
...
requirements/production.txt
View file @
b1867098
...
...
@@ -12,7 +12,7 @@ attrs==21.4.0
# via
# -r requirements/base.txt
# pytest
certifi==202
1.10.
8
certifi==202
2.5.1
8
# via
# -r requirements/base.txt
# requests
...
...
@@ -254,7 +254,7 @@ rcssmin==1.0.6
# via
# -r requirements/base.txt
# django-compressor
rdmo==1.
7
.0
rdmo==1.
8
.0
# via -r requirements/base.txt
requests==2.27.1
# via
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment