Revision 1381e2d4

b/flowspec/views.py
257 257 
               login(request, user)
258 258 
               return HttpResponseRedirect(reverse("group-routes"))
259 259 
            else:
260 
                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
260 
                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
261 261 
                return render_to_response('error.html', {'error': error, 'inactive': True},
262 262 
                                  context_instance=RequestContext(request))
263 263 
        else:
b/templates/error.html
79 79
80 80 
				{% endblock %}
81 81 
				{% block content %}
82 
				{% if error %}<h2>Error</h2>{% endif %}
82 
				{% if error %}{% if inactive %}<h2>Activation Pending</h2>{% else %}<h2>Error</h2>{% endif %}{% endif %}
83 83 
				<div>
84 84 
				{% if missing_attributes %}
85 85 
				<p>One or more required shibboleth attributes were not released towards this service</p>
86 86 
				{% endif %}
87 
				<p style="color: red;">{% autoescape off %}{{error}}{% endautoescape %}</p>
87 
				<p {% if not inactive %}style="color: red;"{% endif %}>{% autoescape off %}{{error}}{% endautoescape %}</p>
88 88 
				{% if missing_attributes %}
89 89 
				<p>
90 90 
				Required shibboleth attributes:<br>

Also available in: Unified diff