SliTaz Repositories

     1.1 --- a/tazpkg.cgi	Sun Apr 03 17:43:32 2011 +0200
     1.2 +++ b/tazpkg.cgi	Mon Apr 04 04:26:20 2011 +0200
     1.3 @@ -11,7 +11,8 @@
     1.4  echo "Content-Type: text/html"
     1.5  echo ""
     1.6  
     1.7 -. tazpanel.conf
     1.8 +. lib/libtazpanel
     1.9 +get_config
    1.10  
    1.11  # Include gettext helper script.
    1.12  . /usr/bin/gettext.sh
    1.13 @@ -87,23 +88,22 @@
    1.14  # xHTML functions
    1.15  #
    1.16  
    1.17 +# ENTER will search but user may search for a button, so put one.
    1.18  search_form() {
    1.19  	cat << EOT
    1.20  <div class="search">
    1.21 -<form method="get" action="$SCRIPT_NAME">
    1.22 -	<p>
    1.23 -		<input type="text" name="search" size="20">
    1.24 -		<input type="submit" value="`gettext "Search"`">
    1.25 -	</p>
    1.26 -</form>
    1.27 +	<form method="get" action="$SCRIPT_NAME">
    1.28 +		<p>
    1.29 +			<input type="text" name="search" size="20">
    1.30 +			<input type="submit" value="`gettext "Search"`">
    1.31 +		</p>
    1.32 +	</form>
    1.33  </div>
    1.34  EOT
    1.35  }
    1.36  
    1.37 -table_start() {
    1.38 +table_head() {
    1.39  	cat << EOT
    1.40 -<table>
    1.41 -	<tbody>
    1.42  		<tr id="thead">
    1.43  			<td>`gettext "Name"`</td>
    1.44  			<td>`gettext "Version"`</td>
    1.45 @@ -113,13 +113,6 @@
    1.46  EOT
    1.47  }
    1.48  
    1.49 -table_end () {
    1.50 -	cat << EOT
    1.51 -	</tbody>
    1.52 -</table>
    1.53 -EOT
    1.54 -}
    1.55 -
    1.56  sub_block() {
    1.57  	cat << EOT
    1.58  <div id="sub_block">
    1.59 @@ -205,7 +198,6 @@
    1.60  	list-all)
    1.61  		# List all available packages on mirror
    1.62  		cd  $LOCALSTATE
    1.63 -		loader
    1.64  		search_form
    1.65  		sub_block
    1.66  		cat << EOT
    1.67 @@ -216,6 +208,7 @@
    1.68  		list_all_actions
    1.69  		echo '</div>'
    1.70  		table_start
    1.71 +		table_head
    1.72  		cat packages.desc | parse_packages_desc
    1.73  		table_end
    1.74  		list_all_actions
    1.75 @@ -227,13 +220,14 @@
    1.76  		search_form
    1.77  		sub_block
    1.78  		cat << EOT
    1.79 -<h2>`gettext "All packages"`</h2>
    1.80 +<h2>`gettext "Search packages"`</h2>
    1.81  <form method="get" action="$SCRIPT_NAME">
    1.82  <div id="actions">
    1.83  EOT
    1.84  		list_full_actions
    1.85  		echo '</div>'
    1.86  		table_start
    1.87 +		table_head
    1.88  		grep $pkg packages.desc | parse_packages_desc
    1.89  		table_end
    1.90  		echo '</form>' ;;
    1.91 @@ -268,6 +262,7 @@
    1.92  		tazpkg upgradeable
    1.93  		echo '</div>'
    1.94  		table_start
    1.95 +		table_head
    1.96  		for pkg in `cat upgradeable-packages.list`
    1.97  		do
    1.98  			grep "^$pkg |" $LOCALSTATE/packages.desc | parse_packages_desc
    1.99 @@ -350,15 +345,15 @@
   1.100  	<p>`gettext "Tazpkg configuration and settings"`</p>
   1.101  </div>
   1.102  <div>
   1.103 -	<h3>`gettext "Package in cache"`</h3>
   1.104  	<form method="get" action="$SCRIPT_NAME">
   1.105 -	<p>
   1.106 -		`gettext "Packages in the cache:"` $cache_files ($cache_size)
   1.107 -		<input type="hidden" name="config" value="clean" />
   1.108 -		<input type="submit" value="Clean" />
   1.109 -	</p>
   1.110 +		<p>
   1.111 +			`gettext "Packages in the cache:"` $cache_files ($cache_size)
   1.112 +			<input type="hidden" name="config" value="clean" />
   1.113 +			<input type="submit" value="Clean" />
   1.114 +		</p>
   1.115  	</form>
   1.116  </div>
   1.117 +
   1.118  <h3>`gettext "Current mirror list"`</h3>
   1.119  <div class="box">
   1.120  	<ul>