templates: "load staticfiles" is deprecated in favor of "load static"

jelly · jelly · commit 037856215908 · 2020-04-08T22:07:52.000+02:00
Signed-off-by: Jelle van der Waa &lt;jelle@archlinux.org&gt;
diff --git a/templates/admin/index.html b/templates/admin/index.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static %}
+{% load i18n static %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />{% endblock %}
 
diff --git a/templates/base.html b/templates/base.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}<!DOCTYPE html>
+{% load static %}<!DOCTYPE html>
 {% load group %}
 <html lang="en">
 <head>
diff --git a/templates/devel/admin_log.html b/templates/devel/admin_log.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static %}
+{% load i18n static %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />{% endblock %}
 
diff --git a/templates/devel/clock.html b/templates/devel/clock.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load flags %}
 {% load tz %}
 
diff --git a/templates/devel/index.html b/templates/devel/index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load cache %}
 {% load package_extras %}
 {% load todolists %}
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load attributes %}
 {% load package_extras %}
 
diff --git a/templates/devel/profile.html b/templates/devel/profile.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Edit Profile{% endblock %}
 
diff --git a/templates/mirrors/mirror_details.html b/templates/mirrors/mirror_details.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load mirror_status %}
 {% load admin_urls %}
 
diff --git a/templates/mirrors/mirrors.html b/templates/mirrors/mirrors.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load flags %}
 
 {% block title %}Arch Linux - Mirror Overview{% endblock %}
diff --git a/templates/mirrors/status.html b/templates/mirrors/status.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load mirror_status %}
 
 {% block title %}Arch Linux - Mirror Status{% if tier != None %} - Tier {{ tier }}{% endif %}{% endblock %}
diff --git a/templates/mirrors/url_details.html b/templates/mirrors/url_details.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load mirror_status %}
 {% load flags %}
 
diff --git a/templates/news/add.html b/templates/news/add.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% block title %}Arch Linux - News: {% if form.instance.id %}Edit{% else %}Add{% endif %} Article{% endblock %}
 
 {% block content %}
diff --git a/templates/packages/details.html b/templates/packages/details.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.full_version }} ({{ pkg.arch.name }}){% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load package_extras %}
 
 {% block title %}Arch Linux - Package Differences Reports{% endblock %}
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}<!DOCTYPE html>
+{% load static %}<!DOCTYPE html>
 <html lang="en">
     <head>
         <title>Flagging Packages</title>
diff --git a/templates/packages/groups.html b/templates/packages/groups.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Package Groups{% if arch %} - {{ arch }}{% endif %}{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}<?xml version="1.0" encoding="UTF-8"?>
+{% load static %}<?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
 	<ShortName>Arch Packages</ShortName>
 	<LongName>Arch Linux Package Repository Search</LongName>
diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load package_extras %}
 
 {% block title %}Arch Linux - {{ name }} ({{ arch.name }}) - {{ list_title }}{% endblock %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load package_extras %}
 
 {% block title %}Arch Linux - Package Signoffs{% endblock %}
diff --git a/templates/packages/stale_relations.html b/templates/packages/stale_relations.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Stale Package Relations{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
diff --git a/templates/planet/index.html b/templates/planet/index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load cache %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block head %}
 <link rel="alternate" type="application/rss+xml" title="Arch Linux Planet" href="{% url 'planet-feed' %}" />
diff --git a/templates/public/art.html b/templates/public/art.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Artwork{% endblock %}
 
diff --git a/templates/public/donate.html b/templates/public/donate.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load cache %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Donate{% endblock %}
 
diff --git a/templates/public/download.html b/templates/public/download.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load cache %}
-{% load static from staticfiles %}
+{% load static %}
 {% load flags %}
 
 {% block title %}Arch Linux - Downloads{% endblock %}
diff --git a/templates/public/index.html b/templates/public/index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load cache %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block head %}
 <link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="/feeds/news/" />
diff --git a/templates/public/keys.html b/templates/public/keys.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load pgp %}
 
 {% block title %}Arch Linux - Master Signing Keys{% endblock %}
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load cache %}
 
 {% block title %}Arch Linux - {{ group.name }}{% endblock %}
diff --git a/templates/registration/login.html b/templates/registration/login.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Developer Login{% endblock %}
 
diff --git a/templates/releng/netboot.html b/templates/releng/netboot.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Netboot{% endblock %}
 
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Releases{% endblock %}
 
diff --git a/templates/todolists/list.html b/templates/todolists/list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Todo Lists{% endblock %}
 
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 {% load package_extras %}
 {% load todolists %}
 
diff --git a/templates/visualize/index.html b/templates/visualize/index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static from staticfiles %}
+{% load static %}
 
 {% block title %}Arch Linux - Visualizations{% endblock %}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% load static from staticfiles %}<!DOCTYPE html>`
	`1`	`+{% load static %}<!DOCTYPE html>`
`2`	`2`	`{% load group %}`
`3`	`3`	`<html lang="en">`
`4`	`4`	`<head>`