# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1301745329 -7200
# Node ID ab6120f11be40f94fa650b3f3348b27ee1bc2551
# Parent  4c5ad38717a026ea571413e29a658605912a7891
Implement system upgrade: faster than ever now!!!

diff -r 4c5ad38717a0 -r ab6120f11be4 checkbox.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/checkbox.js	Sat Apr 02 13:55:29 2011 +0200
@@ -0,0 +1,20 @@
+javascript:(function(){
+function checkFrames(w) {
+
+  try {
+    var inputs = w.document.getElementsByTagName('input');
+    for (var i = 0; i < inputs.length; i++) {
+      if (inputs[i].type && inputs[i].type == 'checkbox'){
+        inputs[i].checked = !inputs[i].checked;
+      }
+    }
+  } catch (e){}
+  if(w.frames && w.frames.length>0){
+    for(var i = 0; i < w.frames.length;i++){
+      var fr = w.frames[i];
+      checkFrames(fr);
+    }
+  }
+}
+checkFrames(window);
+})()
diff -r 4c5ad38717a0 -r ab6120f11be4 index.cgi
--- a/index.cgi	Sat Apr 02 10:23:38 2011 +0200
+++ b/index.cgi	Sat Apr 02 13:55:29 2011 +0200
@@ -7,8 +7,10 @@
 
 . tazpanel.conf
 
-# xHTML 5 header
-cat $HEADER | sed s'/- %TITLE%//'
+xhtml_header() {
+	# xHTML 5 header
+	cat $HEADER | sed s/'- %TITLE%'/"$TITLE"/
+}
 
 [ $DEBUG == "1" ] && echo "<p class='debug'>DEBUG on</p>"
 
@@ -17,9 +19,9 @@
 #
 
 case "$QUERY_STRING" in
-	sysinfo)
-		echo "TODO" ;;
 	users)
+		TITLE="- Users"
+		xhtml_header
 		echo '<ul>'
 		fgrep /home /etc/passwd | while read line
 		do
@@ -29,15 +31,20 @@
 		done
 		echo '</ul>' ;;
 	network)
+		TITLE="- Network"
+		xhtml_header
 		echo '<pre>'
 		ifconfig
 		echo '</pre>' ;;
 	hardware)
+		TITLE="- Hardware"
+		xhtml_header
 		echo '<pre>'
 		lspci
 		echo '</pre>' ;;
 	*)
 		# Default xHTML content
+		xhtml_header
 		cat << EOT
 <p>
 	Uptime: `uptime`
