Projet

Général

Profil

0001-templates-simplify-extends-paths-as-it-is-now-possib.patch

Frédéric Péters, 19 mai 2019 13:41

Télécharger (24,2 ko)

Voir les différences: 

Subject: [PATCH] templates: simplify {% extends %} paths as it is now possible
 with 1.11 (#33236)


 debian/control                                                  | 2 +-
 templates/variants/alpes-maritimes-2018/authentic2/login.html   | 2 +-
 templates/variants/alpes-maritimes-2018/theme.html              | 2 +-
 templates/variants/amiens-metropole/theme.html                  | 2 +-
 templates/variants/blois-2018/combo/page_template.html          | 2 +-
 templates/variants/bouches-du-rhone/authentic2/accounts.html    | 2 +-
 templates/variants/bouches-du-rhone/theme.html                  | 2 +-
 templates/variants/entrouvert/combo/page_template.html          | 2 +-
 templates/variants/fontenay-sous-bois-2018/theme.html           | 2 +-
 templates/variants/grandlyon-gnm/combo/page_template.html       | 2 +-
 templates/variants/grandlyon-gnm/theme.html                     | 2 +-
 templates/variants/grandlyon/theme.html                         | 2 +-
 templates/variants/grenoble-metropole-2019/authentic2/base.html | 2 +-
 .../grenoble-metropole-2019/registration/registration_form.html | 2 +-
 templates/variants/grenoble-metropole/authentic2/base.html      | 2 +-
 .../grenoble-metropole/registration/registration_form.html      | 2 +-
 templates/variants/haute-garonne-cd31/authentic2/accounts.html  | 2 +-
 templates/variants/haute-garonne-cd31/combo/page_template.html  | 2 +-
 .../variants/hautes-alpes-2018/combo/page_template_neutre.html  | 2 +-
 templates/variants/lille/authentic2/accounts.html               | 2 +-
 templates/variants/lille/combo/page_template.html               | 2 +-
 templates/variants/mauguio/theme.html                           | 2 +-
 templates/variants/metz-metropole/theme.html                    | 2 +-
 templates/variants/montpellier/authentic2/accounts.html         | 2 +-
 templates/variants/moselle/combo/page_template.html             | 2 +-
 .../variants/nanterre/authentic2/password_change_body.html      | 2 +-
 templates/variants/nanterre/authentic2/password_change_body.txt | 2 +-
 templates/variants/orleans/theme.html                           | 2 +-
 templates/variants/pre-saint-gervais/authentic2/login.html      | 2 +-
 templates/variants/pre-saint-gervais/combo/page_template.html   | 2 +-
 templates/variants/pre-saint-gervais/theme.html                 | 2 +-
 templates/variants/quimper/authentic2/accounts.html             | 2 +-
 templates/variants/quimper/authentic2/login.html                | 2 +-
 templates/variants/rochefort/theme.html                         | 2 +-
 templates/variants/strasbourg-2018/authentic2/login.html        | 2 +-
 .../strasbourg-2018/authentic2/password_change_body.html        | 2 +-
 .../strasbourg-2018/authentic2/password_change_body.txt         | 2 +-
 templates/variants/toodego/combo/page_template.html             | 2 +-
 templates/variants/toodego/theme.html                           | 2 +-
 templates/variants/toulouse/authentic2/accounts.html            | 2 +-
 templates/variants/toulouse/authentic2/login.html               | 2 +-
 templates/variants/toulouse/registration/registration_form.html | 2 +-
 templates/variants/toulouse/theme.html                          | 2 +-
 templates/variants/venissieux/theme.html                        | 2 +-
 templates/variants/villeurbanne-2018/authentic2/base.html       | 2 +-
 templates/variants/villeurbanne-2018/combo/page_template.html   | 2 +-
 templates/variants/vincennes-2018/theme.html                    | 2 +-
 47 files changed, 47 insertions(+), 47 deletions(-)
debian/control
9 9 
Package: publik-base-theme
10 10 
Architecture: all
11 11 
Depends: ${shlibs:Depends}, ${misc:Depends}, python-gadjo, python-xstatic-abrilfatface
12 
Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0)
12 
Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0), python-django (<= 1:1.11)
13 13 
Breaks: combo (< 0.7.1)
14 14 
Description: Publik Base Theme
templates/variants/alpes-maritimes-2018/authentic2/login.html
1 
{% extends "../../authentic2/login.html" %}
1 
{% extends "authentic2/login.html" %}
2 2 

  		




  3
  3
  
    
{% block login-pre %}

  		




  4
  4
  
    
