Projet

Général

Profil

0001-misc-use-contextual-variables-for-all-user-info-link.patch

Benjamin Dauvergne, 28 janvier 2022 10:33

Télécharger (22 ko)

Voir les différences: 

Subject: [PATCH] misc: use contextual variables for all user-info links
 (#61191)

It uses the new variables from the new hobo's user_urls context
processor, introduced in #61192.

 templates/includes/user-info.html                      | 10 +++++-----
 templates/portal-agent/combo/page_template.html        |  2 +-
 templates/variants/arles-2020/authentic2/accounts.html |  2 +-
 .../variants/bouches-du-rhone/authentic2/accounts.html |  2 +-
 .../variants/dordogne-cd24/authentic2/accounts.html    |  2 +-
 .../variants/grand-chambery/authentic2/accounts.html   |  2 +-
 .../variants/grandlyon-glc/includes/user-info.html     |  2 +-
 .../grandlyon-glc/registration/registration_form.html  |  2 +-
 .../haute-garonne-cd31/authentic2/accounts.html        |  2 +-
 .../hautes-pyrenees-cd65/authentic2/accounts.html      |  2 +-
 templates/variants/lille/authentic2/accounts.html      |  2 +-
 .../metz-metropole-2019/includes/user-info.html        |  8 ++++----
 .../variants/nancy-en-direct/authentic2/accounts.html  |  2 +-
 .../pre-saint-gervais/combo/page_template.html         |  4 ++--
 templates/variants/quimper/authentic2/accounts.html    |  2 +-
 .../roannais-icitoyen/authentic2/accounts.html         |  2 +-
 .../variants/sables-d-olonne-2022/includes/nav.html    |  7 +++----
 .../variants/strasbourg-2018/combo/page_template.html  |  6 +++---
 templates/variants/toodego/includes/nav.html           |  2 +-
 templates/variants/toodego/wcs/base.html               |  4 ++--
 .../variants/toulouse-metropole/includes/nav.html      | 10 +++++-----
 .../variants/villeneuve-dascq/includes/user-info.html  |  9 ++++-----
 templates/variants/villeurbanne-2018/user_info.html    |  8 ++++----
 23 files changed, 46 insertions(+), 48 deletions(-)
templates/includes/user-info.html
6 6 
{% skeleton_extra_placeholder user-info %}
7 7 
  {% if user.is_authenticated %}
8 8 
  <span class="logged-in">
9 
    {% if idp_account_url %}<a class="account-link" href="{{idp_account_url}}">{% endif %}
10 
    <span class="connected-user">{% block user-info-user-name %}{{user.first_name}} {{user.last_name}}{% endblock %}</span>{% if idp_account_url %}</a>{% endif %}
11 
    <a accesskey="o" class="logout" href="{% url 'auth_logout' %}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>
9 
      {% if account_url %}<a class="account-link" href="{{account_url}}">{% endif %}
10 
    <span class="connected-user">{% block user-info-user-name %}{{user.first_name}} {{user.last_name}}{% endblock %}</span>{% if account_url %}</a>{% endif %}
11 
    <a accesskey="o" class="logout" href="{{ logout_url }}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>
12 12 
  </span>
13 13 
  {% else %}
14 
   {% firstof registration_url idp_registration_url as registration_url %}
15 
    <span class="login"><a accesskey="2" class="login-link" href="{% url 'auth_login' %}"
14 
      <span class="login"><a accesskey="2" class="login-link" href="{{ login_url }}"
16 15 
      >{% block user-info-login-label %}Connexion{% endblock %}
17 16 
      {% if registration_url and include_registration_link != False %}
18 17 
      </a>
......
20 19 
      <a class="registration" href="{{registration_url}}"
21 20 
      >{% block user-info-registration-label %}Inscription{% endblock %}{% endif %}</a></span>
22 21 
  {% endif %}
22 
  {% endwith %}
23 23 
{% end_skeleton_extra_placeholder %}
24 24 
{% endblock %}
25 25 
</div>
templates/portal-agent/combo/page_template.html
20 20 
{% block page-title %}{% firstof site_title "Publik" %} - {{ page.title }}{% endblock %}
21 21 
{% block site-title %}{% firstof site_title "Publik" %}{% endblock %}
22 22 
{% block footer %}Combo — Copyright © Entr’ouvert{% endblock %}
23 
{% block logout-url %}{% url 'auth_logout' %}{% endblock %}
23 
{% block logout-url %}{{ logout_url }}{% endblock %}
24 24 
{% block bodyargs %}
25 25 
data-api-root="{{ site_base }}/api/"
26 26 
{% if check_badges %}data-check-badges="true"{% endif %}
templates/variants/arles-2020/authentic2/accounts.html
1 1 
{% extends "authentic2/accounts.html" %}
2 2 

  		




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

  		




  4
  
  
    
<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>

  		




  
  4
  
    
<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>

  		




  5
  5
  
    
{% endblock %}

  		












  

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





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

  		




  2
  2
  
    

  		




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

  		




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

  		




  
  4
  
    
<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>

  		




  5
  5
  
    
{% endblock %}

  		












  

    
      templates/variants/dordogne-cd24/authentic2/accounts.html
    
  





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

  		




  2
  2
  
    

  		




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

  		




  4
  
  
    
<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>

  		




  
  4
  
    
<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>

  		




  5
  5
  
    
{% endblock %}

  		




  6
  6
  
    

  		












  

    
      templates/variants/grand-chambery/authentic2/accounts.html
    
  





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

  		




  2
  2
  
    

  		




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

  		




  4
  
  
    
<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>

  		




  
  4
  
    
<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>

  		




  5
  5
  
    
{% endblock %}

  		












  

    
      templates/variants/grandlyon-glc/includes/user-info.html
    
  





  5
  5
  
    
  {% if user.is_authenticated %}

  		




  6
  6
  
    
  <span class="logged-in">

  		




  7
  7
  
    
    <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>

  		




  8
  
  
    
    <a class="logout" href="{% url 'auth_logout' %}">D&eacute;connexion</a>

  		




  
  8
  
    
    <a class="logout" href="{{ logout_url }}">D&eacute;connexion</a>

  		




  9
  9
  
    
  </span>

  		




  10
  10
  
    
  {% endif %}

  		




  11
  11
  
    
{% end_skeleton_extra_placeholder %}

  		












  

    
      templates/variants/grandlyon-glc/registration/registration_form.html
    
  





  20
  20
  
    
{% block registration-post %}

  		




  21
  21
  
    
<div id="login-footer">

  		




  22
  22
  
    
  <h2>Vous avez déjà un compte</h2>

  		




  23
  
  
    
  <p><a href="{% url 'auth_login' %}" class="button">Se connecter</a></p>

  		




  
  23
  
    
  <p><a href="{{ login_url }}" class="button">Se connecter</a></p>

  		




  24
  24
  
    
</div>

  		




  25
  25
  
    
{% endblock %}

  		




  26
  26
  
    

  		












  

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





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

  		




  2
  2
  
    

  		




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

  		




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

  		




  
  4
  
    
<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>

  		




  5
  5
  
    
{% endblock %}

  		












  

    
      templates/variants/hautes-pyrenees-cd65/authentic2/accounts.html
    
  





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

  		




  2
  2
  
    

  		




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

  		




  4
  
  
    
<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>

  		




  
  4
  
    
<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>

  		




  5
  5
  
    
{% endblock %}

  		












  

    
      templates/variants/lille/authentic2/accounts.html
    
  





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

  		




  2
  2
  
    

  		




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

  		




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

  		




  
  4
  
    
<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>

  		




  5
  5
  
    
{% endblock %}

  		












  

    
      templates/variants/metz-metropole-2019/includes/user-info.html
    
  





  3
  3
  
    
{% block user-info %}

  		




  4
  4
  
    
{% skeleton_extra_placeholder user-info %}

  		




  5
  5
  
    
  {% if user.is_authenticated %}

  		




  6
  
  
    
  <a class="hello" href="{{idp_account_url}}"><span>Bonjour {{ user.first_name }}</span></a><span> -

  		




  7
  
  
    
  </span><a accesskey="o" class="logout" href="{% url 'auth_logout' %}">Déconnexion</a>

  		




  
  6
  
    
  <a class="hello" href="{{account_url}}"><span>Bonjour {{ user.first_name }}</span></a><span> -

  		




  
  7
  
    
  </span><a accesskey="o" class="logout" href="{{ logout_url }}">Déconnexion</a>

  		




  8
  8
  
    
  {% else %}

  		




  9
  
  
    
  <a class="login" href="{% url 'auth_login' %}">Connexion</a>

  		




  
  9
  
    
  <a class="login" href="{{ login_url }}">Connexion</a>

  		




  10
  10
  
    
  <span class="sep"> - </span>

  		




  11
  
  
    
  <a class="registration" href="{% firstof registration_url idp_registration_url %}">Inscription</a>

  		




  
  11
  
    
  <a class="registration" href="{{ registration_url }}">Inscription</a>

  		




  12
  12
  
    
  {% endif %}

  		




  13
  13
  
    
  <a class="home" href="{{ portal_url }}">Accueil</a>

  		




  14
  14
  
    
{% end_skeleton_extra_placeholder %}

  		












  

    
      templates/variants/nancy-en-direct/authentic2/accounts.html
    
  





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

  		




  2
  2
  
    

  		




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

  		




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

  		




  
  4
  
    
<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>

  		




  5
  5
  
    
{% endblock %}

  		












  

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





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

  		




  5
  5
  
    
{% skeleton_extra_placeholder psg-user-info %}

  		




  6
  6
  
    
  {% if user.is_authenticated %}

  		




  7
  
  
    
  <a class="back-to-home" href="{% firstof espace_personnel_url portal_url %}">Accéder à mon espace</a><a class="logout" href="{% url 'auth_logout' %}">Me déconnecter</a>

  		




  
  7
  
    
  <a class="back-to-home" href="{% firstof espace_personnel_url portal_url %}">Accéder à mon espace</a><a class="logout" href="{{ logout_url }}">Me déconnecter</a>

  		




  8
  8
  
    
  {% else %}

  		




  9
  
  
    
  <a class="login" href="{% url 'auth_login' %}">Connexion à mon espace</a>

  		




  
  9
  
    
  <a class="login" href="{{ login_url }}">Connexion à mon espace</a>

  		




  10
  10
  
    
  {% endif %}

  		




  11
  11
  
    
{% end_skeleton_extra_placeholder %}

  		




  12
  12
  
    
{% endblock %}

  		












  

    
      templates/variants/quimper/authentic2/accounts.html
    
  





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

  		




  2
  2
  
    

  		




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

  		




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

  		




  
  4
  
    
<li class="account-logout"><a href="{{ logout_url }}">Déconnecter</a></li>

  		




  5
  5
  
    
{% endblock %}

  		












  

    
      templates/variants/roannais-icitoyen/authentic2/accounts.html
    
  





  6
  6
  
    

  		




  7
  7
  
    

  		




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

  		




  9
  
  
    
<li class="account-logout"><a href="{% url 'auth_logout' %}">Se déconnecter</a></li>

  		




  
  9
  
    
<li class="account-logout"><a href="{{ logout_url }}">Se déconnecter</a></li>

  		




  10
  10
  
    
{% endblock %}

  		












  

    
      templates/variants/sables-d-olonne-2022/includes/nav.html
    
  





  5
  5
  
    
{{ block.super }}

  		




  6
  6
  
    
{% skeleton_extra_placeholder user-info %}

  		




  7
  7
  
    
{% if user.is_authenticated %}

  		




  8
  
  
    
<li><a class="account-link" href="{{idp_account_url}}">{{user.first_name}} {{user.last_name}}</a></li>

  		




  9
  
  
    
<li><a accesskey="o" class="logout" href="{% url 'auth_logout' %}">Déconnexion</a></li>

  		




  
  8
  
    
<li><a class="account-link" href="{{account_url}}">{{user.first_name}} {{user.last_name}}</a></li>

  		




  
  9
  
    
<li><a accesskey="o" class="logout" href="{{ logout_url }}">Déconnexion</a></li>

  		




  10
  10
  
    
{% else %}

  		




  11
  
  
    
{% firstof registration_url idp_registration_url as registration_url %}

  		




  12
  
  
    
<li><a accesskey="2" class="login-link" href="{% url 'auth_login' %}">Se connecter</a></li>

  		




  
  11
  
    
<li><a accesskey="2" class="login-link" href="{{ login_url }}">Se connecter</a></li>

  		




  13
  12
  
    
{% if registration_url and include_registration_link != False %}

  		




  14
  13
  
    
<li><a class="registration" href="{{registration_url}}">Créer un compte</a></li>

  		




  15
  14
  
    
{% endif %}

  		












  

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





  37
  37
  
    
{% block account %}

  		




  38
  38
  
    
{% skeleton_extra_placeholder account %}

  		




  39
  39
  
    
        {% if user.is_authenticated %}

  		




  40
  
  
    
        <a href="{{ idp_account_url}}" class="nav-account nav-btn" title="Mon compte">

  		




  
  40
  
    
        <a href="{{ account_url}}" class="nav-account nav-btn" title="Mon compte">

  		




  41
  41
  
    
            <span class="flexbox">

  		




  42
  42
  
    
                <span class="picto"></span>

  		




  43
  43
  
    
                <span class="text">{{user.first_name}} {{user.last_name|slice:":1"}}.</span>

  		




  44
  44
  
    
            </span>

  		




  45
  45
  
    
        </a>

  		




  46
  
  
    
        <button title="Se déconnecter" class="nav-btn nav-logout" onclick="window.location = '{% url 'auth_logout' %}'">

  		




  
  46
  
    
        <button title="Se déconnecter" class="nav-btn nav-logout" onclick="window.location = '{{ logout_url }}'">

  		




  47
  47
  
    
            <span class="flexbox">

  		




  48
  48
  
    
                <span class="picto"></span>

  		




  49
  49
  
    
            </span>

  		




  50
  50
  
    
        </button>

  		




  51
  51
  
    
        {% endif %}

  		




  52
  52
  
    
        {% if not user.is_authenticated %}

  		




  53
  
  
    
        <a href="{% url 'auth_login' %}" class="nav-account nav-btn login-button" title="Mon compte">

  		




  
  53
  
    
        <a href="{{ login_url }}" class="nav-account nav-btn login-button" title="Mon compte">

  		




  54
  54
  
    
            <span class="flexbox">

  		




  55
  55
  
    
                <span class="picto"></span>

  		




  56
  56
  
    
                <span class="text">Connexion</span>

  		












  

    
      templates/variants/toodego/includes/nav.html
    
  





  15
  15
  
    
        {% skeleton_extra_placeholder "user-nav-link" %}{% if user.is_authenticated %}<a href="{{portal_url}}mon-compte/"><span>{{user.first_name}}</span></a>

  		




  16
  16
  
    
        <ul>

  		




  17
  17
  
    
                <li><a href="{{portal_url}}mon-compte/">Mon compte</a></li>

  		




  18
  
  
    
                <li><a href="{% url 'auth_logout' %}">Me déconnecter</a></li>

  		




  
  18
  
    
                <li><a href="{{ logout_url }}">Me déconnecter</a></li>

  		




  19
  19
  
    
        </ul>

  		




  20
  20
  
    
        {% else %}<a href="/login"><span>Se connecter</span></a>{% endif %}{% end_skeleton_extra_placeholder %}{% endif %}</li>

  		




  21
  21
  
    
   {% endif %}

  		












  

    
      templates/variants/toodego/wcs/base.html
    
  





  17
  17
  
    
{% block user-info %}

  		




  18
  18
  
    
  {% if session_user %}

  		




  19
  19
  
    
  <span class="logged-in">

  		




  20
  
  
    
    {% if idp_account_url %}<a href="{{idp_account_url}}">{% endif %}

  		




  21
  
  
    
    <span class="connected-user">{{session_user_display_name}}</span>{% if idp_account_url %}</a>{% endif %}

  		




  
  20
  
    
    {% if account_url %}<a href="{{account_url}}">{% endif %}

  		




  
  21
  
    
    <span class="connected-user">{{session_user_display_name}}</span>{% if account_url %}</a>{% endif %}

  		




  22
  22
  
    
    <a accesskey="o" class="logout" href="{{root_url}}logout">D&eacute;connexion</a>

  		




  23
  23
  
    
  </span>

  		




  24
  24
  
    
  {% else %}

  		












  

    
      templates/variants/toulouse-metropole/includes/nav.html
    
  





  6
  6
  
    
{% skeleton_extra_placeholder user-info %}

  		




  7
  7
  
    
          {% if user.is_authenticated %}

  		




  8
  8
  
    
          <span class="logged-in">

  		




  9
  
  
    
            {% if idp_account_url %}<a href="{{idp_account_url}}">{% endif %}

  		




  10
  
  
    
            <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>{% if idp_account_url %}</a>{% endif %}

  		




  11
  
  
    
            <a accesskey="o" class="logout pk-button" href="{% url 'auth_logout' %}">D&eacute;connexion</a>

  		




  
  9
  
    
            {% if account_url %}<a href="{{account_url}}">{% endif %}

  		




  
  10
  
    
            <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>{% if account_url %}</a>{% endif %}

  		




  
  11
  
    
            <a accesskey="o" class="logout pk-button" href="{{ logout_url }}">D&eacute;connexion</a>

  		




  12
  12
  
    
          </span>

  		




  13
  13
  
    
          {% else %}

  		




  14
  
  
    
            <a class="login pk-button" accesskey="2" href="{% url 'auth_login' %}">Connexion</a>

  		




  15
  
  
    
            <span class="registration">Pas de compte ? <a href="{% firstof registration_url idp_registration_url %}">S'inscrire</a></span>

  		




  
  14
  
    
            <a class="login pk-button" accesskey="2" href="{{ login_url }}?next={{ request.get_full_path|urlencode}}">Connexion</a>

  		




  
  15
  
    
            <span class="registration">Pas de compte ? <a href="{{ registration_url }}">S'inscrire</a></span>

  		




  16
  16
  
    
          {% endif %}

  		




  17
  17
  
    
{% end_skeleton_extra_placeholder %}

  		




  18
  18
  
    
</div>

  		












  

    
      templates/variants/villeneuve-dascq/includes/user-info.html
    
  





  8
  8
  
    
  {% skeleton_extra_placeholder user-info %}

  		




  9
  9
  
    
  {% if user.is_authenticated %}

  		




  10
  10
  
    
  <span class="logged-in">

  		




  11
  
  
    
    {% if idp_account_url %}<a class="account-link" href="{{idp_account_url}}">{% endif %}

  		




  12
  
  
    
    <span class="connected-user">{% block user-info-user-name %}{{user.first_name}} {{user.last_name}}{% endblock %}</span>{% if idp_account_url %}</a>{% endif %}

  		




  13
  
  
    
    <a accesskey="o" class="logout" href="{% url 'auth_logout' %}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>

  		




  
  11
  
    
    {% if account_url %}<a class="account-link" href="{{account_url}}">{% endif %}

  		




  
  12
  
    
    <span class="connected-user">{% block user-info-user-name %}{{user.first_name}} {{user.last_name}}{% endblock %}</span>{% if account_url %}</a>{% endif %}

  		




  
  13
  
    
    <a accesskey="o" class="logout" href="{{ logout_url }}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>

  		




  14
  14
  
    
  </span>

  		




  15
  15
  
    
  {% else %}

  		




  16
  
  
    
  {% firstof registration_url idp_registration_url as registration_url %}

  		




  17
  
  
    
  <span class="login"><a accesskey="2" class="login-link" href="{% url 'auth_login' %}"

  		




  
  16
  
    
  <span class="login"><a accesskey="2" class="login-link" href="{{ login_url }}"

  		




  18
  17
  
    
    >{% block user-info-login-label %}Connexion{% endblock %}

  		




  19
  18
  
    
    {% if registration_url and include_registration_link != False %}</a>{% endif %}

  		




  20
  19
  
    
    <span class="sep">/</span>

  		












  

    
      templates/variants/villeurbanne-2018/user_info.html
    
  





  1
  1
  
    
{% if user.is_authenticated %}

  		




  2
  
  
    
  {% if idp_account_url %}<a href="{{idp_account_url}}" role="button" class="btn-account">{% endif %}

  		




  3
  
  
    
  Mon compte{% if idp_account_url %}</a>{% endif %}

  		




  4
  
  
    
  <a accesskey="o" class="logout btn-logout" href="{% url 'auth_logout' %}" data-placement="bottom">

  		




  
  2
  
    
  {% if account_url %}<a href="{{account_url}}" role="button" class="btn-account">{% endif %}

  		




  
  3
  
    
  Mon compte{% if account_url %}</a>{% endif %}

  		




  
  4
  
    
  <a accesskey="o" class="logout btn-logout" href="{{ logout_url }}" data-placement="bottom">

  		




  5
  5
  
    
    <span class="fa fa-sign-out" aria-hidden="true"></span>

  		




  6
  6
  
    
    <span class="text-logout">Se déconnecter</span>

  		




  7
  7
  
    
  </a>

  		




  8
  8
  
    
  {% else %}

  		




  9
  
  
    
  <a accesskey="2" href="{% url 'auth_login' %}" role="button">Se connecter</a>

  		




  
  9
  
    
  <a accesskey="2" href="{{ login_url }}" role="button">Se connecter</a>

  		




  10
  10
  
    
{% endif %}

  		




  11
  
  
    
-