Merge branch 'master' into html5

matthiask · web-flow · commit 8eacd07bebe4 · 2018-01-23T09:29:46.000+01:00
diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/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 %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/profiling.html b/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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/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 %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_explain.html b/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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_profile.html b/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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql_select.html b/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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/staticfiles.html b/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 %}
diff --git a/debug_toolbar/templates/debug_toolbar/panels/templates.html b/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>
diff --git a/debug_toolbar/templates/debug_toolbar/panels/timer.html b/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>
diff --git a/example/urls.py b/example/urls.py
@@ -8,7 +8,7 @@
     url(r'^jquery/$', TemplateView.as_view(template_name='jquery/index.html')),
     url(r'^mootools/$', TemplateView.as_view(template_name='mootools/index.html')),
     url(r'^prototype/$', TemplateView.as_view(template_name='prototype/index.html')),
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]
 
 if settings.DEBUG:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% load i18n %}{% load static from staticfiles %}`
	`1`	`+{% load i18n %}{% load static %}`
`2`	`2`	`<link rel="stylesheet" href="{% static 'debug_toolbar/css/print.css' %}" type="text/css" media="print">`
`3`	`3`	`<link rel="stylesheet" href="{% static 'debug_toolbar/css/toolbar.css' %}" type="text/css">`
`4`	`4`	`{% if toolbar.config.JQUERY_URL %}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% load i18n l10n %}{% load static from staticfiles %}`
	`1`	`+{% load i18n l10n %}{% load static %}`
`2`	`2`	`<div class="djdt-clearfix">`
`3`	`3`	`<ul class="djdt-stats">`
`4`	`4`	`{% for alias, info in databases %}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% load i18n %}{% load static from staticfiles%}`
	`1`	`+{% load i18n %}`
`2`	`2`
`3`	`3`	`<h4>{% blocktrans count staticfiles_dirs\|length as dirs_count %}Static file path{% plural %}Static file paths{% endblocktrans %}</h4>`
`4`	`4`	`{% if staticfiles_dirs %}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`url(r'^jquery/$', TemplateView.as_view(template_name='jquery/index.html')),`
`9`	`9`	`url(r'^mootools/$', TemplateView.as_view(template_name='mootools/index.html')),`
`10`	`10`	`url(r'^prototype/$', TemplateView.as_view(template_name='prototype/index.html')),`
`11`		`- url(r'^admin/', include(admin.site.urls)),`
	`11`	`+ url(r'^admin/', admin.site.urls),`
`12`	`12`	`]`
`13`	`13`
`14`	`14`	`if settings.DEBUG:`