<div class="cell">

  		












  

    
      templates/variants/alpes-maritimes-2018/theme.html
    
  





  1
  
  
    
{% extends '../../theme.html' %}

  		




  
  1
  
    
{% extends 'theme.html' %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block header-post %}

  		




  4
  4
  
    
<div class="departement">

  		












  

    
      templates/variants/amiens-metropole/theme.html
    
  





  1
  
  
    
{% extends '../../theme.html' %}

  		




  
  1
  
    
{% extends 'theme.html' %}

  		




  2
  2
  
    
{% load static i18n combo gadjo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block extra_top_head %}

  		












  

    
      templates/variants/blois-2018/combo/page_template.html
    
  





  1
  
  
    
{% extends "../../combo/page_template.html" %}

  		




  
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block header-title %}

  		












  

    
      templates/variants/bouches-du-rhone/authentic2/accounts.html
    
  





  1
  
  
    
{% extends "../../authentic2/accounts.html" %}

  		




  
  1
  
    
{% extends "authentic2/accounts.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block account-management-bottom-actions %}

  		




  4
  4
  
    
<li><a href="{% url 'auth_logout' %}">Déconnecter</a></li>

  		












  

    
      templates/variants/bouches-du-rhone/theme.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    
{% load static %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block header-pre %}

  		












  

    
      templates/variants/entrouvert/combo/page_template.html
    
  





  1
  
  
    
{% extends '../../combo/page_template.html' %}

  		




  
  1
  
    
{% extends 'combo/page_template.html' %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block user-info %}

  		




  4
  4
  
    
<div id="le">

  		












  

    
      templates/variants/fontenay-sous-bois-2018/theme.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    
{% load static %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block header-pre %}

  		












  

    
      templates/variants/grandlyon-gnm/combo/page_template.html
    
  





  1
  
  
    
{% extends "../../combo/page_template.html" %}

  		




  
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block menu %}

  		












  

    
      templates/variants/grandlyon-gnm/theme.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    
{% load static gnm %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block extra_top_head %}

  		












  

    
      templates/variants/grandlyon/theme.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    
{% load static assets combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block bodyargs %}{% get_asset "header:background" as header_background %}class="{% if header_background %}has-header-background{% endif %} {% block bodyclasses %}{% endblock %}" {% block bodyattrs %}{% endblock %}{% endblock %}

  		












  

    
      templates/variants/grenoble-metropole-2019/authentic2/base.html
    
  





  1
  
  
    
{% extends '../../authentic2/base.html' %}

  		




  
  1
  
    
{% extends 'authentic2/base.html' %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block extra-top-head %}

  		




  4
  4
  
    
  {% block extrascripts %}

  		












  

    
      templates/variants/grenoble-metropole-2019/registration/registration_form.html
    
  





  1
  
  
    
{% extends '../../registration/registration_form.html' %}

  		




  
  1
  
    
{% extends 'registration/registration_form.html' %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block placeholder-content %}

  		




  4
  4
  
    

  		












  

    
      templates/variants/grenoble-metropole/authentic2/base.html
    
  





  1
  
  
    
{% extends '../../authentic2/base.html' %}

  		




  
  1
  
    
{% extends 'authentic2/base.html' %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block extra-top-head %}

  		




  4
  4
  
    
  {% block extrascripts %}

  		












  

    
      templates/variants/grenoble-metropole/registration/registration_form.html
    
  





  1
  
  
    
{% extends '../../registration/registration_form.html' %}

  		




  
  1
  
    
{% extends 'registration/registration_form.html' %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block placeholder-content %}

  		




  4
  4
  
    

  		












  

    
      templates/variants/haute-garonne-cd31/authentic2/accounts.html
    
  





  1
  
  
    
