# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1302225998 -7200
# Node ID 5b7e9a6565c9221046cca76653e5ece8511388a1
# Parent  13b1019d68d8189255c3154d739974829372dd54
Better loading integration and clean up code in pkgs.cgi

diff -r 13b1019d68d8 -r 5b7e9a6565c9 lib/libtazpanel
--- a/lib/libtazpanel	Fri Apr 08 01:17:37 2011 +0200
+++ b/lib/libtazpanel	Fri Apr 08 03:26:38 2011 +0200
@@ -94,5 +94,7 @@
 	cat << EOT
 	</tbody>
 </table>
+<a href="#header">`gettext "Go up"`</a>
 EOT
+	
 }
diff -r 13b1019d68d8 -r 5b7e9a6565c9 pkgs.cgi
--- a/pkgs.cgi	Fri Apr 08 01:17:37 2011 +0200
+++ b/pkgs.cgi	Fri Apr 08 03:26:38 2011 +0200
@@ -32,26 +32,24 @@
 
 # We need packages information for list and search
 parse_packages_desc() {
-while read line
+	IFS="|"
+	cut -f 1,2,3,5 -d "|" | while read PACKAGE VERSION SHORT_DESC WEB_SITE
 	do
 		echo '<tr>'
-		pkg=$(echo $line | cut -d "|" -f 1)
-		vers=$(echo $line | cut -d "|" -f 2)
-		desc=$(echo $line | cut -d "|" -f 3)
-		web=$(echo $line | cut -d "|" -f 5)
-		if [ -d $INSTALLED/$pkg ]; then
-			echo -e "<td><input type='checkbox' name='pkg' value=\"$pkg\">\n
-				<a href='$SCRIPT_NAME?info=$pkg'>
-				<img src='$IMAGES/tazpkg-installed.png'/>$pkg</a></td>"
+		if [ -d $INSTALLED/$PACKAGE ]; then
+			echo -e "<td><input type='checkbox' name='pkg' value=\"$PACKAGE\">\n
+				<a href='$SCRIPT_NAME?info=$PACKAGE'>
+				<img src='$IMAGES/tazpkg-installed.png'/>$PACKAGE</a></td>"
 		else
-			echo -e "<td><input type='checkbox' name='pkg' value=\"$pkg\">\n
-				<img src='$IMAGES/tazpkg.png'/>$pkg</td>"
+			echo -e "<td><input type='checkbox' name='pkg' value=\"$PACKAGE\">\n
+				<img src='$IMAGES/tazpkg.png'/>$PACKAGE</td>"
 		fi
-		echo "<td>$vers</td>"
-		echo "<td class='desc'>$desc</td>"
-		echo "<td><a href='$web'>web</a></td>"
+		echo "<td>$VERSION</td>"
+		echo "<td class='desc'>$SHORT_DESC</td>"
+		echo "<td><a href='$WEB_SITE'>web</a></td>"
 		echo '</tr>'
 	done
+	unset IFS
 }
 
 # Remove status and ESC char from tazpkg commands output
@@ -145,9 +143,25 @@
 EOT
 }
 
-# For my packages list
-list_actions() {
-	cat << EOT
+#
+# Commands
+#
+
+case "$QUERY_STRING" in
+	list*)
+		#
+		# List installed packages. This is the default because parsing
+		# the full packages.desc can be long and take some resources
+		#
+		cd $INSTALLED
+		search_form
+		sidebar
+		LOADING_MSG="Listing packages..."
+		loading_msg
+		cat << EOT
+<h2>`gettext "My packages"`</h2>
+<form method='get' action='$SCRIPT_NAME'>
+<div id="actions">
 <div class="float-left">
 	`gettext "Selection:"`
 	<input type="submit" name="do" value="Remove" />
@@ -158,82 +172,6 @@
 	<input type="submit" name="upgradeable" value="Upgrade" />
 </div>
 EOT
