Skip to content

Commit cbcdefe

Browse files
committed
update imprint
1 parent 038b490 commit cbcdefe

7 files changed

Lines changed: 42 additions & 31 deletions

File tree

infra/helm/monitoring/bootstrap-monitoring.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ helm install grafana grafana/grafana -n monitoring \
1010
--set persistence.storageClassName=microk8s-hostpath
1111
helm upgrade --install loki grafana/loki-stack -n monitoring \
1212
--set fluent-bit.enabled=false,promtail.enabled=true,grafana.enabled=false,loki.image.tag=2.9.3
13+
14+
# get the grafana password:
15+
# microk8s kubectl get secret --namespace monitoring grafana -o jsonpath="{.data.admin-password}" | base64 --decode ; echo

qmra/risk_assessment/templates/impressum.html

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{% extends "layout.html" %}
2+
{% load static %}
3+
{% block body %}
4+
<div class="container w-75 my-4">
5+
<h3>Imprint</h3>
6+
<img height="100px" class="my-5" src="{% static 'img/qmra-full-logo.svg' %}">
7+
<h2>Funding</h2><br><br>
8+
<div class="row">
9+
<div class="col">
10+
<div style="display: flex; align-items: center; justify-content: center; height: 300px"><img style="display: block; margin: auto" width="90%" src="{% static 'img/interreg.png' %}"></div>
11+
<div style="display: flex; align-items: center; justify-content: center; height: 300px"><img style="display: block; margin: auto" width="90%" src="{% static 'img/nextGen.png' %}"></div>
12+
</div>
13+
<div class="col">
14+
<div style="display: flex; align-items: center; justify-content: center; height: 300px"><img style="display: block; margin: auto" width="90%" src="{% static 'img/ultimate.png' %}"></div>
15+
<div style="display: flex; align-items: center; justify-content: center; height: 300px"><img style="display: block; margin: auto" width="90%" src="{% static 'img/AquaNES.png' %}"></div>
16+
</div>
17+
</div>
18+
<h2>Contact</h2>
19+
<b>Wolfgang Seis</b><br>
20+
Kompetenzzentrum Wasser Berlin<br>
21+
Wissenschaftlicher Mitarbeiter<br>
22+
<br>
23+
wolfgang.seis@kompetenz-wasser.de<br>
24+
+49 (0) 30 53 653 807
25+
<br>
26+
<br>
27+
<b>Pia Schumann</b><br>
28+
Kompetenzzentrum Wasser Berlin<br>
29+
Wissenschaftliche Mitarbeiterin<br>
30+
<br>
31+
pia.schumann@kompetenz-wasser.de<br>
32+
+49 (0) 30 53 653 835
33+
</div>
34+
{% endblock %}

qmra/templates/DSGVO.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ <h2 id="m3">Verantwortlicher</h2>
6161
<p>Tobias Evel<br>Kompetenzzentrum Wasser Berlin gGmbH<br>Grunewaldstraße 61-62<br>10825 Berlin</p>
6262
Vertretungsberechtigte Personen: <p>Pascale Rouault (Geschäftsführer)</p>
6363
E-Mail-Adresse: <p>datenschutz@kompetenz-wasser.de</p>
64-
Impressum: <p><a href="https://www.kompetenz-wasser.de/de/impressum"
64+
Imprint: <p><a href="https://www.kompetenz-wasser.de/de/imprint"
6565
target="_blank">https://www.kompetenz-wasser.de/de/impressum</a></p>
6666
<h2 id="m11">Kontakt Datenschutzbeauftragter</h2>
6767
<p>Tobias Evel<br>Kompetenzzentrum Wasser Berlin gGmbH<br>Grunewaldstraße 61-62<br>10825

qmra/templates/layout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</div>
6464
<div class="col-1">
6565
<ul class="list-unstyled">
66-
<li><a class="footer-item" href="{% url 'impressum' %}">Impressum</a></li>
66+
<li><a class="footer-item" href="{% url 'imprint' %}">Imprint</a></li>
6767
</ul>
6868
</div>
6969
<div class="col-md-4 ml-auto mr-0">

qmra/urls.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
path("ready", views.ready, name="ready"),
99
path("dsgvo", views.dsgvo, name="dsgvo"),
1010
path("faqs", views.faqs, name="faqs"),
11-
path("impressum", views.impressum, name="impressum"),
11+
path("imprint", views.imprint, name="imprint"),
1212
path('admin/', admin.site.urls),
1313
path("accounts/", include("django.contrib.auth.urls")),
1414
path('', include('qmra.risk_assessment.urls')),

qmra/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ def faqs(request):
2222
return render(request, "faqs.html")
2323

2424

25-
def impressum(request):
26-
return render(request, "impressum.html")
25+
def imprint(request):
26+
return render(request, "imprint.html")
2727

2828

2929
def health(request):

0 commit comments

Comments
 (0)