aboutsummaryrefslogtreecommitdiff
path: root/glifestream/templates/base.html
diff options
context:
space:
mode:
Diffstat (limited to 'glifestream/templates/base.html')
-rw-r--r--glifestream/templates/base.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/glifestream/templates/base.html b/glifestream/templates/base.html
index 5ba9105..35dbef9 100644
--- a/glifestream/templates/base.html
+++ b/glifestream/templates/base.html
@@ -1,4 +1,4 @@
-{% load i18n media static pipeline %}{% load url from future %}{% load firstof from future %}<!DOCTYPE html>
+{% load i18n media static pipeline %}<!DOCTYPE html>
<html>
<head>
@@ -26,11 +26,11 @@
<a href="{% url 'index' %}" title="{% trans "My private stream" %}">{% trans "Home" %}</a> |
<a href="{% url 'public' %}" title="{% trans "My publicly visible stream" %}" accesskey="2">{% trans "Public" %}</a> |
{% if user.is_staff %}<a href="{% url 'settings' %}">{% trans "Settings" %}</a> |{% endif %}
- <a href="{% url 'django.contrib.auth.views.logout' %}">{% trans "Logout" %}</a>
+ <a href="{% url 'logout' %}">{% trans "Logout" %}</a>
{% else %}
{% if friend %}<span class="text">{% trans "Hello" %}
<a href="{{ user.fb_profile_url }}" target="_blank"><b>{{ user.fb_username }}</b></a></span> |
- <a href="{% url 'django.contrib.auth.views.logout' %}">{% trans "Logout" %}</a>
+ <a href="{% url 'logout' %}">{% trans "Logout" %}</a>
{% else %}
{% if page.login_url %}<a href="{{ page.login_url }}" rel="nofollow">{% trans "Login" %}</a>{% endif %}
{% endif %}
@@ -52,7 +52,7 @@
{% if page.need_fbc %}
<div id="fb-root"></div>
-<script type="text/javascript" src="http://connect.facebook.net/en_US/all.js"></script>
+<script type="text/javascript" src="https://connect.facebook.net/en_US/all.js"></script>
<script type="text/javascript">
function fb_login_friend () { window.location = '{% url "gauth.views.login_friend" %}'; }
$(document).ready (function () {

Return to:

Send suggestions and report system problems to the System administrator.