Projet

Général

Profil

0001-share-login-link-over-applications-8368.patch

Frédéric Péters, 29 septembre 2015 16:57

Télécharger (2,05 ko)

Voir les différences:

Subject: [PATCH] share login link over applications (#8368)

 templates/combo/page_template.html | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
templates/combo/page_template.html
7 7

  
8 8
{% block extra_top_head %}
9 9
<script src="{{site_base}}{% xstatic 'jquery' 'jquery.min.js' %}"></script>
10
{% skeleton_extra_placeholder 'extra-top-head' %}
10
{% skeleton_extra_placeholder extra-top-head %}
11
{% end_skeleton_extra_placeholder %}
11 12
{% endblock %}
12 13

  
13 14
{% block extra_scripts %}
14 15
<script src="{{site_base}}{% static 'js/combo.public.js' %}"></script>
15 16
<script src="{{site_base}}/__services.js"></script>
16 17
<script src="{{site_base}}{% static "" %}custom-{{css_variant}}/extra.js"></script>
17
{% skeleton_extra_placeholder 'extra-head' %}
18
{% skeleton_extra_placeholder extra-head %}
19
{% end_skeleton_extra_placeholder %}
18 20
{% endblock %}
19 21

  
20 22
{% block bodyargs %}
21 23
class="page-{{ page.slug }}"
22
{% skeleton_extra_placeholder 'extra-body-args' %}
24
{% skeleton_extra_placeholder extra-body-args %}
25
{% end_skeleton_extra_placeholder %}
23 26
{% endblock %}
24 27

  
25 28
{% block menu %}
......
45 48
{% endblock %}
46 49

  
47 50
{% block user-info %}
51
{% skeleton_extra_placeholder user-info %}
48 52
          {% if user.is_authenticated %}
49 53
          <span class="logged-in">
50 54
            <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>
51 55
            <a class="logout" href="{% url 'auth_logout' %}">D&eacute;connexion</a>
52 56
          </span>
57
          {% else %}
58
            <span class="login"><a href="{% url 'auth_login' %}">Connexion / Inscription</a>
53 59
          {% endif %}
54
{% skeleton_extra_placeholder 'user-info' %}
60
{% end_skeleton_extra_placeholder %}
55 61
{% endblock %}
56
-