Skip to content
This repository has been archived by the owner on Jun 20, 2018. It is now read-only.

Commit

Permalink
Merge pull request #6 from bharling/master
Browse files Browse the repository at this point in the history
Updated 2 lines of template to django 1.5 syntax
  • Loading branch information
mattrobenolt committed Jun 23, 2013
2 parents ee4e51d + 785bf79 commit 7040278
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -2,4 +2,4 @@
*.egg-info/
.DS_Store
dist/
build/
build
4 changes: 2 additions & 2 deletions nexus/templates/nexus/admin/change_form.html
@@ -1,11 +1,11 @@
{% extends "nexus/admin/base_site.html" %}

{% load url from future %}
{% load i18n admin_modify adminmedia %}
{% load nexus_admin %}

{% block head %}
{{ block.super }}
{% url admin:jsi18n as jsi18nurl %}
{% url 'admin:jsi18n' as jsi18nurl %}
<script type="text/javascript" src="{{ jsi18nurl|default:"../../../jsi18n/" }}"></script>
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/widgets.css" />
{{ media }}
Expand Down
3 changes: 2 additions & 1 deletion nexus/templates/nexus/admin/change_list.html
@@ -1,4 +1,5 @@
{% extends "nexus/admin/base_site.html" %}
{% load url from future %}
{% load adminmedia admin_list i18n %}

{% block head %}
Expand All @@ -7,7 +8,7 @@
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />
{% endif %}
{% if cl.formset or action_form %}
{% url admin:jsi18n as jsi18nurl %}
{% url 'admin:jsi18n' as jsi18nurl %}
<script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script>
{% endif %}
{{ media.css }}
Expand Down

0 comments on commit 7040278

Please sign in to comment.