Changed logout url if browserid is disabled

Logout was set to use only browserid, so we added the option to use django default logout url instead of browserid if the latter is disabled. Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Alexandre Almeida <alexandreab@live.com>

Changed logout url if browserid is disabled
Logout was set to use only browserid, so we added the option to use django default logout url instead of browserid if the latter is disabled. Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Alexandre Almeida <alexandreab@live.com>
Carlos Coêlho · Sergio Oliveira
1 parent 58bce9e0
Showing 2 changed files with 6 additions and 2 deletions Show diff stats
colab/accounts/urls.py
colab/templates/base.html
@@ -39,7 +39,7 @@ if not BROWSERID_ENABLED:
     )
 else:
     urlpatterns = patterns('',
-        url(r'^login/?$', LoginView.as_view(), name='colab.login'),
+        url(r'^login/?$', LoginView.as_view(), name='login'),
     )
 urlpatterns += patterns('',
@@ -141,7 +141,11 @@
                       <div>
                         <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
                         {% trans 'Logout' as logout_text %}
-                        {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
+                        {% if BROWSERID_ENABLED %}
+                          {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %}
+                        {% else %}
+                          <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
+                        {% endif %}
                       </div>
                     </div>
                   </li>
	@@ -39,7 +39,7 @@ if not BROWSERID_ENABLED:		@@ -39,7 +39,7 @@ if not BROWSERID_ENABLED:
39	)	39	)
40	else:	40	else:
41	urlpatterns = patterns('',	41	urlpatterns = patterns('',
42	- url(r'^login/?$', LoginView.as_view(), name='colab.login'),	42	+ url(r'^login/?$', LoginView.as_view(), name='login'),
43	)	43	)
44		44
45	urlpatterns += patterns('',	45	urlpatterns += patterns('',