Projet

Général

Profil

0001-misc-use-idp_service_and_next_params-60165.patch

Emmanuel Cazenave, 26 janvier 2022 13:09

Télécharger (7,29 ko)

Voir les différences: 

Subject: [PATCH] misc: use idp_service_and_next_params (#60165)


 templates/includes/user-info.html                              | 2 +-
 templates/variants/metz-metropole-2019/includes/user-info.html | 2 +-
 templates/variants/sables-d-olonne-2022/includes/nav.html      | 2 +-
 templates/variants/strasbourg-2018/combo/page_template.html    | 2 +-
 templates/variants/toodego/wcs/base.html                       | 2 +-
 templates/variants/toulouse-metropole/includes/nav.html        | 2 +-
 templates/variants/villeneuve-dascq/includes/user-info.html    | 2 +-
 templates/variants/villeurbanne-2018/user_info.html            | 2 +-
 8 files changed, 8 insertions(+), 8 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 %}
9 
    {% if idp_account_url %}<a class="account-link" href="{{idp_account_url}}?{{idp_service_and_next_params}}">{% endif %}
10 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 11 
    <a accesskey="o" class="logout" href="{% url 'auth_logout' %}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>
12 12 
  </span>
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> -
6 
  <a class="hello" href="{{idp_account_url}}?{{idp_service_and_next_params}}"><span>Bonjour {{ user.first_name }}</span></a><span> -
7 7 
  </span><a accesskey="o" class="logout" href="{% url 'auth_logout' %}">Déconnexion</a>
8 8 
  {% else %}
9 9 
  <a class="login" href="{% url 'auth_login' %}">Connexion</a>
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>
8 
<li><a class="account-link" href="{{idp_account_url}}?{{idp_service_and_next_params}}">{{user.first_name}} {{user.last_name}}</a></li>
9 9 
<li><a accesskey="o" class="logout" href="{% url 'auth_logout' %}">Déconnexion</a></li>
10 10 
{% else %}
11 11 
{% firstof registration_url idp_registration_url as registration_url %}
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="{{ idp_account_url}}?{{idp_service_and_next_params}}" 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>
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 %}
20 
    {% if idp_account_url %}<a href="{{idp_account_url}}?{{idp_service_and_next_params}}">{% endif %}
21 21 
    <span class="connected-user">{{session_user_display_name}}</span>{% if idp_account_url %}</a>{% endif %}
22 22 
    <a accesskey="o" class="logout" href="{{root_url}}logout">D&eacute;connexion</a>
23 23 
  </span>
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 %}
9 
            {% if idp_account_url %}<a href="{{idp_account_url}}?{{idp_service_and_next_params}}">{% endif %}
10 10 
            <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>{% if idp_account_url %}</a>{% endif %}
11 11 
            <a accesskey="o" class="logout pk-button" href="{% url 'auth_logout' %}">D&eacute;connexion</a>
12 12 
          </span>
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 %}
11 
    {% if idp_account_url %}<a class="account-link" href="{{idp_account_url}}?{{idp_service_and_next_params}}">{% endif %}
12 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 13 
    <a accesskey="o" class="logout" href="{% url 'auth_logout' %}">{% block user-info-logout-label %}Déconnexion{% endblock %}</a>
14 14 
  </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 %}
2 
  {% if idp_account_url %}<a href="{{idp_account_url}}?{{idp_service_and_next_params}}" role="button" class="btn-account">{% endif %}
3 3 
  Mon compte{% if idp_account_url %}</a>{% endif %}
4 4 
  <a accesskey="o" class="logout btn-logout" href="{% url 'auth_logout' %}" data-placement="bottom">
5 5 
    <span class="fa fa-sign-out" aria-hidden="true"></span>
6 
-