From 8bd2584ffbd0bd7f11f32924140d6cdb1e217199 Mon Sep 17 00:00:00 2001
From: Sanjay B <b@pad.ma>
Date: Wed, 4 Sep 2013 15:07:57 +0530
Subject: [PATCH] display currently logged in username

---
 itf/static/css/noel/main.css | 14 ++++++++++----
 itf/templates/noel/base.html |  9 +++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/itf/static/css/noel/main.css b/itf/static/css/noel/main.css
index 2871728..8d8b124 100755
--- a/itf/static/css/noel/main.css
+++ b/itf/static/css/noel/main.css
@@ -272,7 +272,13 @@ cursor:pointer;
 z-index:2;
 clear:both;}
 
-#loginMenu li 
+#loginMenu li.usernameDisplay {
+    float: left;
+    display: inline;
+    padding: 6px 6px;
+}
+
+#loginMenu li.loginTab
 {display:inline;
 float:left;
 background-color:#FFF;
@@ -288,16 +294,16 @@ border-top-left-radius:8px;
 -webkit-box-shadow:0px -1px 3px #d4d4d4;
 box-shadow:0px -1px 3px #d4d4d4;}/*not converted to links*/
  
-#loginMenu li a, #loginMenu li a:link, #loginMenu li a:visited, #loginMenu li a:active 
+#loginMenu li.loginTab a, #loginMenu li.loginTab a:link, #loginMenu li.loginTab a:visited, #loginMenu li.loginTab a:active 
 {text-decoration:none;
 color:#ff8400;}
 
-#loginMenu li:hover 
+#loginMenu li.loginTab:hover 
 {color:#FFF;
 background-color:#f7bd00;
 border:1px solid transparent;}
 
-#loginMenu li:hover a
+#loginMenu li.loginTab:hover a
 {color:#FFF;}
 
 .loginMenuSelected
diff --git a/itf/templates/noel/base.html b/itf/templates/noel/base.html
index 2efd996..7ed4c6d 100755
--- a/itf/templates/noel/base.html
+++ b/itf/templates/noel/base.html
@@ -48,13 +48,14 @@
 	  <ul id="loginMenu">
 
         {% if user.is_authenticated %}
-            <li><a href="/accounts/logout">Logout</a></li>
+            <li class="usernameDisplay">Hi {{ user.username }}</li>
+            <li class="loginTab"><a href="/accounts/logout">Logout</a></li>
         {% else %}
-    		<li><a href="/accounts/login">Login</a></li>
-    		<li><a href="/accounts/signup">Register</a></li>
+    		<li class="loginTab"><a href="/accounts/login">Login</a></li>
+    		<li class="loginTab"><a href="/accounts/signup">Register</a></li>
         {% endif %}
 
-		<li><a href="/contact">Contact Us</a></li>
+		<li class="loginTab"><a href="/contact">Contact Us</a></li>
 	  </ul>
 	</div>