From 7de25ba3499b66dc1ac99a4cbcc75dbde9c4374d Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Fri, 22 Aug 2014 19:22:31 -0300 Subject: [PATCH] Updated and fixed browserid logins --- requirements.txt | 2 +- src/accounts/urls.py | 2 +- src/colab/custom_settings.py | 1 - src/templates/base.html | 14 +++++++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index b9fcb18..eac62d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ django-hitcounter==0.1.1 Pillow==2.5.1 django-i18n-model==0.0.7 django-tastypie==0.11.0 -django-browserid==0.9 +django-browserid==0.10.1 gunicorn==19.1.0 eventlet==0.15.0 diff --git a/src/accounts/urls.py b/src/accounts/urls.py index c15e44d..c9ca9f9 100644 --- a/src/accounts/urls.py +++ b/src/accounts/urls.py @@ -12,7 +12,7 @@ urlpatterns = patterns('', url(r'^change-password/$', ChangeXMPPPasswordView.as_view(), name='change_password'), - url(r'^logout/?$', 'accounts.views.logoutColab'), + url(r'^logout/?$', 'accounts.views.logoutColab', name='logout'), url(r'^(?P[\w@+.-]+)/?$', UserProfileDetailView.as_view(), name='user_profile'), diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index 070b783..f67685a 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -203,7 +203,6 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.tz', 'django.contrib.messages.context_processors.messages', 'django.core.context_processors.request', - 'django_browserid.context_processors.browserid', 'django_mobile.context_processors.is_mobile', 'super_archives.context_processors.mailarchive', 'home.context_processors.robots', diff --git a/src/templates/base.html b/src/templates/base.html index aa11ba1..2669f93 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -1,7 +1,5 @@ -{% load i18n browserid conversejs gravatar proxy %} - -{% is_trac_enable as is_trac %} +{% load i18n static browserid conversejs gravatar proxy %} @@ -197,6 +195,16 @@ {% include "tz/set_utc_offset.html" %} {% browserid_js %} + {% if not is_mobile %} + {% conversejs_chatpanel %} + {% conversejs_initialize %} + {% endif %} + + {% include "tz/set_utc_offset.html" %} + + + + {% block footer_js %}{% endblock %} -- libgit2 0.21.2