entrouvert
/
publik-base-theme
15
1
Fork 1
Code Issues Pull Requests 12 Releases Wiki Activity

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

This commit is contained in:
Frédéric Péters 2019-05-19 13:31:00 +02:00
parent 03ecb99833
commit d9cae88097
47 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -9,6 +9,6 @@ Homepage: http://git.entrouvert.org/publik-base-theme.git
Package: publik-base-theme
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, python-gadjo, python-xstatic-abrilfatface
Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0)
Conflicts: python-authentic2 (< 2.1.20.742.gb6ee096-0), python-django (<= 1:1.11)
Breaks: combo (< 0.7.1)
Description: Publik Base Theme

2
templates/variants/alpes-maritimes-2018/authentic2/login.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/login.html" %}
{% extends "authentic2/login.html" %}
{% block login-pre %}
<div class="cell">

2
templates/variants/alpes-maritimes-2018/theme.html
View File

@ -1,4 +1,4 @@
{% extends '../../theme.html' %}
{% extends 'theme.html' %}
{% block header-post %}
<div class="departement">

2
templates/variants/amiens-metropole/theme.html
View File

@ -1,4 +1,4 @@
{% extends '../../theme.html' %}
{% extends 'theme.html' %}
{% load static i18n combo gadjo %}
{% block extra_top_head %}

2
templates/variants/blois-2018/combo/page_template.html
View File

@ -1,4 +1,4 @@
{% extends "../../combo/page_template.html" %}
{% extends "combo/page_template.html" %}
{% load combo %}
{% block header-title %}

2
templates/variants/bouches-du-rhone/authentic2/accounts.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/accounts.html" %}
{% extends "authentic2/accounts.html" %}
{% block account-management-bottom-actions %}
<li><a href="{% url 'auth_logout' %}">Déconnecter</a></li>

2
templates/variants/bouches-du-rhone/theme.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% load static %}
{% block header-pre %}

2
templates/variants/entrouvert/combo/page_template.html
View File

@ -1,4 +1,4 @@
{% extends '../../combo/page_template.html' %}
{% extends 'combo/page_template.html' %}
{% block user-info %}
<div id="le">

2
templates/variants/fontenay-sous-bois-2018/theme.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% load static %}
{% block header-pre %}

2
templates/variants/grandlyon-gnm/combo/page_template.html
View File

@ -1,4 +1,4 @@
{% extends "../../combo/page_template.html" %}
{% extends "combo/page_template.html" %}
{% load combo %}
{% block menu %}

2
templates/variants/grandlyon-gnm/theme.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% load static gnm %}
{% block extra_top_head %}

2
templates/variants/grandlyon/theme.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% load static assets combo %}
{% block bodyargs %}{% get_asset "header:background" as header_background %}class="{% if header_background %}has-header-background{% endif %} {% block bodyclasses %}{% endblock %}" {% block bodyattrs %}{% endblock %}{% endblock %}

2
templates/variants/grenoble-metropole-2019/authentic2/base.html
View File

@ -1,4 +1,4 @@
{% extends '../../authentic2/base.html' %}
{% extends 'authentic2/base.html' %}
{% block extra-top-head %}
{% block extrascripts %}

2
templates/variants/grenoble-metropole-2019/registration/registration_form.html
View File

@ -1,4 +1,4 @@
{% extends '../../registration/registration_form.html' %}
{% extends 'registration/registration_form.html' %}
{% block placeholder-content %}

2
templates/variants/grenoble-metropole/authentic2/base.html
View File

@ -1,4 +1,4 @@
{% extends '../../authentic2/base.html' %}
{% extends 'authentic2/base.html' %}
{% block extra-top-head %}
{% block extrascripts %}

2
templates/variants/grenoble-metropole/registration/registration_form.html
View File

@ -1,4 +1,4 @@
{% extends '../../registration/registration_form.html' %}
{% extends 'registration/registration_form.html' %}
{% block placeholder-content %}

2
templates/variants/haute-garonne-cd31/authentic2/accounts.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/accounts.html" %}
{% extends "authentic2/accounts.html" %}
{% block account-management-bottom-actions %}
<li><a href="{% url 'auth_logout' %}">Déconnecter</a></li>

2
templates/variants/haute-garonne-cd31/combo/page_template.html
View File

@ -1,4 +1,4 @@
{% extends "../../combo/page_template.html" %}
{% extends "combo/page_template.html" %}
{% load combo %}
{% block user-info %}

2
templates/variants/hautes-alpes-2018/combo/page_template_neutre.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% load static i18n combo gadjo %}
{% block extra_top_head %}

2
templates/variants/lille/authentic2/accounts.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/accounts.html" %}
{% extends "authentic2/accounts.html" %}
{% block account-management-bottom-actions %}
<li><a href="{% url 'auth_logout' %}">Déconnecter</a></li>

2
templates/variants/lille/combo/page_template.html
View File

@ -1,4 +1,4 @@
{% extends "../../combo/page_template.html" %}
{% extends "combo/page_template.html" %}
{% load combo %}
{% block header-title %}

2
templates/variants/mauguio/theme.html
View File

@ -1,4 +1,4 @@
{% extends '../../theme.html' %}
{% extends 'theme.html' %}
{% block header-pre %}
<a id="site-ville" href="https://www.mauguio-carnon.com/">Maugio Carnon</a>

