diff --git a/flowspec/views.py b/flowspec/views.py
index 2ac3bac338720d3ebf822b0ca6c668534c07cea6..b4d44970941d07675361ad6c5c1c61d56781fd06 100644
--- a/flowspec/views.py
+++ b/flowspec/views.py
@@ -571,7 +571,7 @@ def user_login(request):
login(request, user)
return HttpResponseRedirect(reverse("dashboard"))
else:
- error = _("User account <strong>%s</strong> is pending activation. Administrators have been notified and will activate this account within the next days. <br>If this account has remained inactive for a long time contact your technical coordinator or GRNET Helpdesk") %user.username
+ error = _("User account <strong>%s</strong> is pending activation. Administrators have been notified and will activate this account within the next days. <br>If this account has remained inactive for a long time contact your technical coordinator or GEANT Helpdesk") %user.username
return render(
request,
'error.html',
@@ -751,7 +751,7 @@ def selectinst(request):
if form.is_valid():
userprofile = form.save()
user_activation_notify(userprofile.user)
- error = _("User account <strong>%s</strong> is pending activation. Administrators have been notified and will activate this account within the next days. <br>If this account has remained inactive for a long time contact your technical coordinator or GRNET Helpdesk") %userprofile.user.username
+ error = _("User account <strong>%s</strong> is pending activation. Administrators have been notified and will activate this account within the next days. <br>If this account has remained inactive for a long time contact your technical coordinator or GEANT Helpdesk") %userprofile.user.username
return render(
request,
'error.html',
diff --git a/static/fodlogo2.png b/static/fodlogo2.png
index f270481bfff3e3ab8cc52f2c5178a4981c902ecb..1d415d313722d47f28bb5982e11a31cc4bde7d80 100644
Binary files a/static/fodlogo2.png and b/static/fodlogo2.png differ
diff --git a/static/shib_login.png b/static/shib_login.png
index 34255f5c60df14ac2a72d2967e4b96148674fd3e..370e44927cebd9bd64aa11789d3e36509ba76928 100644
Binary files a/static/shib_login.png and b/static/shib_login.png differ
diff --git a/templates/error.html b/templates/error.html
index b6476a1205204fbe650a197df9d01d45d38c7f52..b790bd681057dc659307bcde7c14525dbb3c7704 100644
--- a/templates/error.html
+++ b/templates/error.html
@@ -49,6 +49,7 @@
{% if missing_attributes %}
<p>
{% trans "Required shibboleth attributes" %}:<br>
+ TODO:
<ul>
<li>eduPersonPrincipalName</li>
<li>mail</li>
diff --git a/templates/footer.html b/templates/footer.html
index 326d063b072d0b8a64247b04c6a19fed8b19ecb0..a6df9146003bf212e973a31d2c971a7778c7de76 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -2,28 +2,15 @@
{% load staticfiles %}
<footer class="footer">
<div id="footcontainer" class="container">
- <p>
- {% with BRANDING.name as name %}
- {% with BRANDING.email as email %}
- {% with BRANDING.phone as phone %}
- {% blocktrans %}
- If you have any questions or need help, contact {{ name }} Helpdesk at <a href='mailto:{{ email }}'>{{ email }}</a> or {{ phone }}.
- {% endblocktrans %}
- {% endwith %}
- {% endwith %}
- {% endwith %}
- </p>
- <div style="padding-top: 10px;"><a href="https://github.com/grnet/flowspy">Version: <strong>{{ VERSION }}</strong></a> - {% blocktrans %} Designed and developed by {{ BRANDING.name }}" {% endblocktrans %}
- <a href="{{ BRANDING.facebook }}" target="_blank"><img src="{% static 'img/facebook_img.png' %}" alt="{{ BRANDING.name }} on Facebook" title="{{ BRANDING.name }} on Facebook"/></a> <a href="{{ BRANDING.twitter }}" target="_blank"><img src="{% static 'img/twitter_img.png' %}" alt="{{ BRANDING.name }} on Twitter" title="{{ BRANDING.name }} on Twitter"/></a>
+ {% if user.is_authenticated %}
+ <p>{% trans "If you have any questions or need help, contact GÉANT OC at <a href='mailto:ncc@noc.geant.net'>ncc@noc.geant.net</a> or +44 1223 733033." %}</p>
+ {% endif %}
+ <div style="padding-top: 10px;"><a href="https://code.grnet.gr/projects/flowspy">Version: <strong>{{VERSION}}</strong></a> -
+ {% trans "Designed and developed in GÉANT4-SGA2 JRA2-T6; Originally designed and developed by GRNET NOC" %}
+</a>
</div>
- <div class="row">
- <a href="{{ BRANDING.url }}">{{ BRANDING.name }}</a> | <a href="/info/{{ LANGUAGE_CODE }}/">{% trans "Info" %}</a> | <a href="/tos/{{ LANGUAGE_CODE }}/">{% trans "Service Terms" %}</a></div>
<div style="padding-top: 10px;">
+
</div>
- <div style="padding-top: 10px;">
- {% if BRANDING.footer_iframe %}
- <iframe width="500" scrolling="no" height="50" frameborder="0" align="middle" src="{{ BRANDING.footer_iframe }}" marginwidth="0" marginheight="0"></iframe>
- {% endif %}
- </div>
</div>
</footer>
diff --git a/templates/registration/activation_complete.txt b/templates/registration/activation_complete.txt
index 8b8c0d46595e78be3e26df0519fe485d7ff3ddcb..c411bdd53f65e543e6f083649719817be0a9a20e 100644
--- a/templates/registration/activation_complete.txt
+++ b/templates/registration/activation_complete.txt
@@ -1,11 +1,5 @@
-Ο λογαριασμός σας με όνομα χρήστη «{{user.username}}» ενεργοποιήθηκε.
-Μπορείτε να χρησιμοποιήσετε την υπηρεσία FoD, κάνοντας login στην παρακάτω
-διεύθυνση:
+Your account with username {{ user.username }} has been activated.
- http://{{ site.domain }}{% url login %}
-
----------------------------------------------------------------------------
-Your account with username “{{ user.username }}” has been activated.
You may login to FoD using the following URL:
- http://{{ site.domain }}{% url login %}
+http://{{ site.domain }}{% url login % }
diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt
index 2636e354e9b90cc61f99bcadd30d3d8de8f4f7b2..57a2c5b07b13f44d873a33fb90c4e665457b1825 100644
--- a/templates/registration/activation_email.txt
+++ b/templates/registration/activation_email.txt
@@ -1,17 +1,3 @@
-Ο/H {{ user.get_full_name }} έκανε αίτηση για νεό λογαριασμό στην υπηρεσία.
-
-Όνομα χρήστη: {{ user.username }}
-E-mail: {{ user.email }}
-
-Για να ενεργοποιήσετε το λογαριασμό και να επιτρέψετε στο χρήστη να
-χρησιμοποιήσει την υπηρεσία, επισκεφθείτε τον ακόλουθο σύνδεσμο:
-
-http://{{ site.domain }}{% url activate_account activation_key %}
-
-Ο χρήστης θα ενημερωθεί για την ενεργοποίηση του λογαριασμού του μέσω e-mail.
-
------------------------------------------------------------------------------
-
{{ user.get_full_name }} has registered for a new account.
Username: {{user.username}}
diff --git a/templates/registration/activation_email_peer_notify.txt b/templates/registration/activation_email_peer_notify.txt
index b9087d4c2b7cf494cdf16fc4095bfaa689951b9b..579e842c7d9fe4422a807d87d06d6d1c2d4ec807 100644
--- a/templates/registration/activation_email_peer_notify.txt
+++ b/templates/registration/activation_email_peer_notify.txt
@@ -1,23 +1,8 @@
-Ο/H {{ user.get_full_name }} έκανε αίτηση για νεό λογαριασμό στην υπηρεσία Firewall On Demand
-εκ μέρους του ιδρύματος/φορέα: {{peer}}.
+{{ user.get_full_name }} has registered for a new Firewall on Demand account on behalf of your Institution: {{ peer }}
-Όνομα χρήστη: {{ user.username }}
+Username: {{ user.username }}
E-mail: {{ user.email }}
-Ο χρήστης θα ενημερωθεί για την ενεργοποίηση του λογαριασμού του μέσω e-mail.
+The user will be notified via e-mail about the account activation
-Σε περίπτωση που ο χρήστης δεν ανήκει στο ίδρυμα/φορέα σας ή χρησιμοποιεί την υπηρεσία ενάντια στον
-εσωτερικό σας κανονισμό παρακαλούμε επικοινωνήστε άμεσα μαζί μας.
-
------------------------------------------------------------------------------
-
-{{ user.get_full_name }} has registered for a new Firewall on Demand account on behalf of your
-institution: {{peer}}.
-
-Username: {{user.username}}
-E-mail: {{user.email}}
-
-The user will be notified via mail about the account activation
-
-In case this user does not belong to your institution or attempts to use the service without being
-compliant to your instututions' regulation please contact us.
+In case this user does not belong to your institution or attempts to user the service without being compliant to your Institutions' regulation please do contact us.
diff --git a/templates/registration/activation_email_peer_notify_subject.txt b/templates/registration/activation_email_peer_notify_subject.txt
index 2f7f3408dbc488d77ba6ccc4bcd77339eb94cba8..9dd0850932356895444ceefb9a5d8d9bba84db87 100644
--- a/templates/registration/activation_email_peer_notify_subject.txt
+++ b/templates/registration/activation_email_peer_notify_subject.txt
@@ -1 +1 @@
-GRNET Firewall on Demand new account registration at {{ site.name }} on behalf of {{peer}}
+GEANT Firewall on Demand new account registration at {{ site.name }} on behalf of {{ peer }}