Commit 1381e2d4 authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos

Altered user pending activation message

parent ce1536e9
...@@ -257,7 +257,7 @@ def user_login(request): ...@@ -257,7 +257,7 @@ def user_login(request):
login(request, user) login(request, user)
return HttpResponseRedirect(reverse("group-routes")) return HttpResponseRedirect(reverse("group-routes"))
else: else:
error = "User <strong>%s</strong> is not active yet. Administrators have been notified and will soon activate this account. <br>If your problem persists contact 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 GRNET Helpdesk" %user.username
return render_to_response('error.html', {'error': error, 'inactive': True}, return render_to_response('error.html', {'error': error, 'inactive': True},
context_instance=RequestContext(request)) context_instance=RequestContext(request))
else: else:
......
...@@ -79,12 +79,12 @@ $(document).ready(function(){ ...@@ -79,12 +79,12 @@ $(document).ready(function(){
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% if error %}<h2>Error</h2>{% endif %} {% if error %}{% if inactive %}<h2>Activation Pending</h2>{% else %}<h2>Error</h2>{% endif %}{% endif %}
<div> <div>
{% if missing_attributes %} {% if missing_attributes %}
<p>One or more required shibboleth attributes were not released towards this service</p> <p>One or more required shibboleth attributes were not released towards this service</p>
{% endif %} {% endif %}
<p style="color: red;">{% autoescape off %}{{error}}{% endautoescape %}</p> <p {% if not inactive %}style="color: red;"{% endif %}>{% autoescape off %}{{error}}{% endautoescape %}</p>
{% if missing_attributes %} {% if missing_attributes %}
<p> <p>
Required shibboleth attributes:<br> Required shibboleth attributes:<br>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment