# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1487774638 -3600
# Node ID 2a172aca82287b9fc0d5fe4f7df03aa47501f0eb
# Parent  f07cd117feedbc83fcb3f82f4225db176702ad9b
Last fixes and improvemnt before using new tazbug storage on Tank

diff -r f07cd117feed -r 2a172aca8228 web/bugs.cgi
--- a/web/bugs.cgi	Wed Feb 22 14:59:49 2017 +0100
+++ b/web/bugs.cgi	Wed Feb 22 15:43:58 2017 +0100
@@ -323,7 +323,7 @@
 </pre>
 EOT
 	if [ "$PKGS" ] && [ -x "$plugins/packages/packages.cgi" ]; then
-		echo "<p>"
+		echo "<p style='vertical-align: middle;'>"
 		echo "<strong>$(gettext 'Affected package(s):')</strong>"
 		for pkg in $PKGS; do
 			echo "<a href='?pkg=$pkg'>$pkg</a>"
@@ -572,7 +572,7 @@
 	[ "$size" ] || size=48
 	url="http://www.gravatar.com/avatar"
 	md5=$(md5crypt $email)
-	echo "<img src=\"$url/$md5?d=identicon&amp;s=$size\" alt=\"\" />"
+	echo "<img src='$url/$md5?d=identicon&amp;s=$size' alt='' />"
 }
 
 # Create a new user in AUTH_FILE and PEOPLE
@@ -684,6 +684,7 @@
 		fi
 		echo '</pre>'
 		html_footer ;;
+		
 	*\ closed\ *)
 		# Show all closed bugs.
 		header
@@ -692,6 +693,7 @@
 		list_bugs "closed"
 		echo "</pre>"
 		html_footer ;;
+		
 	*\ login\ *)
 		# The login page
 		[ "$(GET error)" ] && \
@@ -701,6 +703,7 @@
 		user_box
 		login_page
 		html_footer ;;
+		
 	*\ logout\ *)
 		header
 		html_header
@@ -709,6 +712,7 @@
 			js_unset_cookie 'auth'
 			js_redirection_to "$script"
 		fi ;;
+		
 	*\ user\ *)
 		# User profile. Use the users plugin for more functions
 		last="$(cat $PEOPLE/"$(GET user)"/last)"
@@ -725,6 +729,7 @@
 </pre>
 EOT
 		html_footer ;;
+		
 	*\ newbug\ *)
 		# Create a bug from web interface.
 		header
@@ -736,6 +741,7 @@
 			echo "<p>$(gettext 'You must be logged in to post a new bug')</p>"
 		fi
 		html_footer ;;
+		
 	*\ addbug\ *)
 		# Save a new bug
 		header
@@ -744,6 +750,7 @@
 			new_bug
 			js_redirection_to "$script?id=$id"
 		fi ;;
+		
 	*\ editbug\ *)
 		# Edit existing bug
 		header
@@ -753,16 +760,17 @@
 		user_box
 		edit_bug
 		html_footer ;;
+		
 	*\ savebug\ *)
-		header
-		html_header
 		if check_auth; then
 			save_bug
 			js_redirection_to "$script?id=$id"
 		fi ;;
+		
 	*\ id\ *)
 		header
 		html_header
+		user_box
 		id="$(GET id)"
 		[ "$(GET close)" ] && close_bug
 		[ "$(GET open)" ] && open_bug
@@ -770,9 +778,9 @@
 		[ "$(GET msg)" ] && new_msg
 		[ "$(GET delmsg)" ] && rm -f $bugdir/$id/msg.$(GET delmsg)
 		msgs=$(fgrep MSG= $bugdir/$id/msg.* | wc -l)
-		user_box
 		bug_page
 		html_footer ;;
+		
 	*\ signup\ *)
 		# Signup
 		header
diff -r f07cd117feed -r 2a172aca8228 web/images/pkg.png
Binary file web/images/pkg.png has changed
diff -r f07cd117feed -r 2a172aca8228 web/index.cgi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/index.cgi	Wed Feb 22 15:43:58 2017 +0100
@@ -0,0 +1,1 @@
+bugs.cgi
\ No newline at end of file
diff -r f07cd117feed -r 2a172aca8228 web/plugins/packages/packages.cgi
--- a/web/plugins/packages/packages.cgi	Wed Feb 22 14:59:49 2017 +0100
+++ b/web/plugins/packages/packages.cgi	Wed Feb 22 15:43:58 2017 +0100
@@ -18,11 +18,18 @@
 			if echo "$PKGS" | fgrep -q "$pkg"; then
 				dir=$(dirname $bug)
 				id=$(basename $dir)
-				echo "Bug $id: <a href='$script?id=$id'>$BUG</a> \
-- <span class='date'>$DATE</span>"
+				cat << EOT
+<a href="?user=$USER">$(get_gravatar "$MAIL" 24)</a> \
+Bug $id: <a href='$script?id=$id'>$BUG</a> - <span class='date'>$DATE</span>
+EOT
 			fi
 		done
-		echo "</pre>"
+		cat << EOT
+</pre>
+<div id="tools">
+	<a href="$script?packages">Buggy packages</a>
+</div>
+EOT
 	else
 		# List all pkgs affected by a bug
 		echo "<h2>Buggy packages</h2>"
@@ -38,7 +45,7 @@
 			done
 		done
 		for pkg in $pkgs; do
-			echo "Package: <a href='?pkg=$pkg'>$pkg</a>"
+			echo "<img src='images/pkg.png' /> Package: <a href='?pkg=$pkg'>$pkg</a>"
 		done
 		echo "</pre>"
 	fi
diff -r f07cd117feed -r 2a172aca8228 web/plugins/textmode/textmode.cgi
--- a/web/plugins/textmode/textmode.cgi	Wed Feb 22 14:59:49 2017 +0100
+++ b/web/plugins/textmode/textmode.cgi	Wed Feb 22 15:43:58 2017 +0100
@@ -27,6 +27,7 @@
 				. ${bugdir}/${bug}/bug.conf
 				echo "Bug: $bug - $BUG"
 			fi
+			bugdir=$(dirname $bugdir)
 		done
 		if [ "$found" == "" ]; then
 			echo "No result found for: $(GET search)"