# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1333576661 -7200
# Node ID 828d018ffb0fbe36e99db06e69452f1048bf5c99
# Parent  c763074019004669f02d28daf632210c1b68e4c8
User login on top right and search on all pages

diff -r c76307401900 -r 828d018ffb0f web/bugs.cgi
--- a/web/bugs.cgi	Wed Apr 04 23:00:54 2012 +0200
+++ b/web/bugs.cgi	Wed Apr 04 23:57:41 2012 +0200
@@ -80,8 +80,7 @@
 		. $PEOPLE/$user/slitaz.conf
 		cat << EOT
 <div id="user">
-$(get_gravatar $MAIL 20)
-<a href="?user=$user">$user</a>
+<a href="?user=$user">$(get_gravatar $MAIL 20)</a>
 <a href="?logout">Logout</a>
 </div>
 EOT
@@ -95,6 +94,13 @@
 	fi
 	cat << EOT
 
+<div id="search">
+	<form method="get" action="./">
+		<input type="text" name="search" placeholder="$(gettext "Search")" />
+		<!-- <input type="submit" value="$(gettext "Search")" /> -->
+	</form>
+</div>
+
 <!-- Content -->
 <div id="content">
 
@@ -617,8 +623,11 @@
 </div>
 
 <p>
-	Beta code! Please read the <a href="?README">README</a> for more 
-	information. 
+	Please read the <a href="?README">README</a> for help and more 
+	information. You may also be interested by the SliTaz
+	<a href="http://roadmap.slitaz.org/">Roadmap</a> and the packages 
+	<a href="http://cook.slitaz.org/">Cooker</a>. To perform a search
+	enter your term and press ENTER.
 </p>
 
 <div id="tools">
@@ -628,10 +637,6 @@
 			echo "<a href='?newbug'>$(gettext "Create a new bug")</a>"
 		fi
 		cat << EOT
-<form method="get" action="./">
-	<input type="text" name="search" placeholder="$(gettext "Search")" />
-	<!-- <input type="submit" value="$(gettext "Search")" /> -->
-</form>
 </div>
 EOT
 		list_bugs OPEN
diff -r c76307401900 -r 828d018ffb0f web/images/avatar.png
Binary file web/images/avatar.png has changed
diff -r c76307401900 -r 828d018ffb0f web/lib/header.html
--- a/web/lib/header.html	Wed Apr 04 23:00:54 2012 +0200
+++ b/web/lib/header.html	Wed Apr 04 23:57:41 2012 +0200
@@ -12,16 +12,14 @@
 <div id="header">
 	<div id="logo"></div>
 	<div id="network">
-		<a href="http://www.slitaz.org/">
-			<img src="images/home.png" alt="[ Home ]" /></a>
+		<a href="http://www.slitaz.org/">Home
+			<!-- <img src="images/home.png" alt="[ Home ]" /> --></a>
 		<a href="http://scn.slitaz.org/">Community</a>
 		<a href="http://doc.slitaz.org/">Doc</a>
 		<a href="http://forum.slitaz.org/">Forum</a>
 		<a href="http://slitaz.pro/">Pro</a>
 		<a href="http://shop.slitaz.org/">Shop</a>
 		<a href="http://hg.slitaz.org/">Hg</a>
-		<a href="http://cook.slitaz.org/">Cook</a>
-		<a href="http://roadmap.slitaz.org/">Roadmap</a>
 	</div>
 	<h1><a href="./">SliTaz Bugs</a></h1>
 </div>
diff -r c76307401900 -r 828d018ffb0f web/style.css
--- a/web/style.css	Wed Apr 04 23:00:54 2012 +0200
+++ b/web/style.css	Wed Apr 04 23:57:41 2012 +0200
@@ -35,7 +35,7 @@
 	font-style: italic;
 }
 
-#header h1 a:hover, #network a:hover { 
+#header h1 a:hover { 
 	color: #d66018;
 }
 
@@ -43,17 +43,20 @@
 
 #network { 
 	float: right; 
-	padding: 10px 5px 0; 
+	padding: 12px 5px 0; 
 	font-size: 12px;
+	margin-right: 100px;
 }
 
 #network a {
-	padding: 0 6px;
+	padding: 0 4px;
 	color: #fff; 
 	font-weight: bold;
 	text-decoration: none;
 }
 
+#network a:hover, #user a:hover { color: #cfcfcf; }
+
 /* Logo */
 
 #logo {
@@ -66,13 +69,7 @@
 	height: 40px;
 }
 
-/* Content */
-
-#content {
-	margin: 40px auto;
-	text-align: justify;
-	max-width: 720px;
-}
+/* Login and user box */
 
 #login {
 	width: 240px;
@@ -80,29 +77,51 @@
 	height: 120px;
 }
 
-#login input[type="text"], #login input[type="password"],
-#tools input[type="text"] { 
-	width: 220px; padding: 3px; }
-#tools input[type="submit"] { padding: 3px; }
+#login input[type="text"], #login input[type="password"] { 
+	width: 200px; }
+
 #login input[type="submit"] { float: none; }
 
 #user {
-	min-width: 180px;
-	height: 20px;
+	background-color: #3A2B22;
+	padding: 4px;
+	width: 84px;
 	float: right;
+	font-size: 12px;
+	position: absolute;
+	right: 10px;
+	top: 6px;
+}
+#user a { padding: 0 2px; color: #fff; 
+	font-weight: bold; text-decoration: none; }
+
+#account-info { width: 340px; height: 120px; float: right; }
+
+/* Search */
+
+#search {
 	position: absolute;
 	right: 20px;
-	top: 68px;
+	top: 60px;
+	
 }
-#user a { padding: 0 4px; }
 
-#account-info { width: 420px; height: 120px; float: right; }
+#search input[type="text"] { width: 200px; }
+
+/* Content */
+
+#content {
+	margin: 40px auto;
+	padding: 0 20px;
+	text-align: justify;
+	max-width: 680px;
+}
 
 #newbug textarea { width: 460px; }
 
 #edit textarea { width: 100%; height: 240px; }
 
-.box, pre, #user, #login, #account-info {
+.box, pre, #login, #account-info {
 	background-color: #f8f8f8;
 	border: 1px solid #ddd;
 	padding: 10px;
@@ -169,6 +188,13 @@
 	background-repeat: no-repeat;
 }
 
+#tools { 
+	padding-top: 10px; 
+	/*margin-top: 20px; 
+	border-top: 1px dotted #ccc;
+	position: fixed;
+	bottom: 10px;*/
+}
 #tools a { text-decoration: none; margin: 4px 6px 4px 0px; }
 
 /* Round corner */