Projet

Général

Profil

0001-templates-output-form.media-in-base-template-24439.patch

Benjamin Dauvergne, 20 juillet 2018 15:48

Télécharger (2,36 ko)

Voir les différences:

Subject: [PATCH 1/9] templates: output form.media in base template (#24439)

It's the new habit downstream.
 .../templates/authentic2/accounts_edit.html           | 10 ----------
 src/authentic2/templates/authentic2/base.html         |  2 ++
 .../registration/registration_completion_form.html    | 11 -----------
 3 files changed, 2 insertions(+), 21 deletions(-)
src/authentic2/templates/authentic2/accounts_edit.html
1 1
{% extends "authentic2/base-page.html" %}
2 2
{% load i18n %}
3 3

  
4
{% block css %}
5
{{ block.super }}
6
{{ form.media.css }}
7
{% endblock %}
8

  
9
{% block extra_scripts %}
10
{{ block.super }}
11
{{ form.media.js }}
12
{% endblock %}
13

  
14 4
{% block page-title %}
15 5
  {{ block.super }} - {{ view.title }}
16 6
{% endblock %}
src/authentic2/templates/authentic2/base.html
9 9
  {{ block.super }}
10 10
  <link rel="stylesheet" href="{{ STATIC_URL }}authentic2/css/style.css" />
11 11
  {% renderblock "css" %}
12
  {{ form.media.css }}
12 13
{% endblock %}
13 14

  
14 15
{% block extrascripts %}
15 16
  {{ block.super }}
17
  {{ form.media.js }}
16 18
  {% comment %}block extra_scripts is kept for compatibility with old themes{% endcomment %}
17 19
  {% block extra_scripts %}
18 20
  {% endblock %}
src/authentic2/templates/registration/registration_completion_form.html
2 2
{% load i18n %}
3 3
{% load breadcrumbs %}
4 4

  
5
{% block css %}
6
{{ block.super }}
7
{{ form.media.css }}
8
{% endblock %}
9

  
10
{% block extra_scripts %}
11
{{ block.super }}
12
{{ form.media.js }}
13
{% endblock %}
14

  
15

  
16 5
{% block title %}
17 6
    {% trans "Registration" %}
18 7
{% endblock %}
19
-