Updated and fixed browserid logins

Conflicts: requirements.txt src/templates/base.html

Updated and fixed browserid logins
Conflicts: requirements.txt src/templates/base.html
Charles Oliveira
1 parent 4dc20bf0
Showing 2 changed files with 2 additions and 9 deletions Show diff stats
requirements.txt
src/templates/base.html
@@ -18,7 +18,6 @@ django-hitcounter==0.1.1
 Pillow==2.5.1
 django-i18n-model==0.0.7
 django-tastypie==0.11.0
-
 gunicorn==19.1.0
 eventlet==0.15.0
  
@@ -44,6 +44,7 @@
   <body class="container">
     {% browserid_info %}
  
+
     {% block navbar %}
     <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
@@ -139,6 +140,7 @@
         </div>
       </div>
     </nav>
+
     {% endblock %}
  
       {% block messages %}
@@ -186,21 +188,13 @@
     </div>
     {% endblock %}
  
-
   {% if not is_mobile %}
     {% conversejs_chatpanel %}
     {% conversejs_initialize %}
   {% endif %}
  
   {% 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>
...	...	@@ -18,7 +18,6 @@ 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		-
22	21	gunicorn==19.1.0
23	22	eventlet==0.15.0
24	23
...	...
...	...	@@ -44,6 +44,7 @@
44	44	<body class="container">
45	45	{% browserid_info %}
46	46
	47	+
47	48	{% block navbar %}
48	49	<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
49	50	<div class="container">
...	...	@@ -139,6 +140,7 @@
139	140	</div>
140	141	</div>
141	142	</nav>
	143	+
142	144	{% endblock %}
143	145
144	146	{% block messages %}
...	...	@@ -186,21 +188,13 @@
186	188	</div>
187	189	{% endblock %}
188	190
189		-
190	191	{% if not is_mobile %}
191	192	{% conversejs_chatpanel %}
192	193	{% conversejs_initialize %}
193	194	{% endif %}
194	195
195	196	{% include "tz/set_utc_offset.html" %}
196		- {% browserid_js %}
197	197
198		- {% if not is_mobile %}
199		- {% conversejs_chatpanel %}
200		- {% conversejs_initialize %}
201		- {% endif %}
202		-
203		- {% include "tz/set_utc_offset.html" %}
204	198	<script src="https://login.persona.org/include.js"></script>
205	199	<script src="{% static 'browserid/api.js' %}"></script>
206	200	<script src="{% static 'browserid/browserid.js' %}"></script>
...	...