Projet

Général

Profil

0001-templates-move-leftover-base.html-to-authentic2-base.patch

Frédéric Péters, 09 juillet 2018 17:55

Télécharger (3,25 ko)

Voir les différences: 

Subject: [PATCH] templates: move leftover base.html to authentic2/base.html
 (#25154)


 templates/authentic2/accounts.html |  2 +-
 templates/authentic2/base.html     | 34 +++++++++++++++++++++++++++++-
 templates/base.html                | 33 -----------------------------
 3 files changed, 34 insertions(+), 35 deletions(-)
 delete mode 100644 templates/base.html
templates/authentic2/accounts.html
1 
{% extends "base.html" %}
1 
{% extends "authentic2/base.html" %}
2 2 
{% load i18n %}
3 3 

  		




  4
  4
  
    
{% block title %}Gestion du compte{% endblock %}

  		












  

    
      templates/authentic2/base.html
    
  





  1
  
  
    
{% extends "base.html" %}

  		




  
  1
  
    
{% extends theme_base %}

  		




  2
  2
  
    
{% load authentic2 %}

  		




  3
  3
  
    

  		




  
  4
  
    
{% block extra-body-args %}

  		




  
  5
  
    
{% block bodyargs %}

  		




  
  6
  
    
{% endblock %}

  		




  
  7
  
    
{% endblock %}

  		




  
  8
  
    

  		




  
  9
  
    
{% block placeholder-content %}

  		




  
  10
  
    
  {% block content %}

  		




  
  11
  
    
  {% endblock %}

  		




  
  12
  
    
{% endblock %}

  		




  
  13
  
    

  		




  
  14
  
    
{% block user-info %}

  		




  
  15
  
    
          {% if user.is_authenticated %}

  		




  
  16
  
    
          <span class="logged-in">

  		




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

  		




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

  		




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

  		




  
  20
  
    
          </span>

  		




  
  21
  
    
          {% endif %}

  		




  
  22
  
    
{% endblock %}

  		




  
  23
  
    

  		




  
  24
  
    
{% block messages %}

  		




  
  25
  
    
{% if messages %}

  		




  
  26
  
    
  <div id="messages" class="messages-login">

  		




  
  27
  
    
    <ul class="messages">

  		




  
  28
  
    
      {% for message in messages %}

  		




  
  29
  
    
      <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>

  		




  
  30
  
    
      {% endfor %}

  		




  
  31
  
    
    </ul>

  		




  
  32
  
    
  </div>

  		




  
  33
  
    
{% endif %}

  		




  
  34
  
    
{% endblock %}

  		




  
  35
  
    

  		




  4
  36
  
    
{% block extra-top-head %}

  		




  5
  37
  
    
  {% block extrascripts %}

  		




  6
  38
  
    
  {% endblock %}

  		












  

    
      templates/base.html
    
  





  1
  
  
    
{% extends theme_base %}

  		




  2
  
  
    

  		




  3
  
  
    
{% block extra-body-args %}

  		




  4
  
  
    
{% block bodyargs %}

  		




  5
  
  
    
{% endblock %}

  		




  6
  
  
    
{% endblock %}

  		




  7
  
  
    

  		




  8
  
  
    
{% block placeholder-content %}

  		




  9
  
  
    
  {% block content %}

  		




  10
  
  
    
  {% endblock %}

  		




  11
  
  
    
{% endblock %}

  		




  12
  
  
    

  		




  13
  
  
    
{% block user-info %}

  		




  14
  
  
    
          {% if user.is_authenticated %}

  		




  15
  
  
    
          <span class="logged-in">

  		




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

  		




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

  		




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

  		




  19
  
  
    
          </span>

  		




  20
  
  
    
          {% endif %}

  		




  21
  
  
    
{% endblock %}

  		




  22
  
  
    

  		




  23
  
  
    
{% block messages %}

  		




  24
  
  
    
{% if messages %}

  		




  25
  
  
    
  <div id="messages" class="messages-login">

  		




  26
  
  
    
    <ul class="messages">

  		




  27
  
  
    
      {% for message in messages %}

  		




  28
  
  
    
      <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>

  		




  29
  
  
    
      {% endfor %}

  		




  30
  
  
    
    </ul>

  		




  31
  
  
    
  </div>

  		




  32
  
  
    
{% endif %}

  		




  33
  
  
    
{% endblock %}

  		




  34
  
  
    
-