From e6294479cd814d915a9646d9391bbbc765ec12c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 10 Mar 2015 14:59:36 +0100
Subject: [PATCH] add user name in the header

---
 static/style.css             | 9 ++++++++-
 template.ezt                 | 1 +
 templates/theme.html         | 1 +
 templates/theme_sekizai.html | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/static/style.css b/static/style.css
index bd16aa2..43ce3d2 100644
--- a/static/style.css
+++ b/static/style.css
@@ -695,6 +695,7 @@ div#registration input[type="submit"] {
 	right: 0;
 	width: 40%;
 	padding: 5px 5px 5px 5px;
+	text-align: right;
 }
 
 #toplinks span.logged-in {
@@ -703,8 +704,14 @@ div#registration input[type="submit"] {
 	text-align: right;
 }
 
-#toplinks a {
+#toplinks span.logged-in .connected-user {
+	display: inline-block;
+	padding-right: 1em;
 	color: #888;
+}
+
+#toplinks a {
+	color: #555;
 	border: 1px solid transparent;
 }
 
diff --git a/template.ezt b/template.ezt
index abd3b98..1a85f4c 100644
--- a/template.ezt
+++ b/template.ezt
@@ -26,6 +26,7 @@ div#centre { padding-top: 45px; margin-top: 0px; }
           [if-any user]
           <span class="logged-in">
             <!--<a class="myspace" href="/myspace/">Mes démarches</a>-->
+            <span class="connected-user">[session_user_display_name]</span>
             <a class="logout" href="[root_url]logout">D&eacute;connexion</a>
           </span>
           [else]
diff --git a/templates/theme.html b/templates/theme.html
index 525473b..92f8b56 100644
--- a/templates/theme.html
+++ b/templates/theme.html
@@ -26,6 +26,7 @@
         <div id="toplinks">
           {% 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>
           {% endif %}
diff --git a/templates/theme_sekizai.html b/templates/theme_sekizai.html
index ab67b69..9a31fad 100644
--- a/templates/theme_sekizai.html
+++ b/templates/theme_sekizai.html
@@ -27,6 +27,7 @@
         <div id="toplinks">
           {% 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>
           {% endif %}