summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-04-28 05:45:45 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-04-28 05:45:45 -0400
commitdb853927d7c6adf8f89e1b0ac7d6c9f9691e0592 (patch)
treec4682bb15e592016e240a4e9962177b80fe6f22a
parente012884a17614548f4b45e46f77b2a17a4693b4d (diff)
downloadaskbot-db853927d7c6adf8f89e1b0ac7d6c9f9691e0592.tar.gz
askbot-db853927d7c6adf8f89e1b0ac7d6c9f9691e0592.tar.bz2
askbot-db853927d7c6adf8f89e1b0ac7d6c9f9691e0592.zip
fixed settings urls to work with django 1.3-1.5
-rw-r--r--askbot/deps/livesettings/templates/livesettings/group_settings.html3
-rw-r--r--askbot/deps/livesettings/templates/livesettings/site_settings.html3
2 files changed, 4 insertions, 2 deletions
diff --git a/askbot/deps/livesettings/templates/livesettings/group_settings.html b/askbot/deps/livesettings/templates/livesettings/group_settings.html
index faed7128..924f9309 100644
--- a/askbot/deps/livesettings/templates/livesettings/group_settings.html
+++ b/askbot/deps/livesettings/templates/livesettings/group_settings.html
@@ -1,5 +1,6 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_modify config_tags static %}
+{% load url from future %}
{% block extrastyle %}
{{ block.super }}
<link rel="stylesheet" type="text/css" href="{% static "admin/css/base.css" %}" />
@@ -73,7 +74,7 @@
{% ifequal g.key group.key %}
<li><b>{{g.name}}</b></li>
{% else %}
- <li><a href="{% url group_settings g.key %}">{{g.name}}</a></li>
+ <li><a href="{% url "group_settings" g.key %}">{{g.name}}</a></li>
{% endifequal %}
{% endif %}
{% endfor %}
diff --git a/askbot/deps/livesettings/templates/livesettings/site_settings.html b/askbot/deps/livesettings/templates/livesettings/site_settings.html
index ff2bd1ad..13d8ea40 100644
--- a/askbot/deps/livesettings/templates/livesettings/site_settings.html
+++ b/askbot/deps/livesettings/templates/livesettings/site_settings.html
@@ -1,9 +1,10 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_modify config_tags static %}
+{% load url from future %}
{% block stylesheet %}{% static "admin/css/forms.css" %}{% endblock %}
{% block extrahead %}
-<script type="text/javascript" src="{% url admin:jsi18n %}"></script>
+<script type="text/javascript" src="{% url "admin:jsi18n" %}"></script>
<script type="text/javascript" src="{% static "admin/js/core.js" %}"></script>
<script type="text/javascript" src="{% static "admin/js/CollapsedFieldsets.js" %}"></script>
{% endblock %}