Updated and fixed browserid logins

Conflicts: src/templates/base.html

Updated and fixed browserid logins
Conflicts: src/templates/base.html
Sergio Oliveira
1 parent 6f94b2d2
Showing 4 changed files with 13 additions and 6 deletions Show diff stats
requirements.txt
src/accounts/urls.py
src/colab/custom_settings.py
src/templates/base.html
@@ -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
@@ -12,7 +12,7 @@ urlpatterns = patterns(&#39;&#39;,
     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<username>[\w@+.-]+)/?$',
         UserProfileDetailView.as_view(), name='user_profile'),
@@ -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',
 <!DOCTYPE html>
-{% load i18n browserid conversejs gravatar proxy %}
-
-{% is_trac_enable as is_trac %}
+{% load i18n static browserid conversejs gravatar proxy %}
  
 <html>
   <head>
@@ -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" %}
+  <script src="https://login.persona.org/include.js"></script>
+  <script src="{% static 'browserid/api.js' %}"></script>
+  <script src="{% static 'browserid/browserid.js' %}"></script>
+
   {% block footer_js %}{% endblock %}
   </body>
 </html>
...	...	@@ -18,7 +18,7 @@ django-hitcounter==0.1.1
18	18	Pillow==2.5.1
19	19	django-i18n-model==0.0.7
20	20	django-tastypie==0.11.0
21		-django-browserid==0.9
	21	+django-browserid==0.10.1
22	22
23	23	gunicorn==19.1.0
24	24	eventlet==0.15.0
...	...
...	...	@@ -12,7 +12,7 @@ urlpatterns = patterns('',
12	12	url(r'^change-password/$',
13	13	ChangeXMPPPasswordView.as_view(), name='change_password'),
14	14
15		- url(r'^logout/?$', 'accounts.views.logoutColab'),
	15	+ url(r'^logout/?$', 'accounts.views.logoutColab', name='logout'),
16	16
17	17	url(r'^(?P<username>[\w@+.-]+)/?$',
18	18	UserProfileDetailView.as_view(), name='user_profile'),
...	...
...	...	@@ -203,7 +203,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
203	203	'django.core.context_processors.tz',
204	204	'django.contrib.messages.context_processors.messages',
205	205	'django.core.context_processors.request',
206		- 'django_browserid.context_processors.browserid',
207	206	'django_mobile.context_processors.is_mobile',
208	207	'super_archives.context_processors.mailarchive',
209	208	'home.context_processors.robots',
...	...
1	1	<!DOCTYPE html>
2		-{% load i18n browserid conversejs gravatar proxy %}
3		-
4		-{% is_trac_enable as is_trac %}
	2	+{% load i18n static browserid conversejs gravatar proxy %}
5	3
6	4	<html>
7	5	<head>
...	...	@@ -197,6 +195,16 @@
197	195	{% include "tz/set_utc_offset.html" %}
198	196	{% browserid_js %}
199	197
	198	+ {% if not is_mobile %}
	199	+ {% conversejs_chatpanel %}
	200	+ {% conversejs_initialize %}
	201	+ {% endif %}
	202	+
	203	+ {% include "tz/set_utc_offset.html" %}
	204	+ <script src="https://login.persona.org/include.js"></script>
	205	+ <script src="{% static 'browserid/api.js' %}"></script>
	206	+ <script src="{% static 'browserid/browserid.js' %}"></script>
	207	+
200	208	{% block footer_js %}{% endblock %}
201	209	</body>
202	210	</html>
...	...