-}
-
-# For list-cat
-list_cat_action() {
-	cat << EOT
-<div class="float-left">
-	`gettext "Selection:"`
-	<input type="submit" name="do" value="Install" />
-	<input type="submit" name="do" value="Remove" />
-</div>
-<div class="float-right">
-	`gettext "List:"`
-	<input type="submit" name="recharge" value="Recharge" />
-	<input type="submit" name="upgradeable" value="Upgrade" />
-	<a class="button" href='$SCRIPT_NAME?list'>
-		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
-</div>
-EOT
-}
-
-# For search with JS function to toogle all pkgs
-list_full_actions() {
-	cat << EOT
-<div class="float-left">
-	`gettext "Selection:"`
-	<input type="submit" name="do" value="Install" />
-	<input type="submit" name="do" value="Remove" />
-	<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
-</div>
-<div class="float-right">
-	`gettext "List:"`
-	<input type="submit" name="recharge" value="Recharge" />
-	<input type="submit" name="upgradeable" value="Upgrade" />
-	<a class="button" href='$SCRIPT_NAME?list'>
-		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
-</div>
-EOT
-}
-
-# For upgrade with JS function to toogle all pkgs and no 'Upgrade' button
-list_up_actions() {
-	cat << EOT
-<div class="float-left">
-	`gettext "Selection:"`
-	<input type="submit" name="do" value="Install" />
-	<input type="submit" name="do" value="Remove" />
-	<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
-</div>
-<div class="float-right">
-	`gettext "List:"`
-	<input type="submit" name="recharge" value="Recharge" />
-	<a class="button" href='$SCRIPT_NAME?list'>
-		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
-</div>
-EOT
-}
-
-#
-# Commands
-#
-
-case "$QUERY_STRING" in
-	list*)
-		# List installed packages. This is the default because parsing
-		# the full packages.desc can be long and take some resources
-		cd $INSTALLED
-		search_form
-		sidebar
-		LOADING_MSG="Listing... please wait"
-		loading_msg
-		cat << EOT
-<h2>`gettext "My packages"`</h2>
-<form method='get' action='$SCRIPT_NAME'>
-<div id="actions">
-EOT
-		list_actions
 		echo '</div>'
 		table_start
 		table_head
@@ -253,41 +191,70 @@
 			echo '</tr>'
 		done
 		table_end
-		list_actions
 		echo '</form>' ;;
 	cat*)
+		#
 		# List all available packages by category on mirror. Listing all
 		# packages is to resource intensive and not usefull.
+		#
 		cd  $LOCALSTATE
 		category=${QUERY_STRING#cat=}
 		[ "${QUERY_STRING}" == "cat" ] && category="base-system"
 		search_form
 		sidebar | sed s/"active_${category}"/"active"/
+		LOADING_MSG="Listing packages..."
+		loading_msg
 		cat << EOT
 <h2>`gettext "Category:"` $category</h2>
 <form method='get' action='$SCRIPT_NAME'>
 <div id="actions">
+<div class="float-left">
+	`gettext "Selection:"`
+	<input type="submit" name="do" value="Install" />
+	<input type="submit" name="do" value="Remove" />
+</div>
+<div class="float-right">
+	`gettext "List:"`
+	<input type="submit" name="recharge" value="Recharge" />
+	<input type="submit" name="upgradeable" value="Upgrade" />
+	<a class="button" href='$SCRIPT_NAME?list'>
+		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+</div>
 EOT
-		list_cat_action
 		echo '</div>'
 		table_start
 		table_head
 		grep "| $category |" packages.desc | parse_packages_desc
 		table_end
-		list_cat_action
 		echo '</form>' ;;
 	search=*)
+		#
 		# Search for packages
+		#
 		pkg=${QUERY_STRING#*=}
 		cd  $LOCALSTATE
 		search_form
 		sidebar
+		LOADING_MSG="Searching packages..."
+		loading_msg
 		cat << EOT
 <h2>`gettext "Search packages"`</h2>
 <form method="get" action="$SCRIPT_NAME">
 <div id="actions">
+<div class="float-left">
+	`gettext "Selection:"`
+	<input type="submit" name="do" value="Install" />
+	<input type="submit" name="do" value="Remove" />
+	<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
+</div>
+<div class="float-right">
+	`gettext "List:"`
+	<input type="submit" name="recharge" value="Recharge" />
+	<input type="submit" name="upgradeable" value="Upgrade" />
+	<a class="button" href='$SCRIPT_NAME?list'>
+		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+</div>
 EOT
-		list_full_actions
 		echo '</div>'
 		table_start
 		table_head
@@ -295,21 +262,26 @@
 		table_end
 		echo '</form>' ;;
 	recharge*)
+		#
 		# Let recharge the packages list
+		#
 		search_form
 		sidebar
+		LOADING_MSG="Recharging lists..."
+		loading_msg
 		cat << EOT
 <h2>`gettext "Recharge"`</h2>
 <form method='get' action='$SCRIPT_NAME'>
 <div id="actions">
 	<div class="float-left">
 		<p>
-			`gettext "Recharge will check for new or updated packages...
-please wait"`
+			`gettext "Recharge checks for new or updated packages"`
 		</p>
 	</div>
 	<div class="float-right">
 		<p>