diff -r 4c5ad38717a0 -r ab6120f11be4 tazpkg.cgi
--- a/tazpkg.cgi	Sat Apr 02 10:23:38 2011 +0200
+++ b/tazpkg.cgi	Sat Apr 02 13:55:29 2011 +0200
@@ -65,14 +65,18 @@
 
 # Display a full summary of packages stats
 packages_summary() {
-	gettext "Installed packages : "
+	gettext "Installed packages   : "
 	ls $INSTALLED | wc -l
-	gettext "Mirrored packages  : "
+	gettext "Mirrored packages    : "
 	cat $LOCALSTATE/packages.list | wc -l
-	gettext "Last recharge      : "
+	gettext "Last recharge        : "
 	stat -c %y $LOCALSTATE/packages.list | sed 's/\(:..\):.*/\1/'
-	gettext "Installed files    : "
+	gettext "Upgradeable packages : "
+	cat $LOCALSTATE/upgradeable-packages.list | wc -l
+	gettext "Installed files      : "
 	cat $INSTALLED/*/files.list | wc -l
+	gettext "Blocked packages     : "
+	cat $LOCALSTATE/blocked-packages.list | wc -l
 }
 
 #
@@ -99,6 +103,7 @@
 EOT
 }
 
+
 list_actions() {
 	cat << EOT
 	<p>
@@ -119,11 +124,17 @@
 		<input type="submit" name="do" value="remove" />
 		`gettext "List:"`
 		<a href='$SCRIPT_NAME?list'>`gettext "My packages"`</a> |
-		<a href='$SCRIPT_NAME?recharge'>`gettext "Recharge"`</a>
+		<a href='$SCRIPT_NAME?recharge'>`gettext "Recharge"`</a> |
 	</p>
 EOT
 }
 
+js_checkbox_all() {
+cat << EOT
+
+EOT
+}
+
 #
 # Commands
 #
@@ -177,7 +188,8 @@
 		`gettext "List:"`
 		<a href='$SCRIPT_NAME?list'>`gettext "My packages"`</a> |
 		<a href='$SCRIPT_NAME?list-all'>`gettext "All packages"`</a> |
-		<a href='$SCRIPT_NAME?recharge'>`gettext "Recharge"`</a>
+		<a href='$SCRIPT_NAME?recharge'>`gettext "Recharge"`</a> |
+		<a href="`cat checkbox.js`">`gettext "Toogle all"`</a>
 	</p>
 EOT
 		table_start
@@ -186,13 +198,39 @@
 		echo '</form>' ;;
 	recharge)
 		# Let recharge the packages list
+		cat << EOT
+	<p>
+		`gettext "List:"`
+		<a href='$SCRIPT_NAME?list'>`gettext "My packages"`</a>
+	</p>
+<pre>
+EOT
+		gettext "Recharging the packages list... please wait"; echo
+		tazpkg recharge | filter_tazpkg_msgs
+		echo '</pre>'
 		echo '<p>'
-		gettext "Recharging the packages lists..."
-		echo '</p><pre>'
-		tazpkg recharge | filter_tazpkg_msgs
-		echo '</pre><p>'
 		gettext "Packages lists are up-to-date"
 		echo '</p>' ;;
+	upgradeable)
+		cat << EOT
+<form method="get" action="$SCRIPT_NAME">
+<p>
+	`gettext "Selection:"`
+		<input type="submit" name="do" value="install" />
+	`gettext "List:"`
+	<a href='$SCRIPT_NAME?list'>`gettext "My packages"`</a> |
+	`gettext "Upgradeable packages list"`
+	<a href="`cat checkbox.js`">`gettext "Toogle all"`</a>
+</p>
+EOT
+		table_start
+		tazpkg upgradeable
+		for pkg in `cat $LOCALSTATE/upgradeable-packages.list`
+		do
+			grep "^$pkg |" $LOCALSTATE/packages.desc | parse_packages_desc
+		done
+		table_end
+		echo '</form>' ;;
 	do=*)
 		# Do an action on one or some packages
 		cmdline=`echo ${QUERY_STRING#do=} | sed s'/&/ /g'`		
@@ -205,7 +243,7 @@
 			echo '<p>'
 			gettext "Executing: tazpkg $cmd $pkg"
 			echo '</p><pre>'
-			echo 'y' | tazpkg $cmd $pkg 2>/dev/null | filter_tazpkg_msgs
+			echo 'y' | tazpkg $cmd $pkg --forced 2>/dev/null | filter_tazpkg_msgs
 			echo '</pre>'
 		done ;;
 	info=*)
@@ -220,8 +258,8 @@
 Name        : $PACKAGE
 Version     : $VERSION
 Description : $SHORT_DESC
-Depends     : 
-
+Depends     : `for i in $DEPENDS; do echo -n \
+	"<a href="$SCRIPT_NAME?info=$i">$i</a> "; done`
 Website     : <a href="$WEB_SITE">$WEB_SITE</a>
 Sizes       : $PACKED_SIZE/$UNPACKED_SIZE
 Files       : `cat $INSTALLED/$pkg/files.list | wc -l`
@@ -238,7 +276,8 @@
 		cat << EOT
 `gettext "List:"`
 <a href='$SCRIPT_NAME?list'>`gettext "My packages"`</a> |
-<a href='$SCRIPT_NAME?recharge'>`gettext "Recharge"`</a>
+<a href='$SCRIPT_NAME?recharge'>`gettext "Recharge"`</a> |
+<a href='$SCRIPT_NAME?upgradeable'>`gettext "Upgradeable"`</a>
 <pre>
 `packages_summary`
 </pre>