{% extends "../../authentic2/accounts.html" %}

  		




  
  1
  
    
{% extends "authentic2/accounts.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block account-management-bottom-actions %}

  		




  4
  4
  
    
<li><a href="{% url 'auth_logout' %}">Déconnecter</a></li>

  		












  

    
      templates/variants/haute-garonne-cd31/combo/page_template.html
    
  





  1
  
  
    
{% extends "../../combo/page_template.html" %}

  		




  
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block user-info %}

  		












  

    
      templates/variants/hautes-alpes-2018/combo/page_template_neutre.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% load static i18n combo gadjo %}

  		




  4
  4
  
    
{% block extra_top_head %}

  		












  

    
      templates/variants/lille/authentic2/accounts.html
    
  





  1
  
  
    
{% extends "../../authentic2/accounts.html" %}

  		




  
  1
  
    
{% extends "authentic2/accounts.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block account-management-bottom-actions %}

  		




  4
  4
  
    
<li><a href="{% url 'auth_logout' %}">Déconnecter</a></li>

  		












  

    
      templates/variants/lille/combo/page_template.html
    
  





  1
  
  
    
{% extends "../../combo/page_template.html" %}

  		




  
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block header-title %}

  		












  

    
      templates/variants/mauguio/theme.html
    
  





  1
  
  
    
{% extends '../../theme.html' %}

  		




  
  1
  
    
{% extends 'theme.html' %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block header-pre %}

  		




  4
  4
  
    
<a id="site-ville" href="https://www.mauguio-carnon.com/">Maugio Carnon</a>

  		












  

    
      templates/variants/metz-metropole/theme.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    
{% load static assets %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block header-title %}

  		












  

    
      templates/variants/montpellier/authentic2/accounts.html
    
  





  1
  
  
    
{% extends "../../authentic2/accounts.html" %}

  		




  
  1
  
    
{% extends "authentic2/accounts.html" %}

  		




  2
  2
  
    
{% load i18n staticfiles %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block extra-body-class %}authentic-page{% endblock %}

  		












  

    
      templates/variants/moselle/combo/page_template.html
    
  





  1
  
  
    
{% extends "../../combo/page_template.html" %}

  		




  
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block nav %}

  		












  

    
      templates/variants/nanterre/authentic2/password_change_body.html
    
  





  1
  
  
    