+			<a class="button" href='$SCRIPT_NAME?upgradeable'>
+				`gettext "Check upgrade"`</a>
 			<a class="button" href='$SCRIPT_NAME?list'>
 				<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
 		</p>
@@ -318,20 +290,39 @@
 <pre>
 EOT
 		tazpkg recharge | filter_tazpkg_msgs
-		echo '</pre>'
-		echo '<p>'
-		gettext "Packages lists are up-to-date"
-		echo '</p>' ;;
+		cat << EOT
+</pre>
+<p>
+	`gettext "Packages lists are up-to-date. You should check for upgrade now."`
+</p>
+EOT
+		;;
 	upgradeable*)
+		#
+		# Ugrade packages
+		#
 		cd $LOCALSTATE
 		search_form
 		sidebar
+		LOADING_MSG="Checking for upgrade..."
+		loading_msg
 		cat << EOT
 <h2>`gettext "Upgradeable packages"`</h2>
 <form method="get" action="$SCRIPT_NAME">
 <div id="actions">
+<div class="float-left">
+	`gettext "Selection:"`
+	<input type="submit" name="do" value="Install" />
+	<input type="submit" name="do" value="Remove" />
+	<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
+</div>
+<div class="float-right">
+	`gettext "List:"`
+	<input type="submit" name="recharge" value="Recharge" />
+	<a class="button" href='$SCRIPT_NAME?list'>
+		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+</div>
 EOT
-		list_up_actions
 		tazpkg upgradeable
 		echo '</div>'
 		table_start
@@ -341,10 +332,11 @@
 			grep "^$pkg |" $LOCALSTATE/packages.desc | parse_packages_desc
 		done
 		table_end
-		list_up_actions
 		echo '</form>' ;;
 	do=*)
+		#
 		# Do an action on one or some packages
+		#
 		cmdline=`echo ${QUERY_STRING#do=} | sed s'/&/ /g'`		
 		cmd=`echo ${cmdline} | awk '{print $1}'`		
 		pkgs=`echo $cmdline | sed -e s'/+/ /g' -e s'/pkg=//g' -e s/$cmd//`
@@ -356,13 +348,15 @@
 		esac
 		search_form
 		sidebar
+		LOADING_MSG="${cmd}ing packages..."
+		loading_msg
 		cat << EOT
 <h2>Tazpkg: $cmd</h2>
 <form method="get" action="$SCRIPT_NAME">
 <div id="actions">
 	<div class="float-left">
 		<p>
-			`gettext "Performing task on packages... please wait"`
+			`gettext "Performing task on packages"`
 		</p>
 	</div>
 	<div class="float-right">
@@ -373,16 +367,19 @@
 	</div>
 </div>
 EOT
-		echo '<pre class="pre-main">'
+		echo '<div class="box">'
 		gettext "Executing $cmd for:$pkgs"
-		echo '</pre>'
+		echo '</div>'
 		for pkg in $pkgs
 		do
 			echo '<pre>'
-			echo 'y' | tazpkg $cmd $pkg $opt 2>/dev/null | filter_tazpkg_msgs
+			echo 'o' | tazpkg $cmd $pkg $opt 2>/dev/null | filter_tazpkg_msgs
 			echo '</pre>'
 		done ;;
 	info=*)
+		#
+		# Packages info
+		#
 		pkg=${QUERY_STRING#*=}
 		search_form
 		sidebar
@@ -422,7 +419,9 @@
 EOT
 		;;
 	config*)
+		#
 		# Tazpkg configuration page
+		#
 		cmd=${QUERY_STRING#*=}
 		case "$cmd" in
 			clean)
@@ -477,23 +476,22 @@
 		cat << EOT
 <h2>`gettext "Summary"`</h2>
 <div id="actions">
-	`gettext "Overview of all installed and mirrored packages"`
+	<a class="button" href='$SCRIPT_NAME?list'>
+		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
+	<a class="button" href='$SCRIPT_NAME?recharge'>
+		<img src="$IMAGES/recharge.png" />`gettext "Recharge list"`</a>
+	<a class="button" href='$SCRIPT_NAME?upgradeable'>
+		<img src="$IMAGES/update.png" />`gettext "Check upgrade"`</a>
+	<a class="button" href='$SCRIPT_NAME?config'>
+		<img src="$IMAGES/edit.png" />`gettext "Configuration"`</a>	
 </div>
 <pre class="pre-main">
 `packages_summary`
 </pre>
