diff --git a/auth/templates/login_box.html b/auth/templates/login_box.html index 2f0f7359d42902b6a5489e54c45235d4b6843b53..3918f27c4bae212e330d3d72c96edcd53faa0913 100644 --- a/auth/templates/login_box.html +++ b/auth/templates/login_box.html @@ -1,7 +1,5 @@ {% if default_auth_system %} -<p><a href="{% url auth.views.start system_name=default_auth_system %}?return_url={{return_url}}"> -{{default_auth_system_obj.LOGIN_MESSAGE}} -</a></p> +<p><a style="font-size:1.3em; border: 1px solid #bbb; padding: 5px;" href="{% url auth.views.start system_name=default_auth_system %}?return_url={{return_url}}">{{default_auth_system_obj.LOGIN_MESSAGE}}</a></p> {% else %} {% for auth_system in enabled_auth_systems %} {% ifequal auth_system "password" %} diff --git a/helios/views.py b/helios/views.py index ac2101be0f8e1e010f195280e4111b6407396026..91c28ec42b16622f18444ddcfe59173a2442f7fa 100644 --- a/helios/views.py +++ b/helios/views.py @@ -551,11 +551,13 @@ def one_election_cast_done(request, election): # local logout ensures that there's no more # user locally - if logout: - auth_views.do_local_logout(request) + # WHY DO WE COMMENT THIS OUT? because we want to force a full logout via the iframe, including + # from remote systems, just in case, i.e. CAS + # if logout: + # auth_views.do_local_logout(request) # remote logout is happening asynchronously in an iframe to be modular given the logout mechanism - return render_template(request, 'cast_done', {'election': election, 'last_vote': votes[0], 'logout': logout}) + return render_template(request, 'cast_done', {'election': election, 'last_vote': votes[0], 'logout': logout}, include_user=False) @election_view() @json