From 5bc1124edcb43acd6e9020cf4f50da0f56bb767c Mon Sep 17 00:00:00 2001
From: Konrad Mohrfeldt <konrad.mohrfeldt@farbdev.org>
Date: Mon, 6 Feb 2012 01:42:20 +0100
Subject: [PATCH] refactored navbar so it fits on screens with at least 910px
 width

---
 .../main/templates/main/navbar-content.html   |  31 +++++++++++-------
 k4ever/media/css/img/user.png                 | Bin 0 -> 436 bytes
 k4ever/media/css/style.css                    |  13 ++++++++
 k4ever/media/css/style.less                   |  16 +++++++++
 4 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 k4ever/media/css/img/user.png

diff --git a/k4ever/main/templates/main/navbar-content.html b/k4ever/main/templates/main/navbar-content.html
index b415257..cf7d982 100644
--- a/k4ever/main/templates/main/navbar-content.html
+++ b/k4ever/main/templates/main/navbar-content.html
@@ -24,12 +24,19 @@
 		<li class="{% active request store %}"><a href="{{ store }}">Einkaufen</a></li>
 		<li class="{% active request transactions %}"><a href="{{ transactions }}">Konto</a></li>
 		<li class="{% active request history %}"><a href="{{ history }}">Frühere Einkäufe</a></li>
-		<li class="{% active request settings %}"><a href="{{ settings }}">Einstellungen</a></li>
-		<li class="divider-vertical" role="presentation">
-		{% if user.is_staff %}
-			<li class=""><a href="/admin/">Administration</a></li>
-		{% endif %}
-		<li class="{% active request logout %}"><a href="{{ logout }}">Abmelden</a></li>
+		<li class="divider-vertical" role="presentation"></li>
+		<ul class="nav">
+			<li class="dropdown">
+				<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="icon user"></span></a>
+				<ul class="dropdown-menu">
+					<li class="{% active request settings %}"><a href="{{ settings }}"><i class="icon-cog"></i> Einstellungen</a></li>
+					{% if user.is_staff %}
+						<li class=""><a href="/admin/"><i class="icon-lock"></i> Administration</a></li>
+					{% endif %}
+					<li class="{% active request logout %}"><a href="{{ logout }}"><i class="icon-off"></i> Abmelden</a></li>
+				</ul>
+			</li>
+		</ul>
 	{% else %}
 		<li class="{% active request login %}"><a href="{{ login }}">Anmelden</a></li>
 		<li class="{% active request register %}"><a href="{{ register }}">Registrieren</a></li>
@@ -37,10 +44,12 @@
 </ul>
 
 {% if user.is_authenticated %}
-	<form class="navbar-search pull-right">
+	<div class="pull-right">
 		<span class="brand balance">Kontostand: {{ user.get_profile.balance|floatformat:2 }} €</span>
-		<input placeholder="Suche und kaufe..." class="search-query autocomplete"
-			type="search" name="search_term" value="Lade Daten..."
-			disabled="disabled" />
-	</form>
+		<form class="navbar-search">
+			<input placeholder="Suche und kaufe..." class="search-query autocomplete"
+				type="search" name="search_term" value="Lade Daten..."
+				disabled="disabled" />
+		</form>
+	</div>
 {% endif %}
\ No newline at end of file
diff --git a/k4ever/media/css/img/user.png b/k4ever/media/css/img/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..14b6ab05902d66cfeb424ede2014052542498014
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq000gE000vR1^@s6pa49S00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru+yVvwCJa35wMPH|0YOPb
zK~y-)g_ALE0x=Lp|Lis>CqPkJKuK;8DOVs;F2i-W0bNQ8f>Ln;QUg*Nx^#X&jSbGS
zBwrfIJ2T(k>pzwx0V=RP0^T^|&Gx9O>jJj#Y;RLaF08!X0(W(9(;>dt9z}%X4CmZS
zFEJlsXq(b)+Yu3xkThH@7U~5s0}?<XmJ<UrT>~%%j+x-X2adqFk5I3tzy|oru>q#t
zTaA)PDXDGSlO?uqB`G5I5%F0Bnx?r_?e(at*C&gfhG$7nl5TS9+xAD>w(q?=+MWP&
zVCPHhfVu5SSLGg9)h=|RU}gKhC=GyR9<5@XD<4m}9822+0k4(OREo9wuR8E5V4Ziu
z|DYQBb)=NY-b6K<eV12imZYY9*wz(}@*otSEh(Ca*ymT`K3^-vhzRH2y?_VcP~G5P
e|7hR<JpKT%c^XP3-wz4^0000<MNUMnLSTZ&wXY8V

literal 0
HcmV?d00001

diff --git a/k4ever/media/css/style.css b/k4ever/media/css/style.css
index d1c29e6..352e194 100644
--- a/k4ever/media/css/style.css
+++ b/k4ever/media/css/style.css
@@ -58,6 +58,16 @@ h3 {
   background: url("img/logo.png") 6px center no-repeat transparent;
   padding-left: 37px;
 }
+.navbar-inner .balance {
+  padding: 0;
+  font-size: 14px;
+  line-height: 40px;
+  margin-right: 10px;
+}
+.navbar-inner .icon {
+  width: 22px;
+  height: 19px;
+}
 .navbar-search {
   margin-bottom: -6px;
 }
@@ -375,6 +385,9 @@ table.itemListContainer > tbody > tr:first-child ~ tr > td {
   background-repeat: no-repeat;
   margin: 0 auto;
 }
+.icon.user {
+  background-image: url("img/user.png");
+}
 .icon.approved {
   background-image: url("img/approved.png");
 }
diff --git a/k4ever/media/css/style.less b/k4ever/media/css/style.less
index c3cdbad..20e03a9 100644
--- a/k4ever/media/css/style.less
+++ b/k4ever/media/css/style.less
@@ -131,6 +131,18 @@ h3 {
 		background: url("@{fldImages}/logo.png") 6px center no-repeat transparent;
 		padding-left: 37px;
 	}
+
+	.balance {
+		padding: 0;
+		font-size: 14px;
+		line-height: 40px;
+		margin-right: 10px;
+	}
+
+	.icon {
+		width: 22px;
+		height: 19px;
+	}
 }
 
 .navbar-search {
@@ -480,6 +492,10 @@ table.itemListContainer {
 	background-repeat: no-repeat;
 	margin: 0 auto;
 
+	&.user {
+		background-image: url("@{fldImages}/user.png");
+	}
+
 	&.approved {
 		background-image: url("@{fldImages}/approved.png");
 	}