-<a class="button" href='$SCRIPT_NAME?list'>
-	<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
-<a class="button" href='$SCRIPT_NAME?recharge'>
-	<img src="$IMAGES/recharge.png" />`gettext "Recharge list"`</a>
-<a class="button" href='$SCRIPT_NAME?upgradeable'>
-	<img src="$IMAGES/update.png" />`gettext "Check upgrade"`</a>
-<a class="button" href='$SCRIPT_NAME?config'>
-	<img src="$IMAGES/edit.png" />`gettext "Configuration"`</a>
 
 <h3>`gettext "Latest log entries"`</h3>
 <pre>
-`tail -n 6 /var/log/tazpkg.log | fgrep "-" | \
+`tail -n 5 /var/log/tazpkg.log | fgrep "-" | \
 	awk '{print $1, $2, $3, $4, $5, $6, $7}'`
 </pre>
 
diff -r 13b1019d68d8 -r 5b7e9a6565c9 styles/default/header.html
--- a/styles/default/header.html	Fri Apr 08 01:17:37 2011 +0200
+++ b/styles/default/header.html	Fri Apr 08 03:26:38 2011 +0200
@@ -5,16 +5,10 @@
 	<meta charset="utf-8" />
 	<link rel="shortcut icon" href="/styles/default/favicon.ico" />
 	<link rel="stylesheet" type="text/css" href="/styles/default/style.css" />
-	<!--
-		This function will hide the the loading message when page is fully
-		loaded. We use div id="loading", function in <head> and body onload=
-	-->
+	<!-- Function to hide the loading message when page is generated. -->
 	<script type="text/javascript">
 		function showLoading(){
-			//hide loading status...
 			document.getElementById("loading").style.display='none';
-			
-			document.getElementById("content").style.display='block';
 		}
 	</script>
 </head>
diff -r 13b1019d68d8 -r 5b7e9a6565c9 styles/default/style.css
--- a/styles/default/style.css	Fri Apr 08 01:17:37 2011 +0200
+++ b/styles/default/style.css	Fri Apr 08 03:26:38 2011 +0200
@@ -25,15 +25,6 @@
 a { text-decoration: none; color: #666; }
 a:hover { color: #000; }
 
-#loading {
-  /* font-weight: bold; */
-  color: #666;
-  position: fixed;
-  top: 92px;
-  right: 80px;
-  width: 200px;
-}
-
 /* Header and main title */
 
 #header {
@@ -49,7 +40,7 @@
 	left: 0;
 	height: 24px;
 	width: 100%;
-	padding: 0 0 0 0;
+	padding: 0;
 	background-color: #f1efeb;
 	border-bottom: 1px solid #c1baad;
 	z-index: 200;
@@ -63,7 +54,18 @@
 #icons { margin: 2px 8px; float: right; }
 #icons img { padding: 0; }
 
-.progress { cursor: progress; }
+#loading {
+  /* font-weight: bold; */
+  background-color: #f8f8f8;
+  border: 1px solid #ddd;
+  color: #666;
+  cursor: progress;
+  position: fixed;
+  top: 92px;
+  right: 40px;
+  width: 248px;
+  padding: 4px 4px 2px;
+}
 
 /* Blocks */
 
@@ -128,6 +130,7 @@
 	padding: 4px;
 	height: 17px;
 	margin: 0;
+	width: 190px;
 	border-top-left-radius: 4px;
 	border-bottom-left-radius: 4px;
 }
@@ -146,11 +149,11 @@
 
 .debug {
 	position: fixed;
-	top: 20px;
-	left: 5px;
+	bottom: 0px;
+	left: 0px;
+	margin: 10px 20px;
 	padding: 6px 20px;
-	background-color: #f8f8f8;
-	border: 1px solid #ddd;
+	background-color: #e64a00;
 }
 
 .float-left { float: left;  }
@@ -210,7 +213,7 @@
 
 /* Round corner */
 
-table, pre, input[type=submit], .debug, .box,
+#loading, table, pre, input[type=submit], .debug, .box,
 .button, div.scroll {
 	/*-moz-border-radius: 4px;
 	-webkit-border-radius: 4px; */
diff -r 13b1019d68d8 -r 5b7e9a6565c9 tazpanel.conf
--- a/tazpanel.conf	Fri Apr 08 01:17:37 2011 +0200
+++ b/tazpanel.conf	Fri Apr 08 03:26:38 2011 +0200
@@ -17,7 +17,7 @@
 XTERM_OPTS="-geometry 80x16-0+24 -bg black -fg white"
 
 # Generic page loading message
-LOADING_MSG="Loading... please wait"
+LOADING_MSG="Loading..."
 
 # Busybox HTTP deamon config
 HTTPD_CONF="/etc/slitaz/httpd.conf"