Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-09 09:30:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate {% load staticfiles %} and {% load admin_static %}

Browse source 
These are removed in Django 3.0 in favour of `{% load static %}`
This commit is contained in:
Matt Westcott 2018-10-26 13:35:08 +02:00 committed by Matt Westcott
parent d66f34692e
commit 183b626dc3
31 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/advanced_topics/customisation/admin_templates.rst
View file

@ -34,7 +34,7 @@ To replace the default logo, create a template file ``dashboard/templates/wagtai
.. code-block:: html+django
{% extends "wagtailadmin/base.html" %}
{% load staticfiles %}
{% load static %}
{% block branding_logo %}
<img src="{% static 'images/custom-logo.svg' %}" alt="Custom Project" width="80" />
@ -50,7 +50,7 @@ To replace the favicon displayed when viewing admin pages, create a template fil
.. code-block:: html+django
{% extends "wagtailadmin/admin_base.html" %}
{% load staticfiles %}
{% load static %}
{% block branding_favicon %}
<link rel="shortcut icon" href="{% static 'images/favicon.ico' %}" />

2
wagtail/admin/templates/wagtailadmin/404.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/admin_base.html" %}
{% load wagtailadmin_tags wagtailcore_tags staticfiles i18n %}
{% load wagtailadmin_tags wagtailcore_tags static i18n %}
{% block titletag %}{% trans "Error 404: Page not found" %}{% endblock %}

2
wagtail/admin/templates/wagtailadmin/account/password_reset/complete.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/admin_base.html" %}
{% load staticfiles i18n %}
{% load static i18n %}
{% block titletag %}{% trans "Reset password" %}{% endblock %}
{% block bodyclass %}login{% endblock %}

2
wagtail/admin/templates/wagtailadmin/account/password_reset/confirm.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/admin_base.html" %}
{% load staticfiles i18n %}
{% load static i18n %}
{% block titletag %}
{% if validlink %}
{% trans "Set your new password" %}

2
wagtail/admin/templates/wagtailadmin/account/password_reset/done.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/admin_base.html" %}
{% load staticfiles i18n %}
{% load static i18n %}
{% block titletag %}{% trans "Reset password" %}{% endblock %}
{% block bodyclass %}login{% endblock %}

2
wagtail/admin/templates/wagtailadmin/account/password_reset/form.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/admin_base.html" %}
{% load staticfiles i18n %}
{% load static i18n %}
{% block titletag %}{% trans "Reset password" %}{% endblock %}
{% block bodyclass %}login{% endblock %}

2
wagtail/admin/templates/wagtailadmin/admin_base.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/skeleton.html" %}
{% load i18n staticfiles wagtailadmin_tags %}
{% load i18n static wagtailadmin_tags %}
{% block css %}
<link rel="stylesheet" href="{% static 'wagtailadmin/css/vendor/jquery-ui/jquery-ui-1.10.3.verdant.css' %}" />

2
wagtail/admin/templates/wagtailadmin/base.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/admin_base.html" %}
{% load wagtailadmin_tags wagtailcore_tags staticfiles i18n %}
{% load wagtailadmin_tags wagtailcore_tags static i18n %}
{% block furniture %}
<div class="nav-wrapper">

2
wagtail/admin/templates/wagtailadmin/home.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailadmin_tags staticfiles i18n %}
{% load wagtailadmin_tags static i18n %}
{% block titletag %}{% trans "Dashboard" %}{% endblock %}
{% block bodyclass %}homepage{% endblock %}

2
wagtail/admin/templates/wagtailadmin/home/upgrade_notification.html
View file

@ -1,4 +1,4 @@
{% load wagtailcore_tags staticfiles %}
{% load wagtailcore_tags static %}
<div class="panel nice-padding panel-upgrade-notification" style="display:none">
<div class="help-block help-warning">Wagtail upgrade available. Your version: <strong>{% wagtail_version %}</strong>. New version: <strong class="newversion"></strong>. <a class="releasenotes-link" href="">Read the release notes.</a></div>

2
wagtail/admin/templates/wagtailadmin/login.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/admin_base.html" %}
{% load staticfiles i18n %}
{% load static i18n %}
{% block titletag %}{% trans "Sign in" %}{% endblock %}
{% block bodyclass %}login{% endblock %}

2
wagtail/admin/templates/wagtailadmin/notifications/base.html
View file

@ -1,4 +1,4 @@
{% load i18n staticfiles %}
{% load i18n static %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

2
wagtail/admin/templates/wagtailadmin/pages/_editor_css.html
View file

@ -1,4 +1,4 @@
{% load wagtailadmin_tags staticfiles %}
{% load wagtailadmin_tags static %}
{% comment %}
CSS declarations to be included on the 'create page' and 'edit page' views

2
wagtail/admin/templates/wagtailadmin/pages/_editor_js.html
View file

@ -1,4 +1,4 @@
{% load wagtailadmin_tags staticfiles %}
{% load wagtailadmin_tags static %}
{% comment %}
Javascript declarations to be included on the 'create page' and 'edit page' views

2
wagtail/admin/templates/wagtailadmin/pages/index.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailadmin_tags staticfiles i18n %}
{% load wagtailadmin_tags static i18n %}
{% block titletag %}{% blocktrans with title=parent_page.get_admin_display_title %}Exploring {{ title }}{% endblocktrans %}{% endblock %}
{% block bodyclass %}page-explorer {% if ordering == 'ord' %}reordering{% endif %}{% endblock %}