{% extends "../../authentic2/password_change_body.html" %}

  		




  
  1
  
    
{% extends "authentic2/password_change_body.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block warn_if_not_requested %}

  		




  4
  4
  
    
<p>

  		












  

    
      templates/variants/nanterre/authentic2/password_change_body.txt
    
  





  1
  
  
    
{% extends "../../authentic2/password_change_body.txt" %}

  		




  
  1
  
    
{% extends "authentic2/password_change_body.txt" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block warn_if_not_requested %}

  		




  4
  4
  
    
Si vous n'êtes pas à l'origine de cette demande, contactez-nous imédiatement

  		












  

    
      templates/variants/orleans/theme.html
    
  





  1
  
  
    
{% extends '../../theme.html' %}

  		




  
  1
  
    
{% extends 'theme.html' %}

  		




  2
  2
  
    
{% block header-top %}

  		




  3
  3
  
    
{% if metropole_url %}

  		




  4
  4
  
    
<div class="metropole-link"><a href="{{ metropole_url }}">Orléans-Métropole.fr</a></div>

  		












  

    
      templates/variants/pre-saint-gervais/authentic2/login.html
    
  





  1
  
  
    
{% extends "../../authentic2/login.html" %}

  		




  
  1
  
    
{% extends "authentic2/login.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block login-pre %}

  		




  4
  4
  
    
<div id="login-pre">

  		












  

    
      templates/variants/pre-saint-gervais/combo/page_template.html
    
  





  1
  
  
    
{% extends "../../combo/page_template.html" %}

  		




  
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block psg-mon-espace %}

  		












  

    
      templates/variants/pre-saint-gervais/theme.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    
{% load static %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block header-top %}

  		












  

    
      templates/variants/quimper/authentic2/accounts.html
    
  





  1
  
  
    
{% extends "../../authentic2/accounts.html" %}

  		




  
  1
  
    
{% extends "authentic2/accounts.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block account-management-bottom-actions %}

  		




  4
  4
  
    
<li><a href="{% url 'auth_logout' %}">Déconnecter</a></li>

  		












  

    
      templates/variants/quimper/authentic2/login.html
    
  





  1
  
  
    
{% extends "../../authentic2/login.html" %}

  		




  
  1
  
    
{% extends "authentic2/login.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block login-pre %}

  		




  4
  4
  
    
<h1 id="login-title">Se connecter<br> <span>avec mes identifiants Quimper+</span></h1>

  		












  

    
      templates/variants/rochefort/theme.html
    
  





  1
  
  
    
{% extends '../../theme.html' %}

  		




  
  1
  
    
{% extends 'theme.html' %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block header-title %}

  		




  4
  4
  
    
{{ block.super }}

  		












  

    
      templates/variants/strasbourg-2018/authentic2/login.html
    
  





  1
  
  
    
{% extends "../../authentic2/login.html" %}

  		




  
  1
  
    
{% extends "authentic2/login.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block login-bottom %}

  		




  4
  4
  
    
<div id="welcome-text">

  		












  

    
      templates/variants/strasbourg-2018/authentic2/password_change_body.html
    
  





  1
  
  
    
{% extends "../../authentic2/password_change_body.html" %}

  		




  
  1
  
    
{% extends "authentic2/password_change_body.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block warn_if_not_requested %}

  		




  4
  4
  
    
<p>

  		












  

    
      templates/variants/strasbourg-2018/authentic2/password_change_body.txt
    
  





  1
  
  
    
{% extends "../../authentic2/password_change_body.txt" %}

  		




  
  1
  
    
{% extends "authentic2/password_change_body.txt" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block warn_if_not_requested %}

  		




  4
  4
  
    
Si vous n'aviez pas demandé le changement de votre mot de passe, vous pouvez

  		












  

    
      templates/variants/toodego/combo/page_template.html
    
  





  1
  
  
    
{% extends "../../combo/page_template.html" %}

  		




  
  1
  
    
{% extends "combo/page_template.html" %}

  		




  2
  2
  
    
{% load combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block menu %}

  		












  

    
      templates/variants/toodego/theme.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    
{% load static gnm assets combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block extra_top_head %}

  		












  

    
      templates/variants/toulouse/authentic2/accounts.html
    
  





  1
  
  
    
{% extends "../../authentic2/accounts.html" %}

  		




  
  1
  
    
{% extends "authentic2/accounts.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block content %}

  		




  4
  4
  
    
<div id="title-section">

  		












  

    
      templates/variants/toulouse/authentic2/login.html
    
  





  1
  
  
    
{% extends "../../authentic2/login.html" %}

  		




  
  1
  
    
{% extends "authentic2/login.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block login-pre %}

  		




  4
  4
  
    
<div class="a2-block" id="registration-title"><h2>Se connecter</h2>

  		












  

    
      templates/variants/toulouse/registration/registration_form.html
    
  





  1
  
  
    
{% extends '../../registration/registration_form.html' %}

  		




  
  1
  
    
{% extends 'registration/registration_form.html' %}

  		




  2
  2
  
    
{% load i18n %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block registration-pre %}

  		












  

    
      templates/variants/toulouse/theme.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block content-pre %}

  		




  4
  4
  
    
<div id="actu">

  		












  

    
      templates/variants/venissieux/theme.html
    
  





  1
  
  
    
{% extends "../../theme.html" %}

  		




  
  1
  
    
{% extends "theme.html" %}

  		




  2
  2
  
    
{% load static %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block header-pre %}

  		












  

    
      templates/variants/villeurbanne-2018/authentic2/base.html
    
  





  1
  
  
    
{% extends "../../authentic2/base.html" %}

  		




  
  1
  
    
{% extends "authentic2/base.html" %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block user-info %}

  		




  4
  4
  
    
   {% include "user_info.html" %}

  		












  

    
      templates/variants/villeurbanne-2018/combo/page_template.html
    
  





  1
  
  
    
{% extends '../../combo/page_template.html' %}

  		




  
  1
  
    
{% extends 'combo/page_template.html' %}

  		




  2
  2
  
    
{% load combo %}

  		




  3
  3
  
    

  		




  4
  4
  
    
{% block user-info %}

  		












  

    
      templates/variants/vincennes-2018/theme.html
    
  





  1
  
  
    
{% extends '../../theme.html' %}

  		




  
  1
  
    
{% extends 'theme.html' %}

  		




  2
  2
  
    

  		




  3
  3
  
    
{% block header-top %}

  		




  4
  4
  
    
<a id="vincennes-fr" href="https://www.vincennes.fr/">vincennes.fr</a>

  		




  5
  
  
    
-