# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1333572054 -7200
# Node ID 74eb7fea1546d42a14737b921e51bbebd59d9320
# Parent  8d5eadf9ca7a410a2a95a16e497ac1375026549a
Improve search function and login page, use placeholder and THANKS Paul for the corrections

diff -r 8d5eadf9ca7a -r 74eb7fea1546 web/bugs.cgi
--- a/web/bugs.cgi	Wed Apr 04 20:03:49 2012 +0100
+++ b/web/bugs.cgi	Wed Apr 04 22:40:54 2012 +0200
@@ -117,22 +117,12 @@
 
 <div id="login">
 	<form method="post" action="$SCRIPT_NAME">
-		<table>
-			<tbody>
-				<tr>
-					<td>$(gettext "User name")</td>
-					<td><input type="text" name="auth" /></td>
-				</tr>
-				<tr>
-					<td>$(gettext "Password")</td>
-					<td><input type="password" name="pass" /></td>
-				</tr>
-				<tr>
-					<td><input type="submit" value="$(gettext "Login")" /></td>
-					<td>$error </td>
-				</tr>
-			</tbody>
-		</table>
+		<input type="text" name="auth" placeholder="$(gettext "User name")" />
+		<input type="password" name="pass" placeholder="$(gettext "Password")" />
+		<div>
+			<input type="submit" value="Login" />
+			$error
+		</div>
 	</form>
 </div>
 
@@ -172,10 +162,9 @@
 			if [ "$PRIORITY" == "$pr" ]; then
 				cat << EOT
 <pre>
-Bug title  : <strong>$BUG</strong>
+Bug title  : <strong>$BUG</strong> <a href="?id=$id">Show</a>
 ID - Date  : $id - $DATE
-Creator    : <a href="?user=$CREATOR">$CREATOR</a> - \
-<a href="?id=$id">Show Bug</a>
+Creator    : <a href="?user=$CREATOR">$CREATOR</a>
 </pre>
 EOT
 			fi
@@ -392,7 +381,7 @@
 	echo "<img src='$url/$md5?d=identicon&s=$size' alt='' />"
 }
 
-# Create a new user
+# Create a new user in AUTH_FILE and PEOPLE
 new_user_config() {
 	mail="$(GET mail)"
 	pass="$(GET pass)"
@@ -466,6 +455,7 @@
 			error="<span class="error">$(gettext "Bad login or pass")</span>"
 		header 
 		html_header
+		user_box
 		login_page 
 		html_footer ;;
 	*\ logout\ *)
@@ -581,17 +571,26 @@
 	<input type="text" name="search" />
 	<input type="submit" value="$(gettext "Search")" />
 </form>
-<pre>
+<div>
 EOT
-		IFS="/"
-		grep -i -H $(GET search) $bugdir/*/* | while read bug id file
+	
+		#found=0 JS to notify or write results nb under the search box.
+		for bug in $bugdir/*
 		do
-			echo -n "<a href='?id=$id'>Bug</a> $id : " 
-			echo $file | cut -d : -f 2 | \
-				sed s"/$(GET search)/<span class='ok'>$(GET search)<\/span>/"g
+			result=$(fgrep -i "$(GET search)" $bug/*)
+			if [ "$result" ]; then
+				#found=$(($found + 1))
+				id=${bug#bug/}
+				echo "<p><strong>Bug $id</strong> <a href='?id=$id'>$(gettext "Show")</a></p>"
+				echo '<pre>'
+				fgrep -i "$(GET search)" $bugdir/$id/* | \
+					sed s"/$(GET search)/<span class='ok'>$(GET search)<\/span>/"g
+				echo '</pre>'
+			else
+				gettext "<p>No result found for:"; echo " $(GET search)</p>"
+			fi
 		done
-		unset IFS
-		echo '</pre>' 
+		echo '</div>'
 		html_footer ;;
 	*)
 		# Default page.
@@ -629,8 +628,8 @@
 		fi
 		cat << EOT
 <form method="get" action="./">
-	<input type="text" name="search" />
-	<input type="submit" value="$(gettext "Search")" />
+	<input type="text" name="search" placeholder="$(gettext "Search")" />
+	<!-- <input type="submit" value="$(gettext "Search")" /> -->
 </form>
 </div>
 EOT
diff -r 8d5eadf9ca7a -r 74eb7fea1546 web/style.css
--- a/web/style.css	Wed Apr 04 20:03:49 2012 +0100
+++ b/web/style.css	Wed Apr 04 22:40:54 2012 +0200
@@ -71,18 +71,18 @@
 #content {
 	margin: 40px auto;
 	text-align: justify;
-	width: 720px;
+	max-width: 720px;
 }
 
 #login {
-	width: 280px;
+	width: 240px;
 	float: left;
 	height: 120px;
 }
 
 #login input[type="text"], #login input[type="password"],
 #tools input[type="text"] { 
-	width: 180px; padding: 3px; }
+	width: 220px; padding: 3px; }
 #tools input[type="submit"] { padding: 3px; }
 #login input[type="submit"] { float: none; }
 
@@ -96,7 +96,7 @@
 }
 #user a { padding: 0 4px; }
 
-#account-info { width: 380px; height: 120px; float: right; }
+#account-info { width: 420px; height: 120px; float: right; }
 
 #newbug textarea { width: 460px; }