From 57b6a03d17641cf8c465e4d18edfc86bc5777dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 29 Sep 2015 16:54:18 +0200
Subject: [PATCH] share login link over applications (#8368)

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

diff --git a/templates/combo/page_template.html b/templates/combo/page_template.html
index 6d2f813..3c9468d 100644
--- a/templates/combo/page_template.html
+++ b/templates/combo/page_template.html
@@ -7,19 +7,22 @@
 
 {% block extra_top_head %}
 <script src="{{site_base}}{% xstatic 'jquery' 'jquery.min.js' %}"></script>
-{% skeleton_extra_placeholder 'extra-top-head' %}
+{% skeleton_extra_placeholder extra-top-head %}
+{% end_skeleton_extra_placeholder %}
 {% endblock %}
 
 {% block extra_scripts %}
 <script src="{{site_base}}{% static 'js/combo.public.js' %}"></script>
 <script src="{{site_base}}/__services.js"></script>
 <script src="{{site_base}}{% static "" %}custom-{{css_variant}}/extra.js"></script>
-{% skeleton_extra_placeholder 'extra-head' %}
+{% skeleton_extra_placeholder extra-head %}
+{% end_skeleton_extra_placeholder %}
 {% endblock %}
 
 {% block bodyargs %}
 class="page-{{ page.slug }}"
-{% skeleton_extra_placeholder 'extra-body-args' %}
+{% skeleton_extra_placeholder extra-body-args %}
+{% end_skeleton_extra_placeholder %}
 {% endblock %}
 
 {% block menu %}
@@ -45,11 +48,14 @@ class="page-{{ page.slug }}"
 {% endblock %}
 
 {% block user-info %}
+{% skeleton_extra_placeholder user-info %}
           {% if user.is_authenticated %}
           <span class="logged-in">
             <span class="connected-user">{{user.first_name}} {{user.last_name}}</span>
             <a class="logout" href="{% url 'auth_logout' %}">D&eacute;connexion</a>
           </span>
+          {% else %}
+            <span class="login"><a href="{% url 'auth_login' %}">Connexion / Inscription</a>
           {% endif %}
-{% skeleton_extra_placeholder 'user-info' %}
+{% end_skeleton_extra_placeholder %}
 {% endblock %}
-- 
2.5.3