tazpanel diff pkgs.cgi @ rev 47

Move old upgreadeable command to 'up' and small edit
author Christophe Lincoln <pankso@slitaz.org>
date Fri Apr 08 20:17:30 2011 +0200 (2011-04-08)
parents 56d55a9dcc9c
children cf15cb2ff715
line diff
     1.1 --- a/pkgs.cgi	Fri Apr 08 05:59:24 2011 +0200
     1.2 +++ b/pkgs.cgi	Fri Apr 08 20:17:30 2011 +0200
     1.3 @@ -73,8 +73,8 @@
     1.4  	ls $INSTALLED | wc -l
     1.5  	gettext "Mirrored packages    : "
     1.6  	cat $LOCALSTATE/packages.list | wc -l
     1.7 -	gettext "Upgradeable packages : "
     1.8 -	cat $LOCALSTATE/upgradeable-packages.list | wc -l
     1.9 +	gettext "up packages : "
    1.10 +	cat $LOCALSTATE/packages.up | wc -l
    1.11  	#gettext "Installed files      : "
    1.12  	#cat $INSTALLED/*/files.list | wc -l
    1.13  	gettext "Blocked packages     : "
    1.14 @@ -169,7 +169,7 @@
    1.15  	<div class="float-right">
    1.16  		`gettext "List:"`
    1.17  		<input type="submit" name="recharge" value="Recharge" />
    1.18 -		<input type="submit" name="upgradeable" value="Upgrade" />
    1.19 +		<input type="submit" name="up" value="Upgrade" />
    1.20  	</div>
    1.21  </div>
    1.22  EOT
    1.23 @@ -216,7 +216,7 @@
    1.24  <div class="float-right">
    1.25  	`gettext "List:"`
    1.26  	<input type="submit" name="recharge" value="Recharge" />
    1.27 -	<input type="submit" name="upgradeable" value="Upgrade" />
    1.28 +	<input type="submit" name="up" value="Upgrade" />
    1.29  	<a class="button" href='$SCRIPT_NAME?list'>
    1.30  		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
    1.31  </div>
    1.32 @@ -250,7 +250,7 @@
    1.33  <div class="float-right">
    1.34  	`gettext "List:"`
    1.35  	<input type="submit" name="recharge" value="Recharge" />
    1.36 -	<input type="submit" name="upgradeable" value="Upgrade" />
    1.37 +	<input type="submit" name="up" value="Upgrade" />
    1.38  	<a class="button" href='$SCRIPT_NAME?list'>
    1.39  		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
    1.40  </div>
    1.41 @@ -280,7 +280,7 @@
    1.42  	</div>
    1.43  	<div class="float-right">
    1.44  		<p>
    1.45 -			<a class="button" href='$SCRIPT_NAME?upgradeable'>
    1.46 +			<a class="button" href='$SCRIPT_NAME?up'>
    1.47  				`gettext "Check upgrade"`</a>
    1.48  			<a class="button" href='$SCRIPT_NAME?list'>
    1.49  				<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
    1.50 @@ -297,7 +297,7 @@
    1.51  </p>
    1.52  EOT
    1.53  		;;
    1.54 -	upgradeable*)
    1.55 +	up*)
    1.56  		#
    1.57  		# Ugrade packages
    1.58  		#
    1.59 @@ -307,27 +307,27 @@
    1.60  		LOADING_MSG="Checking for upgrade..."
    1.61  		loading_msg
    1.62  		cat << EOT
    1.63 -<h2>`gettext "Upgradeable packages"`</h2>
    1.64 +<h2>`gettext "up packages"`</h2>
    1.65  <form method="get" action="$SCRIPT_NAME">
    1.66  <div id="actions">
    1.67 -<div class="float-left">
    1.68 -	`gettext "Selection:"`
    1.69 -	<input type="submit" name="do" value="Install" />
    1.70 -	<input type="submit" name="do" value="Remove" />
    1.71 -	<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
    1.72 -</div>
    1.73 -<div class="float-right">
    1.74 -	`gettext "List:"`
    1.75 -	<input type="submit" name="recharge" value="Recharge" />
    1.76 -	<a class="button" href='$SCRIPT_NAME?list'>
    1.77 -		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
    1.78 +	<div class="float-left">
    1.79 +		`gettext "Selection:"`
    1.80 +		<input type="submit" name="do" value="Install" />
    1.81 +		<input type="submit" name="do" value="Remove" />
    1.82 +		<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
    1.83 +	</div>
    1.84 +	<div class="float-right">
    1.85 +		`gettext "List:"`
    1.86 +		<input type="submit" name="recharge" value="Recharge" />
    1.87 +		<a class="button" href='$SCRIPT_NAME?list'>
    1.88 +			<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
    1.89 +	</div>
    1.90  </div>
    1.91  EOT
    1.92 -		tazpkg upgradeable
    1.93 -		echo '</div>'
    1.94 +		tazpkg up --check >/dev/null
    1.95  		table_start
    1.96  		table_head
    1.97 -		for pkg in `cat upgradeable-packages.list`
    1.98 +		for pkg in `cat packages.up`
    1.99  		do
   1.100  			grep "^$pkg |" $LOCALSTATE/packages.desc | parse_packages_desc
   1.101  		done
   1.102 @@ -480,7 +480,7 @@
   1.103  		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
   1.104  	<a class="button" href='$SCRIPT_NAME?recharge'>
   1.105  		<img src="$IMAGES/recharge.png" />`gettext "Recharge list"`</a>
   1.106 -	<a class="button" href='$SCRIPT_NAME?upgradeable'>
   1.107 +	<a class="button" href='$SCRIPT_NAME?up'>
   1.108  		<img src="$IMAGES/update.png" />`gettext "Check upgrade"`</a>
   1.109  	<a class="button" href='$SCRIPT_NAME?config'>
   1.110  		<img src="$IMAGES/edit.png" />`gettext "Configuration"`</a>