Briq
/
django-admin-sortable-fixwin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44 from acgray/master 

Use {% static %} tag instead of STATIC_URL, which no longer exists in Django 1.5
master
Brandon Taylor 2013-06-26 06:58:34 -07:00
parent b3fd59da02 6f279b1b8e
commit 37ebbf0dde
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
adminsortable/templates/adminsortable/change_form.html
View File

@ -1,6 +1,7 @@
{% extends change_form_template_extends %} {% extends change_form_template_extends %}
{% load i18n admin_modify %} {% load i18n admin_modify %}
{% load url from future %} {% load url from future %}
{% load static from staticfiles %}
{% block extrahead %} {% block extrahead %}
{{ block.super }} {{ block.super }}
@ -10,19 +11,19 @@
{% include sortable_javascript_includes_template with inlines=True %} {% include sortable_javascript_includes_template with inlines=True %}
{% endif %} {% endif %}
{% if has_sortable_tabular_inlines %} {% if has_sortable_tabular_inlines %}
<script type="text/javascript" src="{{ STATIC_URL }}adminsortable/js/admin.sortable.tabular.inlines.js"></script> <script type="text/javascript" src="{% static 'adminsortable/js/admin.sortable.tabular.inlines.js' %}"></script>
{% endif %} {% endif %}
{% if has_sortable_stacked_inlines %} {% if has_sortable_stacked_inlines %}
<script type="text/javascript" src="{{ STATIC_URL }}adminsortable/js/admin.sortable.stacked.inlines.js"></script> <script type="text/javascript" src="{% static 'adminsortable/js/admin.sortable.stacked.inlines.js' %}"></script>
{% endif %} {% endif %}
{% if has_sortable_stacked_inlines %} {% if has_sortable_stacked_inlines %}
<script type="text/javascript" src="{{ STATIC_URL }}adminsortable/js/jquery.effects.core.js"></script> <script type="text/javascript" src="{% static 'adminsortable/js/jquery.effects.core.js' %}"></script>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block extrastyle %} {% block extrastyle %}
{{ block.super }} {{ block.super }}
{% if has_sortable_tabular_inlines or has_sortable_stacked_inlines %} {% if has_sortable_tabular_inlines or has_sortable_stacked_inlines %}
<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}adminsortable/css/admin.sortable.inline.css" /> <link rel="stylesheet" type="text/css" href="{% static 'adminsortable/css/admin.sortable.inline.css' %}" />
{% endif %} {% endif %}
{% endblock %} {% endblock %}

5
adminsortable/templates/adminsortable/change_list.html
View File

@ -1,15 +1,16 @@
{% extends 'admin/change_list.html' %} {% extends 'admin/change_list.html' %}
{% load admin_list i18n adminsortable_tags %} {% load admin_list i18n adminsortable_tags %}
{% load static from staticfiles %}
{% block extrastyle %} {% block extrastyle %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{{ STATIC_URL }}adminsortable/css/admin.sortable.css" /> <link rel="stylesheet" href="{% static 'adminsortable/css/admin.sortable.css' %}" />
{% endblock %} {% endblock %}
{% block extrahead %} {% block extrahead %}
{{ block.super }} {{ block.super }}
{% include sortable_javascript_includes_template %} {% include sortable_javascript_includes_template %}
<script type="text/javascript" src="{{ STATIC_URL }}adminsortable/js/admin.sortable.js"></script> <script type="text/javascript" src="{% static 'adminsortable/js/admin.sortable.js' %}"></script>
{% endblock %} {% endblock %}
{% block title %}{% blocktrans with opts.verbose_name_plural|capfirst as model %}Drag and drop {{ model }} to change display order{% endblocktrans %} | {% trans 'Django site admin' %}{% endblock %} {% block title %}{% blocktrans with opts.verbose_name_plural|capfirst as model %}Drag and drop {{ model }} to change display order{% endblocktrans %} | {% trans 'Django site admin' %}{% endblock %}

5
adminsortable/templates/adminsortable/edit_inline/stacked.html
View File

@ -1,4 +1,5 @@
{% load i18n admin_modify adminsortable_tags %} {% load i18n admin_modify adminsortable_tags %}
{% load static from staticfiles %}
<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group"> <div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
<h2>{{ inline_admin_formset.opts.verbose_name_plural|title }} {% if inline_admin_formset.formset.initial_form_count > 1 %} - drag and drop to change order{% endif %}</h2> <h2>{{ inline_admin_formset.opts.verbose_name_plural|title }} {% if inline_admin_formset.formset.initial_form_count > 1 %} - drag and drop to change order{% endif %}</h2>
{{ inline_admin_formset.formset.management_form }} {{ inline_admin_formset.formset.management_form }}
@ -43,11 +44,11 @@
if (typeof SelectFilter != "undefined"){ if (typeof SelectFilter != "undefined"){
$(".selectfilter").each(function(index, value){ $(".selectfilter").each(function(index, value){
var namearr = value.name.split('-'); var namearr = value.name.split('-');
SelectFilter.init(value.id, namearr[namearr.length-1], false, "{{ STATIC_URL }}admin/"); SelectFilter.init(value.id, namearr[namearr.length-1], false, "{% static 'admin/' %}");
}); });
$(".selectfilterstacked").each(function(index, value){ $(".selectfilterstacked").each(function(index, value){
var namearr = value.name.split('-'); var namearr = value.name.split('-');
SelectFilter.init(value.id, namearr[namearr.length-1], true, "{{ STATIC_URL }}admin/"); SelectFilter.init(value.id, namearr[namearr.length-1], true, "{% static 'admin/' %}");
}); });
} }
} }

5
adminsortable/templates/adminsortable/edit_inline/tabular.html
View File

@ -1,4 +1,5 @@
{% load i18n admin_modify adminsortable_tags %} {% load i18n admin_modify adminsortable_tags %}
{% load static from staticfiles %}
<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group"> <div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
<div class="tabular inline-related {% if forloop.last %}last-related{% endif %}"> <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
{{ inline_admin_formset.formset.management_form }} {{ inline_admin_formset.formset.management_form }}
@ -90,11 +91,11 @@
if (typeof SelectFilter != "undefined"){ if (typeof SelectFilter != "undefined"){
$(".selectfilter").each(function(index, value){ $(".selectfilter").each(function(index, value){
var namearr = value.name.split('-'); var namearr = value.name.split('-');
SelectFilter.init(value.id, namearr[namearr.length-1], false, "{{ STATIC_URL }}admin/"); SelectFilter.init(value.id, namearr[namearr.length-1], false, "{% static 'admin/' %}");
}); });
$(".selectfilterstacked").each(function(index, value){ $(".selectfilterstacked").each(function(index, value){
var namearr = value.name.split('-'); var namearr = value.name.split('-');
SelectFilter.init(value.id, namearr[namearr.length-1], true, "{{ STATIC_URL }}admin/"); SelectFilter.init(value.id, namearr[namearr.length-1], true, "{% static 'admin/' %}");
}); });
} }
} }