From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 18 Nov 2012 19:12:34 +0000 (+0100)
Subject: Redesign user menu on right top of page.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a8043cf504417a199283ab3443e0fb9c6de10d5;p=pbs.git

Redesign user menu on right top of page.
---

diff --git a/data/templates/base.html b/data/templates/base.html
index 2ed20ab6..754ad19c 100644
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -120,28 +120,9 @@
 							{% if current_user %}
 								<li class="dropdown">
 									<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-										<i class="icon-user icon-white"></i>
-										<b class="caret"></b>
+										{{ current_user.realname }} <b class="caret"></b>
 									</a>
 									<ul class="dropdown-menu">
-										<li class="nav-header">
-											{{ _("Logged in as") }}
-										</li>
-										<li>
-											<a href="/profile">
-												{{ current_user.realname }}
-											</a>
-										</li>
-										{% if session and session.impersonated_user %}
-											<li class="nav-header">{{ _("Impersonated by") }}</li>
-											<li>
-												<a href="/user/{{ session.user.name }}">
-													<i class="icon-user"></i>
-													{{ session.user.realname }}
-												</a>
-											</li>
-										{% end %}
-										<li class="divider"></li>
 										<li>
 											<a href="/profile">
 												<i class="icon-user"></i>
@@ -155,8 +136,14 @@
 											</a>
 										</li>
 										<li class="divider"></li>
-
 										{% if session and session.impersonated_user %}
+											<li class="nav-header">{{ _("Impersonated by") }}</li>
+											<li>
+												<a href="/user/{{ session.user.name }}">
+													<i class="icon-user"></i>
+													{{ session.user.realname }}
+												</a>
+											</li>
 											<li>
 												<a href="/user/impersonate?action=stop">
 													<i class="icon-off"></i>