Merge pull request #1036 from jdufresne/staticfiles

In templates, load "static" templatetag instead of "staticfiles"

Author: matthiask

debug_toolbar/templates/debug_toolbar/base.html

@@ -1,4 +1,4 @@
-{% load i18n %}{% load static from staticfiles %}
+{% load i18n %}{% load static %}
 <link rel="stylesheet" href="{% static 'debug_toolbar/css/print.css' %}" type="text/css" media="print" />
 <link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}" type="text/css" />
 {% if toolbar.config.JQUERY_URL %}

debug_toolbar/templates/debug_toolbar/panels/profiling.html

@@ -1,4 +1,4 @@
-{% load i18n %}{% load static from staticfiles %}
+{% load i18n %}{% load static %}
 <table width="100%">
 	<thead>
 		<tr>

debug_toolbar/templates/debug_toolbar/panels/sql.html

@@ -1,4 +1,4 @@
-{% load i18n l10n %}{% load static from staticfiles %}
+{% load i18n l10n %}{% load static %}
 <div class="djdt-clearfix">
 	<ul class="djdt-stats">
 		{% for alias, info in databases %}

debug_toolbar/templates/debug_toolbar/panels/sql_explain.html

@@ -1,4 +1,4 @@
-{% load i18n %}{% load static from staticfiles %}
+{% load i18n %}{% load static %}
 <div class="djDebugPanelTitle">
 	<a class="djDebugClose djDebugBack" href=""></a>
 	<h3>{% trans "SQL explained" %}</h3>

debug_toolbar/templates/debug_toolbar/panels/sql_profile.html

@@ -1,4 +1,4 @@
-{% load i18n %}{% load static from staticfiles %}
+{% load i18n %}{% load static %}
 <div class="djDebugPanelTitle">
 	<a class="djDebugClose djDebugBack" href=""></a>
 	<h3>{% trans "SQL profiled" %}</h3>

debug_toolbar/templates/debug_toolbar/panels/sql_select.html

@@ -1,4 +1,4 @@
-{% load i18n %}{% load static from staticfiles %}
+{% load i18n %}{% load static %}
 <div class="djDebugPanelTitle">
 	<a class="djDebugClose djDebugBack" href=""></a>
 	<h3>{% trans "SQL selected" %}</h3>

debug_toolbar/templates/debug_toolbar/panels/staticfiles.html

@@ -1,4 +1,4 @@
-{% load i18n %}{% load static from staticfiles%}
+{% load i18n %}
 
 <h4>{% blocktrans count staticfiles_dirs|length as dirs_count %}Static file path{% plural %}Static file paths{% endblocktrans %}</h4>
 {% if staticfiles_dirs %}

debug_toolbar/templates/debug_toolbar/panels/templates.html

@@ -1,4 +1,4 @@
-{% load i18n %}{% load static from staticfiles %}
+{% load i18n %}{% load static %}
 <h4>{% blocktrans count template_dirs|length as template_count %}Template path{% plural %}Template paths{% endblocktrans %}</h4>
 {% if template_dirs %}
 	<ol>

debug_toolbar/templates/debug_toolbar/panels/timer.html

@@ -1,4 +1,4 @@
-{% load i18n %}{% load static from staticfiles %}
+{% load i18n %}{% load static %}
 <h4>{% trans "Resource usage" %}</h4>
 <table>
 	<colgroup>