Project

General

Profile

0002-templates-replace-STATIC_URL-by-static-directive-578.patch

Benjamin Dauvergne, 14 Oct 2021 12:06 PM

Download (3.23 KB)

View differences:

Subject: [PATCH 2/2] templates: replace STATIC_URL by static directive
 (#57851)

 combo/apps/assets/templates/combo/manager_assets_browse.html | 2 +-
 combo/apps/pwa/templates/combo/pwa/manager_base.html         | 2 +-
 combo/manager/templates/combo/manager_base.html              | 2 +-
 combo/public/templates/combo/page_template.html              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
combo/apps/assets/templates/combo/manager_assets_browse.html
2 2
{% load static i18n %}
3 3

  
4 4
{% block css %}
5
<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/combo.manager.css"/>
5
<link rel="stylesheet" type="text/css" media="all" href="{% static "css/combo.manager.css" %}"/>
6 6
{% endblock %}
7 7

  
8 8
{% block extrascripts %}
combo/apps/pwa/templates/combo/pwa/manager_base.html
3 3

  
4 4
{% block css %}
5 5
{{ block.super }}
6
<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/combo.manager.pwa.css"/>
6
<link rel="stylesheet" type="text/css" media="all" href="{% static "css/combo.manager.pwa.css" %}"/>
7 7
{% endblock %}
8 8

  
9 9
{% block appbar %}
combo/manager/templates/combo/manager_base.html
2 2
{% load static i18n %}
3 3

  
4 4
{% block css %}
5
<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/combo.manager.css"/>
5
<link rel="stylesheet" type="text/css" media="all" href="{% static "css/combo.manager.css" %}"/>
6 6
<link rel="stylesheet" type="text/css" media="all" href="{% static "xstatic/leaflet.css" %}"/>
7 7
<link rel="stylesheet" type="text/css" media="all" href="{% static "css/combo.map.css" %}"/>
8 8
{% endblock %}
combo/public/templates/combo/page_template.html
6 6
  <meta name="description" content="{{ page.description}}" />
7 7
 {% endif %}
8 8
  <title>Combo - {{ page.title }}</title>
9
  <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/combo-style.css"/>
9
  <link rel="stylesheet" type="text/css" media="all" href="{% static "css/combo-style.css" %}"/>
10 10
  <script src="{% xstatic 'jquery' 'jquery.min.js' %}"></script>
11
  <script src="{{ STATIC_URL }}js/combo.public.js"></script>
11
  <script src="{% static "js/combo.public.js" %}"></script>
12 12
  {{ media }}
13 13
 </head>
14 14
 <body class="page-{{ page.slug }}"
15
-