2
templates/variants/metz-metropole/theme.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% load static assets %}
{% block header-title %}

2
templates/variants/montpellier/authentic2/accounts.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/accounts.html" %}
{% extends "authentic2/accounts.html" %}
{% load i18n staticfiles %}
{% block extra-body-class %}authentic-page{% endblock %}

2
templates/variants/moselle/combo/page_template.html
View File

@ -1,4 +1,4 @@
{% extends "../../combo/page_template.html" %}
{% extends "combo/page_template.html" %}
{% load combo %}
{% block nav %}

2
templates/variants/nanterre/authentic2/password_change_body.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/password_change_body.html" %}
{% extends "authentic2/password_change_body.html" %}
{% block warn_if_not_requested %}
<p>

2
templates/variants/nanterre/authentic2/password_change_body.txt
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/password_change_body.txt" %}
{% extends "authentic2/password_change_body.txt" %}
{% block warn_if_not_requested %}
Si vous n'êtes pas à l'origine de cette demande, contactez-nous imédiatement

2
templates/variants/orleans/theme.html
View File

@ -1,4 +1,4 @@
{% extends '../../theme.html' %}
{% extends 'theme.html' %}
{% block header-top %}
{% if metropole_url %}
<div class="metropole-link"><a href="{{ metropole_url }}">Orléans-Métropole.fr</a></div>

2
templates/variants/pre-saint-gervais/authentic2/login.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/login.html" %}
{% extends "authentic2/login.html" %}
{% block login-pre %}
<div id="login-pre">

2
templates/variants/pre-saint-gervais/combo/page_template.html
View File

@ -1,4 +1,4 @@
{% extends "../../combo/page_template.html" %}
{% extends "combo/page_template.html" %}
{% load combo %}
{% block psg-mon-espace %}

2
templates/variants/pre-saint-gervais/theme.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% load static %}
{% block header-top %}

2
templates/variants/quimper/authentic2/accounts.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/accounts.html" %}
{% extends "authentic2/accounts.html" %}
{% block account-management-bottom-actions %}
<li><a href="{% url 'auth_logout' %}">Déconnecter</a></li>

2
templates/variants/quimper/authentic2/login.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/login.html" %}
{% extends "authentic2/login.html" %}
{% block login-pre %}
<h1 id="login-title">Se connecter<br> <span>avec mes identifiants Quimper+</span></h1>

2
templates/variants/rochefort/theme.html
View File

@ -1,4 +1,4 @@
{% extends '../../theme.html' %}
{% extends 'theme.html' %}
{% block header-title %}
{{ block.super }}

2
templates/variants/strasbourg-2018/authentic2/login.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/login.html" %}
{% extends "authentic2/login.html" %}
{% block login-bottom %}
<div id="welcome-text">

2
templates/variants/strasbourg-2018/authentic2/password_change_body.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/password_change_body.html" %}
{% extends "authentic2/password_change_body.html" %}
{% block warn_if_not_requested %}
<p>

2
templates/variants/strasbourg-2018/authentic2/password_change_body.txt
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/password_change_body.txt" %}
{% extends "authentic2/password_change_body.txt" %}
{% block warn_if_not_requested %}
Si vous n'aviez pas demandé le changement de votre mot de passe, vous pouvez

2
templates/variants/toodego/combo/page_template.html
View File

@ -1,4 +1,4 @@
{% extends "../../combo/page_template.html" %}
{% extends "combo/page_template.html" %}
{% load combo %}
{% block menu %}

2
templates/variants/toodego/theme.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% load static gnm assets combo %}
{% block extra_top_head %}

2
templates/variants/toulouse/authentic2/accounts.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/accounts.html" %}
{% extends "authentic2/accounts.html" %}
{% block content %}
<div id="title-section">

2
templates/variants/toulouse/authentic2/login.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/login.html" %}
{% extends "authentic2/login.html" %}
{% block login-pre %}
<div class="a2-block" id="registration-title"><h2>Se connecter</h2>

2
templates/variants/toulouse/registration/registration_form.html
View File

@ -1,4 +1,4 @@
{% extends '../../registration/registration_form.html' %}
{% extends 'registration/registration_form.html' %}
{% load i18n %}
{% block registration-pre %}

2
templates/variants/toulouse/theme.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% block content-pre %}
<div id="actu">

2
templates/variants/venissieux/theme.html
View File

@ -1,4 +1,4 @@
{% extends "../../theme.html" %}
{% extends "theme.html" %}
{% load static %}
{% block header-pre %}

2
templates/variants/villeurbanne-2018/authentic2/base.html
View File

@ -1,4 +1,4 @@
{% extends "../../authentic2/base.html" %}
{% extends "authentic2/base.html" %}
{% block user-info %}
{% include "user_info.html" %}

2
templates/variants/villeurbanne-2018/combo/page_template.html
View File

@ -1,4 +1,4 @@
{% extends '../../combo/page_template.html' %}
{% extends 'combo/page_template.html' %}
{% load combo %}
{% block user-info %}

2
templates/variants/vincennes-2018/theme.html
View File

@ -1,4 +1,4 @@
{% extends '../../theme.html' %}
{% extends 'theme.html' %}
{% block header-top %}
<a id="vincennes-fr" href="https://www.vincennes.fr/">vincennes.fr</a>