2
wagtail/admin/templates/wagtailadmin/shared/animated_logo.html
View file

@ -1,4 +1,4 @@
{% load wagtailadmin_tags staticfiles %}
{% load wagtailadmin_tags static %}
<div class="wagtail-logo-container__desktop u-hidden@small">
<img class="wagtail-logo wagtail-logo__body" src="{% static 'wagtailadmin/images/logo-body.svg' %}" alt=""/>

2
wagtail/admin/templates/wagtailadmin/skeleton.html
View file

@ -1,5 +1,5 @@
<!doctype html>
{% load staticfiles i18n %}
{% load static i18n %}
<html class="no-js" lang="{{ LANGUAGE_CODE|default:"en-gb" }}">
<head>
<meta charset="utf-8" />

2
wagtail/admin/templates/wagtailadmin/userbar/base.html
View file

@ -1,4 +1,4 @@
{% load staticfiles i18n %}
{% load static i18n %}
<!-- Wagtail user bar embed code -->
<div class="wagtail-userbar-reset">
<div class="wagtail-userbar wagtail-userbar--{{ position|default:'bottom-right' }}" data-wagtail-userbar>

2
wagtail/contrib/modeladmin/templates/modeladmin/choose_parent.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load i18n modeladmin_tags admin_static %}
{% load i18n modeladmin_tags static %}
{% block titletag %}{{ view.get_meta_title }}{% endblock %}

2
wagtail/contrib/modeladmin/templates/modeladmin/includes/search_form.html
View file

@ -1,4 +1,4 @@
{% load i18n admin_static %}
{% load i18n static %}
{% if view.search_fields %}
<form id="changelist-search" class="col search-form" action="{{ view.index_url }}" method="get">
<ul class="fields">

2
wagtail/contrib/modeladmin/templates/modeladmin/inspect.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load i18n admin_static %}
{% load i18n static %}
{% block titletag %}{{ view.get_meta_title }}{% endblock %}

2
wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/add.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load i18n staticfiles %}
{% load i18n static %}
{% block titletag %}{% trans "Add search promotion" %}{% endblock %}
{% block content %}
{% trans "Add search pick" as add_str %}

2
wagtail/contrib/search_promotions/templates/wagtailsearchpromotions/edit.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load i18n staticfiles %}
{% load i18n static %}
{% block titletag %}{% blocktrans with query=query.query_string %}Editing {{ query }}{% endblocktrans %}{% endblock %}
{% block content %}
{% trans "Editing" as editing_str %}

2
wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailadmin_tags i18n staticfiles %}
{% load wagtailadmin_tags i18n static %}
{% block extra_css %}
{{ block.super }}

2
wagtail/documents/templates/wagtaildocs/multiple/add.html
View file

@ -1,7 +1,7 @@
{% extends "wagtailadmin/base.html" %}
{% load i18n %}
{% load l10n %}
{% load staticfiles %}
{% load static %}
{% block titletag %}{% trans "Add multiple documents" %}{% endblock %}
{% block extra_css %}
{{ block.super }}

2
wagtail/images/templates/wagtailimages/images/edit.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailimages_tags wagtailadmin_tags staticfiles i18n l10n %}
{% load wagtailimages_tags wagtailadmin_tags static i18n l10n %}
{% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}
{% block extra_css %}
{{ block.super }}

2
wagtail/images/templates/wagtailimages/images/url_generator.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailimages_tags staticfiles i18n %}
{% load wagtailimages_tags static i18n %}
{% block titletag %}{% blocktrans with title=image.title %}Editing image {{ title }}{% endblocktrans %}{% endblock %}

2
wagtail/images/templates/wagtailimages/multiple/add.html
View file

@ -1,7 +1,7 @@
{% extends "wagtailadmin/base.html" %}
{% load i18n %}
{% load l10n %}
{% load staticfiles %}
{% load static %}
{% load wagtailimages_tags %}
{% block titletag %}{% trans "Add multiple images" %}{% endblock %}
{% block extra_css %}

2
wagtail/users/templates/wagtailusers/groups/create.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailusers_tags wagtailimages_tags staticfiles i18n %}
{% load wagtailusers_tags wagtailimages_tags static i18n %}
{% block titletag %}{% trans "Add group" %}{% endblock %}

2
wagtail/users/templates/wagtailusers/groups/edit.html
View file

@ -1,5 +1,5 @@
{% extends "wagtailadmin/base.html" %}
{% load wagtailusers_tags staticfiles i18n %}
{% load wagtailusers_tags static i18n %}
{% block titletag %}{% trans "Editing" %} {{ group.name }}{% endblock %}

2
wagtail/users/templates/wagtailusers/groups/includes/group_form_js.html
View file

@ -1,4 +1,4 @@
{% load staticfiles %}
{% load static %}
<script>
window.chooserUrls = {
'pageChooser': '{% url "wagtailadmin_choose_page" %}'