tazpanel rev 41

Better CSS for pkgs.cgi and handle packages category as fast as we can
author Christophe Lincoln <pankso@slitaz.org>
date Wed Apr 06 19:02:07 2011 +0200 (2011-04-06)
parents 1a80f769f6e1
children a7b1d69663c3
files lib/libtazpanel network.cgi pkgs.cgi po/fr.po styles/default/footer.html styles/default/images/edit.png styles/default/images/recharge.png styles/default/images/update.png styles/default/style.css
line diff
     1.1 --- a/lib/libtazpanel	Wed Apr 06 06:17:23 2011 +0200
     1.2 +++ b/lib/libtazpanel	Wed Apr 06 19:02:07 2011 +0200
     1.3 @@ -46,10 +46,12 @@
     1.4  	do
     1.5  		case $i in
     1.6  			eth*)
     1.7 -				echo "<tr><td><img src='$IMAGES/ethernet.png' />$i</td>
     1.8 +				echo "<tr><td><a href='/network.cgi?eth'>
     1.9 +					<img src='$IMAGES/ethernet.png' />$i</a></td>
    1.10  					<td>Ethernet</td> `interface_status`</tr>" ;;
    1.11  			wlan*|ath*|ra*)
    1.12 -				echo "<tr><td><img src='$IMAGES/wireless.png' />$i</td>
    1.13 +				echo "<tr><td><a href='/network.cgi?wifi'>
    1.14 +					<img src='$IMAGES/wireless.png' />$i</a></td>
    1.15  					<td>Wireless</td> `interface_status`</tr>" ;;
    1.16  			lo)
    1.17  				echo "<tr><td><img src='$IMAGES/loopback.png' />$i</td>
     2.1 --- a/network.cgi	Wed Apr 06 06:17:23 2011 +0200
     2.2 +++ b/network.cgi	Wed Apr 06 19:02:07 2011 +0200
     2.3 @@ -16,28 +16,65 @@
     2.4  TEXTDOMAIN='tazpanel'
     2.5  export TEXTDOMAIN
     2.6  
     2.7 +# Actions commands before page is displayed
     2.8 +case "$QUERY_STRING" in
     2.9 +	start)
    2.10 +		# Here we sleep a bit to let udhcp get the lease before reloading
    2.11 +		# page with status
    2.12 +		/etc/init.d/network.sh start >/dev/null
    2.13 +		sleep 2 ;;
    2.14 +	stop)
    2.15 +		/etc/init.d/network.sh stop >/dev/null ;;
    2.16 +	*)
    2.17 +		continue ;;
    2.18 +esac
    2.19 +
    2.20  #
    2.21 -# Commands
    2.22 +# Main Commands for pages
    2.23  #
    2.24  
    2.25  case "$QUERY_STRING" in
    2.26 -	*)
    2.27 -		#
    2.28 -		# Network configuration
    2.29 -		#
    2.30 -		TITLE="- Network"
    2.31 +	eth)
    2.32 +		# Wired connections settings
    2.33  		xhtml_header
    2.34  		cat << EOT
    2.35 -<div id="wrapper">
    2.36 -	<h2>`gettext "Networking`</h2>
    2.37 -	<p>`gettext "Manage network connection and services`</p>
    2.38 +<h2>`gettext "Ethernet connection`</h2>
    2.39 +<pre>
    2.40 +`grep ^[A-V] /etc/network.conf`
    2.41 +</pre>
    2.42 +EOT
    2.43 +		;;
    2.44 +	wifi)
    2.45 +		# Wireless connections settings
    2.46 +		xhtml_header
    2.47 +		cat << EOT
    2.48 +<h2>`gettext "Wireless connection`</h2>
    2.49 +<pre>
    2.50 +`grep ^WIFI_ /etc/network.conf`
    2.51 +</pre>
    2.52 +EOT
    2.53 +		;;
    2.54 +	*)
    2.55 +		# Main Network page starting with a summary
    2.56 +		xhtml_header
    2.57 +		cat << EOT
    2.58 +<h2>`gettext "Networking`</h2>
    2.59 +<p>
    2.60 +	`gettext "Manage network connection and services`
    2.61 +</p>
    2.62 +<div id="actions">
    2.63 +	<p>
    2.64 +		`gettext "Connection:"`
    2.65 +		<a class="button" href="$SCRIPT_NAME?start">`gettext "Start"`</a>
    2.66 +		<a class="button" href="$SCRIPT_NAME?stop">`gettext "Stop"`</a>
    2.67 +	</p>
    2.68  </div>
    2.69  
    2.70  `list_network_interfaces`
    2.71  
    2.72 -<h3>Output of: ifconfig -a</h3>
    2.73 +<h3>`gettext "Output of ifconfig"`</h3>
    2.74  <pre>
    2.75 -`ifconfig -a`
    2.76 +`ifconfig`
    2.77  </pre>
    2.78  EOT
    2.79  		;;
     3.1 --- a/pkgs.cgi	Wed Apr 06 06:17:23 2011 +0200
     3.2 +++ b/pkgs.cgi	Wed Apr 06 19:02:07 2011 +0200
     3.3 @@ -23,7 +23,7 @@
     3.4  
     3.5  # xHTML 5 header
     3.6  TITLE="- Packages"
     3.7 -xhtml_header
     3.8 +xhtml_header | sed 's/id="content"/id="content-sidebar"/'
     3.9  
    3.10  # DEBUG mode
    3.11  if [ $DEBUG == "1" ]; then
    3.12 @@ -41,7 +41,8 @@
    3.13  		web=$(echo $line | cut -d "|" -f 5)
    3.14  		if [ -d $INSTALLED/$pkg ]; then
    3.15  			echo -e "<td><input type='checkbox' name='pkg' value=\"$pkg\">\n
    3.16 -				<img src='$IMAGES/tazpkg-installed.png'/>$pkg</td>"
    3.17 +				<a href='$SCRIPT_NAME?info=$pkg'>
    3.18 +				<img src='$IMAGES/tazpkg-installed.png'/>$pkg</a></td>"
    3.19  		else
    3.20  			echo -e "<td><input type='checkbox' name='pkg' value=\"$pkg\">\n
    3.21  				<img src='$IMAGES/tazpkg.png'/>$pkg</td>"
    3.22 @@ -122,14 +123,24 @@
    3.23  EOT
    3.24  }
    3.25  
    3.26 -sub_block() {
    3.27 +sidebar() {
    3.28  	cat << EOT
    3.29 -<div id="sub_block">
    3.30 -	<a href='$SCRIPT_NAME?list'>`gettext "My packages"`</a> |
    3.31 -	<a href='$SCRIPT_NAME?list-all'>`gettext "All packages"`</a> |
    3.32 -	<a href='$SCRIPT_NAME?recharge'>`gettext "Recharge list"`</a> |
    3.33 -	<a href='$SCRIPT_NAME?upgradeable'>`gettext "Upgrade"`</a> |
    3.34 -	<a href='$SCRIPT_NAME?config'>`gettext "Configuration"`</a>
    3.35 +<div id="sidebar">
    3.36 +	<h4>Categories</h4>
    3.37 +	<a class="active_base-system" href="$SCRIPT_NAME?cat=base-system">Base-system</a>
    3.38 +	<a class="active_x-window" href="$SCRIPT_NAME?cat=x-window">X window</a>
    3.39 +	<a class="active_utilities" href="$SCRIPT_NAME?cat=utilities">Utilities</a>
    3.40 +	<a class="active_network" href="$SCRIPT_NAME?cat=network">Network</a>
    3.41 +	<a class="active_games" href="$SCRIPT_NAME?cat=games">Games</a>
    3.42 +	<a class="active_graphics" href="$SCRIPT_NAME?cat=graphics">Graphics</a>
    3.43 +	<a class="active_office" href="$SCRIPT_NAME?cat=office">Office</a>
    3.44 +	<a class="active_multimedia" href="$SCRIPT_NAME?cat=multimedia">Multimedia</a>
    3.45 +	<a class="active_developement" href="$SCRIPT_NAME?cat=development">Development</a>
    3.46 +	<a class="active_system-tools" href="$SCRIPT_NAME?cat=system-tools">System tools</a>
    3.47 +	<a class="active_security" href="$SCRIPT_NAME?cat=security">Security</a>
    3.48 +	<a class="active_misc" href="$SCRIPT_NAME?cat=misc">Misc</a>
    3.49 +	<a class="active_meta" href="$SCRIPT_NAME?cat=meta">Meta</a>
    3.50 +	<a class="active_non-free" href="$SCRIPT_NAME?cat=non-free">Non free</a>
    3.51  </div>
    3.52  EOT
    3.53  }
    3.54 @@ -137,33 +148,70 @@
    3.55  # For my packages list
    3.56  list_actions() {
    3.57  	cat << EOT
    3.58 -<p>
    3.59 +<div class="float-left">
    3.60  	`gettext "Selection:"`
    3.61 -	<input type="submit" name="do" value="remove" />
    3.62 -</p>
    3.63 +	<input type="submit" name="do" value="Remove" />
    3.64 +</div>
    3.65 +<div class="float-right">
    3.66 +	`gettext "List:"`
    3.67 +	<input type="submit" name="recharge" value="Recharge" />
    3.68 +	<input type="submit" name="upgradeable" value="Upgrade" />
    3.69 +</div>
    3.70  EOT
    3.71  }
    3.72  
    3.73 -# For list-all
    3.74 -list_all_actions() {
    3.75 +# For list-cat
    3.76 +list_cat_action() {
    3.77  	cat << EOT
    3.78 -<p>
    3.79 +<div class="float-left">
    3.80  	`gettext "Selection:"`
    3.81 -	<input type="submit" name="do" value="install" />
    3.82 -	<input type="submit" name="do" value="remove" />
    3.83 -</p>
    3.84 +	<input type="submit" name="do" value="Install" />
    3.85 +	<input type="submit" name="do" value="Remove" />
    3.86 +</div>
    3.87 +<div class="float-right">
    3.88 +	`gettext "List:"`
    3.89 +	<input type="submit" name="recharge" value="Recharge" />
    3.90 +	<input type="submit" name="upgradeable" value="Upgrade" />
    3.91 +	<a class="button" href='$SCRIPT_NAME?list'>
    3.92 +		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
    3.93 +</div>
    3.94  EOT
    3.95  }
    3.96  
    3.97 -# For search and upgrade with JS function to toogle all pkgs
    3.98 +# For search with JS function to toogle all pkgs
    3.99  list_full_actions() {
   3.100  	cat << EOT
   3.101 -<p>
   3.102 +<div class="float-left">
   3.103  	`gettext "Selection:"`
   3.104 -	<input type="submit" name="do" value="install" />
   3.105 -	<input type="submit" name="do" value="remove" />
   3.106 +	<input type="submit" name="do" value="Install" />
   3.107 +	<input type="submit" name="do" value="Remove" />
   3.108  	<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
   3.109 -</p>
   3.110 +</div>
   3.111 +<div class="float-right">
   3.112 +	`gettext "List:"`
   3.113 +	<input type="submit" name="recharge" value="Recharge" />
   3.114 +	<input type="submit" name="upgradeable" value="Upgrade" />
   3.115 +	<a class="button" href='$SCRIPT_NAME?list'>
   3.116 +		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
   3.117 +</div>
   3.118 +EOT
   3.119 +}
   3.120 +
   3.121 +# For upgrade with JS function to toogle all pkgs and no 'Upgrade' button
   3.122 +list_up_actions() {
   3.123 +	cat << EOT
   3.124 +<div class="float-left">
   3.125 +	`gettext "Selection:"`
   3.126 +	<input type="submit" name="do" value="Install" />
   3.127 +	<input type="submit" name="do" value="Remove" />
   3.128 +	<a href="`cat $PANEL/lib/checkbox.js`">`gettext "Toogle all"`</a>
   3.129 +</div>
   3.130 +<div class="float-right">
   3.131 +	`gettext "List:"`
   3.132 +	<input type="submit" name="recharge" value="Recharge" />
   3.133 +	<a class="button" href='$SCRIPT_NAME?list'>
   3.134 +		<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
   3.135 +</div>
   3.136  EOT
   3.137  }
   3.138  
   3.139 @@ -172,12 +220,12 @@
   3.140  #
   3.141  
   3.142  case "$QUERY_STRING" in
   3.143 -	list)
   3.144 +	list*)
   3.145  		# List installed packages. This is the default because parsing
   3.146  		# the full packages.desc can be long and take some resources
   3.147  		cd $INSTALLED
   3.148  		search_form
   3.149 -		sub_block
   3.150 +		sidebar
   3.151  		cat << EOT
   3.152  <h2>`gettext "My packages"`</h2>
   3.153  <form method='get' action='$SCRIPT_NAME'>
   3.154 @@ -186,6 +234,7 @@
   3.155  		list_actions
   3.156  		echo '</div>'
   3.157  		table_start
   3.158 +		table_head
   3.159  		for pkg in *
   3.160  		do
   3.161  			. $pkg/receipt
   3.162 @@ -195,7 +244,7 @@
   3.163  			echo "<td class='pkg'>
   3.164  				<input type='checkbox' name='pkg' value=\"$pkg\" />
   3.165  				<a href='$SCRIPT_NAME?info=$pkg'><img
   3.166 -					src='$IMAGES/tazpkg-installed.png'/></a>$pkg</td>"
   3.167 +					src='$IMAGES/tazpkg-installed.png'/>$pkg</a></td>"
   3.168  			echo "<td>$VERSION</td>"
   3.169  			echo "<td class='desc'>$SHORT_DESC</td>"
   3.170  			echo "<td><a href='$WEB_SITE'>web</a></td>"
   3.171 @@ -204,30 +253,33 @@
   3.172  		table_end
   3.173  		list_actions
   3.174  		echo '</form>' ;;
   3.175 -	list-all)
   3.176 -		# List all available packages on mirror
   3.177 +	cat*)
   3.178 +		# List all available packages by category on mirror. Listing all
   3.179 +		# packages is to resource intensive and not usefull.
   3.180  		cd  $LOCALSTATE
   3.181 +		category=${QUERY_STRING#cat=}
   3.182 +		[ "${QUERY_STRING}" == "cat" ] && category="base-system"
   3.183  		search_form
   3.184 -		sub_block
   3.185 +		sidebar | sed s/"active_${category}"/"active"/
   3.186  		cat << EOT
   3.187 -<h2>`gettext "All packages"`</h2>
   3.188 +<h2>`gettext "Category:"` $category</h2>
   3.189  <form method='get' action='$SCRIPT_NAME'>
   3.190  <div id="actions">
   3.191  EOT
   3.192 -		list_all_actions
   3.193 +		list_cat_action
   3.194  		echo '</div>'
   3.195  		table_start
   3.196  		table_head
   3.197 -		cat packages.desc | parse_packages_desc
   3.198 +		grep "| $category |" packages.desc | parse_packages_desc
   3.199  		table_end
   3.200 -		list_all_actions
   3.201 +		list_cat_action
   3.202  		echo '</form>' ;;
   3.203  	search=*)
   3.204  		# Search for packages
   3.205  		pkg=${QUERY_STRING#*=}
   3.206  		cd  $LOCALSTATE
   3.207  		search_form
   3.208 -		sub_block
   3.209 +		sidebar
   3.210  		cat << EOT
   3.211  <h2>`gettext "Search packages"`</h2>
   3.212  <form method="get" action="$SCRIPT_NAME">
   3.213 @@ -240,19 +292,27 @@
   3.214  		grep $pkg packages.desc | parse_packages_desc
   3.215  		table_end
   3.216  		echo '</form>' ;;
   3.217 -	recharge)
   3.218 +	recharge*)
   3.219  		# Let recharge the packages list
   3.220  		search_form
   3.221 -		sub_block
   3.222 +		sidebar
   3.223  		cat << EOT
   3.224  <h2>`gettext "Recharge"`</h2>
   3.225  <form method='get' action='$SCRIPT_NAME'>
   3.226  <div id="actions">
   3.227 -	<p>
   3.228 -		`gettext "Recharge will check for new or updated packages...
   3.229 -		please wait"`
   3.230 -	</p>
   3.231 -</div>	
   3.232 +	<div class="float-left">
   3.233 +		<p>
   3.234 +			`gettext "Recharge will check for new or updated packages...
   3.235 +please wait"`
   3.236 +		</p>
   3.237 +	</div>
   3.238 +	<div class="float-right">
   3.239 +		<p>
   3.240 +			<a class="button" href='$SCRIPT_NAME?list'>
   3.241 +				<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
   3.242 +		</p>
   3.243 +	</div>
   3.244 +</div>
   3.245  <pre>
   3.246  EOT
   3.247  		tazpkg recharge | filter_tazpkg_msgs
   3.248 @@ -260,16 +320,16 @@
   3.249  		echo '<p>'
   3.250  		gettext "Packages lists are up-to-date"
   3.251  		echo '</p>' ;;
   3.252 -	upgradeable)
   3.253 +	upgradeable*)
   3.254  		cd $LOCALSTATE
   3.255  		search_form
   3.256 -		sub_block
   3.257 +		sidebar
   3.258  		cat << EOT
   3.259  <h2>`gettext "Upgradeable packages"`</h2>
   3.260  <form method="get" action="$SCRIPT_NAME">
   3.261  <div id="actions">
   3.262  EOT
   3.263 -		list_full_actions
   3.264 +		list_up_actions
   3.265  		tazpkg upgradeable
   3.266  		echo '</div>'
   3.267  		table_start
   3.268 @@ -279,24 +339,39 @@
   3.269  			grep "^$pkg |" $LOCALSTATE/packages.desc | parse_packages_desc
   3.270  		done
   3.271  		table_end
   3.272 +		list_up_actions
   3.273  		echo '</form>' ;;
   3.274  	do=*)
   3.275  		# Do an action on one or some packages
   3.276  		cmdline=`echo ${QUERY_STRING#do=} | sed s'/&/ /g'`		
   3.277  		cmd=`echo ${cmdline} | awk '{print $1}'`		
   3.278  		pkgs=`echo $cmdline | sed -e s'/+/ /g' -e s'/pkg=//g' -e s/$cmd//`
   3.279 -		[ $cmd == install ] && cmd=get-install opt=--forced
   3.280 +		case $cmd in
   3.281 +			install|Install)
   3.282 +				cmd=get-install opt=--forced ;;
   3.283 +			remove|Remove)
   3.284 +				cmd=remove ;;
   3.285 +		esac
   3.286  		search_form
   3.287 -		sub_block
   3.288 +		sidebar
   3.289  		cat << EOT
   3.290  <h2>Tazpkg: $cmd</h2>
   3.291  <form method="get" action="$SCRIPT_NAME">
   3.292  <div id="actions">
   3.293 -<p>
   3.294 +	<div class="float-left">
   3.295 +		<p>
   3.296 +			`gettext "Performing task on packages... please wait"`
   3.297 +		</p>
   3.298 +	</div>
   3.299 +	<div class="float-right">
   3.300 +		<p>
   3.301 +			<a class="button" href='$SCRIPT_NAME?list'>
   3.302 +				<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
   3.303 +		</p>
   3.304 +	</div>
   3.305 +</div>
   3.306  EOT
   3.307 -		gettext "Performing task on packages"
   3.308 -		echo '</p></div>'
   3.309 -		echo '<pre class="pre_main">'
   3.310 +		echo '<pre class="pre-main">'
   3.311  		gettext "Executing $cmd for:$pkgs"
   3.312  		echo '</pre>'
   3.313  		for pkg in $pkgs
   3.314 @@ -308,26 +383,37 @@
   3.315  	info=*)
   3.316  		pkg=${QUERY_STRING#*=}
   3.317  		search_form
   3.318 -		sub_block
   3.319 +		sidebar
   3.320  		. $INSTALLED/$pkg/receipt
   3.321 +		files=`cat $INSTALLED/$pkg/files.list | wc -l`
   3.322  		cat << EOT
   3.323 -<h2>`gettext "Package info"`</h2>
   3.324 +<h2>`gettext "Package"` $PACKAGE</h2>
   3.325  <div id="actions">
   3.326 -	<p>`gettext "Detailled information on:"` $PACKAGE</p>
   3.327 +	<div class="float-left">
   3.328 +		<p>
   3.329 +			<a class="button" href='$SCRIPT_NAME?do=remove&$pkg'>`gettext "Remove"`</a>
   3.330 +		</p>
   3.331 +	</div>
   3.332 +	<div class="float-right">
   3.333 +		<p>
   3.334 +			<a class="button" href='$SCRIPT_NAME?list'>
   3.335 +				<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
   3.336 +		</p>
   3.337 +	</div>
   3.338  </div>
   3.339  <pre>
   3.340  Name        : $PACKAGE
   3.341  Version     : $VERSION
   3.342  Description : $SHORT_DESC
   3.343 +Category    : $CATEGORY
   3.344  Maintainer  : $MAINTAINER
   3.345  Depends     : `for i in $DEPENDS; do echo -n \
   3.346  	"<a href="$SCRIPT_NAME?info=$i">$i</a> "; done`
   3.347  Website     : <a href="$WEB_SITE">$WEB_SITE</a>
   3.348  Sizes       : $PACKED_SIZE/$UNPACKED_SIZE
   3.349 -Files       : `cat $INSTALLED/$pkg/files.list | wc -l`
   3.350  </pre>
   3.351  
   3.352 -<p>`gettext "Installed files"`</p>
   3.353 +<p>`gettext "Installed files:"` `cat $INSTALLED/$pkg/files.list | wc -l`</p>
   3.354  <pre>
   3.355  `cat $INSTALLED/$pkg/files.list`
   3.356  </pre>
   3.357 @@ -349,7 +435,7 @@
   3.358  		esac
   3.359  		cache_files=`find /var/cache/tazpkg -name *.tazpkg | wc -l`
   3.360  		cache_size=`du -sh /var/cache/tazpkg`
   3.361 -		sub_block
   3.362 +		sidebar
   3.363  		cat << EOT
   3.364  <h2>`gettext "Configuration"`</h2>
   3.365  <div>
   3.366 @@ -385,15 +471,24 @@
   3.367  		# Default to summary
   3.368  		#
   3.369  		search_form
   3.370 -		sub_block
   3.371 +		sidebar
   3.372  		cat << EOT
   3.373  <h2>`gettext "Summary"`</h2>
   3.374  <div id="actions">
   3.375 -	<p>`gettext "Overview of all installed and mirrored packages"`</p>
   3.376 +	`gettext "Overview of all installed and mirrored packages"`
   3.377  </div>
   3.378 -<pre class="pre_main">
   3.379 +<pre class="pre-main">
   3.380  `packages_summary`
   3.381  </pre>
   3.382 +<a class="button" href='$SCRIPT_NAME?list'>
   3.383 +	<img src="$IMAGES/tazpkg.png" />`gettext "My packages"`</a>
   3.384 +<a class="button" href='$SCRIPT_NAME?recharge'>
   3.385 +	<img src="$IMAGES/recharge.png" />`gettext "Recharge list"`</a>
   3.386 +<a class="button" href='$SCRIPT_NAME?upgradeable'>
   3.387 +	<img src="$IMAGES/update.png" />`gettext "Check upgrade"`</a>
   3.388 +<a class="button" href='$SCRIPT_NAME?config'>
   3.389 +	<img src="$IMAGES/edit.png" />`gettext "Configuration"`</a>
   3.390 +
   3.391  <h3>`gettext "Latest log entries"`</h3>
   3.392  <pre>
   3.393  `tail -n 6 /var/log/tazpkg.log | fgrep "-" | \
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/po/fr.po	Wed Apr 06 19:02:07 2011 +0200
     4.3 @@ -0,0 +1,339 @@
     4.4 +# French translations for TazPanel package.
     4.5 +# Copyright (C) 2011 THE TazPanel'S COPYRIGHT HOLDER
     4.6 +# This file is distributed under the same license as the TazPanel package.
     4.7 +# Linux User <pankso@slitaz.org>, 2011.
     4.8 +#
     4.9 +msgid ""
    4.10 +msgstr ""
    4.11 +"Project-Id-Version: TazPanel 1.0\n"
    4.12 +"Report-Msgid-Bugs-To: \n"
    4.13 +"POT-Creation-Date: 2011-04-06 06:09+0200\n"
    4.14 +"PO-Revision-Date: 2011-04-06 06:11+0200\n"
    4.15 +"Last-Translator: Linux User <pankso@slitaz.org>\n"
    4.16 +"Language-Team: French\n"
    4.17 +"Language: fr\n"
    4.18 +"MIME-Version: 1.0\n"
    4.19 +"Content-Type: text/plain; charset=ASCII\n"
    4.20 +"Content-Transfer-Encoding: 8bit\n"
    4.21 +"Plural-Forms: nplurals=2; plural=(n > 1);\n"
    4.22 +
    4.23 +#: tazpanel:33
    4.24 +msgid "TazPanel Authentication"
    4.25 +msgstr ""
    4.26 +
    4.27 +#: tazpanel:36
    4.28 +msgid "Stopping TazPanel web server..."
    4.29 +msgstr ""
    4.30 +
    4.31 +#: tazpanel:40
    4.32 +msgid "Changing password for TazPanel"
    4.33 +msgstr ""
    4.34 +
    4.35 +#: tazpanel:41
    4.36 +msgid "New password: "
    4.37 +msgstr ""
    4.38 +
    4.39 +#: tazpanel:43
    4.40 +msgid "Password changed succeffuly"
    4.41 +msgstr ""
    4.42 +
    4.43 +#: tazpanel:47
    4.44 +msgid "Usage:"
    4.45 +msgstr ""
    4.46 +
    4.47 +#: index.cgi:38
    4.48 +msgid "Interface"
    4.49 +msgstr ""
    4.50 +
    4.51 +#: index.cgi:39 index.cgi:133 pkgs.cgi:117
    4.52 +msgid "Name"
    4.53 +msgstr ""
    4.54 +
    4.55 +#: index.cgi:40
    4.56 +msgid "Status"
    4.57 +msgstr ""
    4.58 +
    4.59 +#: index.cgi:41
    4.60 +msgid "IP Address"
    4.61 +msgstr ""
    4.62 +
    4.63 +#: index.cgi:76
    4.64 +msgid "Boot &amp; startup"
    4.65 +msgstr ""
    4.66 +
    4.67 +#: index.cgi:78
    4.68 +msgid "Everything that appends before user login."
    4.69 +msgstr ""
    4.70 +
    4.71 +#: index.cgi:82
    4.72 +msgid "Kernel cmdline"
    4.73 +msgstr ""
    4.74 +
    4.75 +#: index.cgi:123
    4.76 +msgid "Manage users"
    4.77 +msgstr ""
    4.78 +
    4.79 +#: index.cgi:124
    4.80 +msgid "Manage human users on your SliTaz system"
    4.81 +msgstr ""
    4.82 +
    4.83 +#: index.cgi:131
    4.84 +msgid "Login"
    4.85 +msgstr ""
    4.86 +
    4.87 +#: index.cgi:132
    4.88 +msgid "User ID"
    4.89 +msgstr ""
    4.90 +
    4.91 +#: index.cgi:134
    4.92 +msgid "Home"
    4.93 +msgstr ""
    4.94 +
    4.95 +#: index.cgi:135
    4.96 +msgid "SHell"
    4.97 +msgstr ""
    4.98 +
    4.99 +#: index.cgi:162
   4.100 +msgid "Delete selected user"
   4.101 +msgstr ""
   4.102 +
   4.103 +#: index.cgi:166
   4.104 +msgid "Add a new user"
   4.105 +msgstr ""
   4.106 +
   4.107 +#: index.cgi:169
   4.108 +msgid "User login:"
   4.109 +msgstr ""
   4.110 +
   4.111 +#: index.cgi:171
   4.112 +msgid "User password:"
   4.113 +msgstr ""
   4.114 +
   4.115 +#: index.cgi:173
   4.116 +msgid "Create user"
   4.117 +msgstr ""
   4.118 +
   4.119 +#: index.cgi:185 network.cgi:32
   4.120 +msgid "Networking"
   4.121 +msgstr ""
   4.122 +
   4.123 +#: index.cgi:186 network.cgi:33
   4.124 +msgid "Manage network connection and services"
   4.125 +msgstr ""
   4.126 +
   4.127 +#: index.cgi:205
   4.128 +msgid "Drivers &amp; Devices"
   4.129 +msgstr ""
   4.130 +
   4.131 +#: index.cgi:206
   4.132 +msgid "Manage your computer hardware"
   4.133 +msgstr ""
   4.134 +
   4.135 +#: index.cgi:226
   4.136 +msgid "Host:"
   4.137 +msgstr ""
   4.138 +
   4.139 +#: index.cgi:227
   4.140 +msgid "SliTaz administration et configuration Panel"
   4.141 +msgstr ""
   4.142 +
   4.143 +#: index.cgi:230 pkgs.cgi:390
   4.144 +msgid "Summary"
   4.145 +msgstr ""
   4.146 +
   4.147 +#: index.cgi:233
   4.148 +msgid "Uptime:"
   4.149 +msgstr ""
   4.150 +
   4.151 +#: index.cgi:236
   4.152 +msgid "Memory in Mb"
   4.153 +msgstr ""
   4.154 +
   4.155 +#: index.cgi:243
   4.156 +msgid "Network status"
   4.157 +msgstr ""
   4.158 +
   4.159 +#: index.cgi:246
   4.160 +msgid "Filesystem usage statistics"
   4.161 +msgstr ""
   4.162 +
   4.163 +#: pkgs.cgi:63
   4.164 +msgid "Last recharge        : "
   4.165 +msgstr ""
   4.166 +
   4.167 +#: pkgs.cgi:73
   4.168 +msgid "Installed packages   : "
   4.169 +msgstr ""
   4.170 +
   4.171 +#: pkgs.cgi:75
   4.172 +msgid "Mirrored packages    : "
   4.173 +msgstr ""
   4.174 +
   4.175 +#: pkgs.cgi:77
   4.176 +msgid "Upgradeable packages : "
   4.177 +msgstr ""
   4.178 +
   4.179 +#: pkgs.cgi:79
   4.180 +msgid "Installed files      : "
   4.181 +msgstr ""
   4.182 +
   4.183 +#: pkgs.cgi:81
   4.184 +msgid "Blocked packages     : "
   4.185 +msgstr ""
   4.186 +
   4.187 +#: pkgs.cgi:107
   4.188 +msgid "Search"
   4.189 +msgstr ""
   4.190 +
   4.191 +#: pkgs.cgi:118
   4.192 +msgid "Version"
   4.193 +msgstr ""
   4.194 +
   4.195 +#: pkgs.cgi:119
   4.196 +msgid "Description"
   4.197 +msgstr ""
   4.198 +
   4.199 +#: pkgs.cgi:120
   4.200 +msgid "Web"
   4.201 +msgstr ""
   4.202 +
   4.203 +#: pkgs.cgi:128 pkgs.cgi:182
   4.204 +msgid "My packages"
   4.205 +msgstr ""
   4.206 +
   4.207 +#: pkgs.cgi:129 pkgs.cgi:213
   4.208 +msgid "All packages"
   4.209 +msgstr ""
   4.210 +
   4.211 +#: pkgs.cgi:130
   4.212 +msgid "Recharge list"
   4.213 +msgstr ""
   4.214 +
   4.215 +#: pkgs.cgi:131
   4.216 +msgid "Upgrade"
   4.217 +msgstr ""
   4.218 +
   4.219 +#: pkgs.cgi:132 pkgs.cgi:354
   4.220 +msgid "Configuration"
   4.221 +msgstr ""
   4.222 +
   4.223 +#: pkgs.cgi:141 pkgs.cgi:151 pkgs.cgi:162
   4.224 +msgid "Selection:"
   4.225 +msgstr ""
   4.226 +
   4.227 +#: pkgs.cgi:165
   4.228 +msgid "Toogle all"
   4.229 +msgstr ""
   4.230 +
   4.231 +#: pkgs.cgi:232
   4.232 +msgid "Search packages"
   4.233 +msgstr ""
   4.234 +
   4.235 +#: pkgs.cgi:248
   4.236 +msgid "Recharge"
   4.237 +msgstr ""
   4.238 +
   4.239 +#: pkgs.cgi:252
   4.240 +msgid ""
   4.241 +"Recharge will check for new or updated packages...\n"
   4.242 +"\t\tplease wait"
   4.243 +msgstr ""
   4.244 +
   4.245 +#: pkgs.cgi:261
   4.246 +msgid "Packages lists are up-to-date"
   4.247 +msgstr ""
   4.248 +
   4.249 +#: pkgs.cgi:268
   4.250 +msgid "Upgradeable packages"
   4.251 +msgstr ""
   4.252 +
   4.253 +#: pkgs.cgi:297
   4.254 +msgid "Performing task on packages"
   4.255 +msgstr ""
   4.256 +
   4.257 +#: pkgs.cgi:314
   4.258 +msgid "Package info"
   4.259 +msgstr ""
   4.260 +
   4.261 +#: pkgs.cgi:316
   4.262 +msgid "Detailled information on:"
   4.263 +msgstr ""
   4.264 +
   4.265 +#: pkgs.cgi:330
   4.266 +msgid "Installed files"
   4.267 +msgstr ""
   4.268 +
   4.269 +#: pkgs.cgi:356
   4.270 +msgid "Tazpkg configuration and settings"
   4.271 +msgstr ""
   4.272 +
   4.273 +#: pkgs.cgi:361
   4.274 +msgid "Packages in the cache:"
   4.275 +msgstr ""
   4.276 +
   4.277 +#: pkgs.cgi:368
   4.278 +msgid "Current mirror list"
   4.279 +msgstr ""
   4.280 +
   4.281 +#: pkgs.cgi:392
   4.282 +msgid "Overview of all installed and mirrored packages"
   4.283 +msgstr ""
   4.284 +
   4.285 +#: pkgs.cgi:397
   4.286 +msgid "Latest log entries"
   4.287 +msgstr ""
   4.288 +
   4.289 +#: live.cgi:50
   4.290 +msgid "TODO"
   4.291 +msgstr ""
   4.292 +
   4.293 +#: live.cgi:58
   4.294 +msgid "SliTaz Live Systems"
   4.295 +msgstr ""
   4.296 +
   4.297 +#: live.cgi:59
   4.298 +msgid "Create and manage Live CD or USB SliTaz systems"
   4.299 +msgstr ""
   4.300 +
   4.301 +#: live.cgi:62
   4.302 +msgid "Write a Live CD"
   4.303 +msgstr ""
   4.304 +
   4.305 +#: live.cgi:64
   4.306 +msgid ""
   4.307 +"The command writeiso will generate an ISO image of the\n"
   4.308 +"\tcurrent filesystem as is, including all files in the /home directory.\n"
   4.309 +"\tIt is an easy way to remaster a SliTaz Live system, you just have\n"
   4.310 +"\tto: boot, modify, writeiso."
   4.311 +msgstr ""
   4.312 +
   4.313 +#: live.cgi:70
   4.314 +msgid "Compression type:"
   4.315 +msgstr ""
   4.316 +
   4.317 +#: live.cgi:76
   4.318 +msgid "write ISO"
   4.319 +msgstr ""
   4.320 +
   4.321 +#: live.cgi:79
   4.322 +msgid "Live USB"
   4.323 +msgstr ""
   4.324 +
   4.325 +#: live.cgi:81
   4.326 +msgid ""
   4.327 +"Generate SliTaz LiveUSB media and boot in RAM! Insert a\n"
   4.328 +"\tLiveCD into the cdrom drive, select the correct device and press\n"
   4.329 +"\tGenerate."
   4.330 +msgstr ""
   4.331 +
   4.332 +#: live.cgi:86
   4.333 +msgid "USB Media to use:"
   4.334 +msgstr ""
   4.335 +
   4.336 +#: live.cgi:95
   4.337 +msgid "Not found"
   4.338 +msgstr ""
   4.339 +
   4.340 +#: live.cgi:99
   4.341 +msgid "generate"
   4.342 +msgstr ""
     5.1 --- a/styles/default/footer.html	Wed Apr 06 06:17:23 2011 +0200
     5.2 +++ b/styles/default/footer.html	Wed Apr 06 19:02:07 2011 +0200
     5.3 @@ -2,7 +2,9 @@
     5.4  <!-- End of content-->
     5.5  </div>
     5.6  
     5.7 -<div id="footer"></div>
     5.8 +<div id="footer">
     5.9 +	<a href="http://www.slitaz.org/">SliTaz</a>
    5.10 +</div>
    5.11  
    5.12  </body>
    5.13  </html>
     6.1 Binary file styles/default/images/edit.png has changed
     7.1 Binary file styles/default/images/recharge.png has changed
     8.1 Binary file styles/default/images/update.png has changed
     9.1 --- a/styles/default/style.css	Wed Apr 06 06:17:23 2011 +0200
     9.2 +++ b/styles/default/style.css	Wed Apr 06 19:02:07 2011 +0200
     9.3 @@ -14,11 +14,11 @@
     9.4  	margin: 25px 0 0;
     9.5  }
     9.6  
     9.7 -h1 { color: #d66018; padding: 18px 0 0 40px;}
     9.8 +h1 { color: #d66018; padding: 10px 0 0 40px;}
     9.9  h2 { color: #444; margin: 10px 0 10px; }
    9.10  h3 { color: #666; font-size: 140%; }
    9.11  h4 { color: #888; font-size: 120%; }
    9.12 -img { border: 0pt none; vertical-align: middle; padding: 0 6px 0 0;}
    9.13 +img { border: 0pt none; vertical-align: middle; padding: 0px 6px 2px 0;}
    9.14  p { margin: 6px 0; }
    9.15  ul { list-style-type: none; padding: 0; }
    9.16  li { padding: 4px 0; }
    9.17 @@ -28,69 +28,10 @@
    9.18  /* Header and main title */
    9.19  
    9.20  #header {
    9.21 -	height: 68px;
    9.22 +	height: 52px;
    9.23  	border-bottom: 1px dotted #ddd;
    9.24  }
    9.25  
    9.26 -/* Blocks */
    9.27 -
    9.28 -#block { float: left; }
    9.29 -
    9.30 -#sub_block { margin: 20px 0; }
    9.31 -
    9.32 -/* Content */
    9.33 -
    9.34 -#content { margin: 20px 80px; }
    9.35 -#wrapper { margin: 20px 0 20px; }
    9.36 -
    9.37 -.search {
    9.38 -	position: absolute;
    9.39 -	right: 80px;
    9.40 -	top: 39px;
    9.41 -}
    9.42 -
    9.43 -#actions {
    9.44 -	
    9.45 -}
    9.46 -
    9.47 -#actions p { padding: 0; }
    9.48 -
    9.49 -.box {
    9.50 -	margin: 10px 0;
    9.51 -	padding: 12px;
    9.52 -	background: #f8f8f8;
    9.53 -	border: 1px solid #ddd;
    9.54 -}
    9.55 -
    9.56 -.debug {
    9.57 -	position: fixed;
    9.58 -	top: 20px;
    9.59 -	left: 5px;
    9.60 -	padding: 6px 20px;
    9.61 -	background-color: #f8f8f8;
    9.62 -	border: 1px solid #ddd;
    9.63 -}
    9.64 -
    9.65 -.float_left { float: right; }
    9.66 -.float_right { float: right; }
    9.67 -
    9.68 -/* Table */
    9.69 -
    9.70 -table {
    9.71 -	background-color: #f8f8f8;
    9.72 -	border: 1px solid #ddd;
    9.73 -	padding: 10px;
    9.74 -	width: 100%;
    9.75 -}
    9.76 -
    9.77 -td.pkg { max-width: 160px; }
    9.78 -td.desc { max-width: 300px; }
    9.79 -
    9.80 -#thead, thead {
    9.81 -	height: 10px;
    9.82 -	font-weight: bold;
    9.83 -}
    9.84 -
    9.85  /* Desktop gui style bar */
    9.86  
    9.87  #toolbar {
    9.88 @@ -113,9 +54,120 @@
    9.89  
    9.90  .progress { cursor: progress; }
    9.91  
    9.92 +/* Blocks */
    9.93 +
    9.94 +#block { float: left; }
    9.95 +
    9.96 +/* Sidebar menus */
    9.97 +
    9.98 +#sidebar {
    9.99 +	position: fixed;
   9.100 +	top: 187px;
   9.101 +	right: 5px;
   9.102 +	width: 116px;
   9.103 +}
   9.104 +
   9.105 +#sidebar a {
   9.106 +	display: block;
   9.107 +	padding: 1px 0 1px 12px;
   9.108 +	margin:0;
   9.109 +}
   9.110 +
   9.111 +#sidebar a.active {
   9.112 +	color: #000;
   9.113 +	font-weight: bold;
   9.114 +	/* Vertical tab alike menu
   9.115 +	background-color: #f8f8f8;
   9.116 +	border-top: 1px solid #ddd;
   9.117 +	border-bottom: 1px solid #ddd;
   9.118 +	border-right: 1px solid #ddd;
   9.119 +	border-top-right-radius: 4px;
   9.120 +	border-bottom-right-radius: 4px; */
   9.121 +}
   9.122 +#sidebar h4 { margin: 0 0 2px 12px; }
   9.123 +
   9.124 +/* Content */
   9.125 +
   9.126 +#content { margin: 20px 40px 20px 40px; }
   9.127 +#content-sidebar { margin: 20px 120px 20px 40px; }
   9.128 +#wrapper { margin: 10px 0 20px; }
   9.129 +
   9.130 +.search {
   9.131 +	position: absolute;
   9.132 +	right: 40px;
   9.133 +	top: 32px;
   9.134 +}
   9.135 +
   9.136 +.search input[type=submit] {
   9.137 +	padding: 4px;
   9.138 +	margin-left: -5px;
   9.139 +	background-color: #f1f1f1;
   9.140 +	border: 1px solid #ddd;
   9.141 +	cursor: pointer;
   9.142 +	color: #000;
   9.143 +	font-weight: bold;
   9.144 +	border-top-right-radius: 4px;
   9.145 +	border-bottom-right-radius: 4px;
   9.146 +	border-top-left-radius: 0px;
   9.147 +	border-bottom-left-radius: 0px;
   9.148 +}
   9.149 +
   9.150 +.search input[type=text] {
   9.151 +	border: 1px solid #ddd;
   9.152 +	padding: 4px;
   9.153 +	height: 17px;
   9.154 +	margin: 0;
   9.155 +	border-top-left-radius: 4px;
   9.156 +	border-bottom-left-radius: 4px;
   9.157 +}
   9.158 +
   9.159 +#actions {
   9.160 +	height: 20px;
   9.161 +	margin: 16px 0;
   9.162 +}
   9.163 +
   9.164 +.box {
   9.165 +	margin: 10px 0;
   9.166 +	padding: 12px;
   9.167 +	background: #f8f8f8;
   9.168 +	border: 1px solid #ddd;
   9.169 +}
   9.170 +
   9.171 +.debug {
   9.172 +	position: fixed;
   9.173 +	top: 20px;
   9.174 +	left: 5px;
   9.175 +	padding: 6px 20px;
   9.176 +	background-color: #f8f8f8;
   9.177 +	border: 1px solid #ddd;
   9.178 +}
   9.179 +
   9.180 +.float-left { float: left;  }
   9.181 +.float-right { float: right; }
   9.182 +
   9.183 +/* Table */
   9.184 +
   9.185 +table {
   9.186 +	background-color: #f8f8f8;
   9.187 +	border: 1px solid #ddd;
   9.188 +	padding: 10px;
   9.189 +	width: 100%;
   9.190 +	margin: 0 0 6px 0;
   9.191 +}
   9.192 +
   9.193 +table a { color: #000; }
   9.194 +table a:hover { color: #666; }
   9.195 +td.pkg { max-width: 160px; }
   9.196 +td.desc { max-width: 300px; }
   9.197 +
   9.198 +#thead, thead {
   9.199 +	height: 10px;
   9.200 +	font-weight: bold;
   9.201 +}
   9.202 +
   9.203  /* Misc */
   9.204  
   9.205 -pre { 
   9.206 +pre, .pre-main { 
   9.207  	background-color: #f8f8f8; 
   9.208  	border: 1px solid #ddd; 
   9.209  	padding: 10px;
   9.210 @@ -123,25 +175,38 @@
   9.211  	overflow: auto;
   9.212  }
   9.213  
   9.214 -input[type=submit], select {
   9.215 -	padding: 2px 4px;
   9.216 -	margin: 4px 0 0;
   9.217 +.pre-main { margin: 16px 0; }
   9.218 +
   9.219 +input[type=submit], select, .button {
   9.220 +	padding: 4px;
   9.221 +	margin: 0;
   9.222  	background-color: #f1f1f1;
   9.223  	border: 1px solid #ddd;
   9.224  	cursor: pointer;
   9.225 +	color: #000;
   9.226  }
   9.227  
   9.228 -input[type=submit]:hover, select:hover {
   9.229 +input[type=submit]:hover, select:hover, .button:hover {
   9.230  	background-color: #ddd;
   9.231  	border: 1px solid #999;
   9.232  }
   9.233  
   9.234 -input[type=text] { height: 15px; }
   9.235 +input[type=text] { height: 18px; }
   9.236  
   9.237  /* Round corner */
   9.238  
   9.239 -table, pre, input[type=submit], .debug, .box {
   9.240 -	-moz-border-radius: 4px;
   9.241 -	-webkit-border-radius: 4px;
   9.242 +table, pre, input[type=submit], .debug, .box, .button {
   9.243 +	/*-moz-border-radius: 4px;
   9.244 +	-webkit-border-radius: 4px; */
   9.245  	border-radius: 4px;
   9.246  }
   9.247 +
   9.248 +/* Footer */
   9.249 +
   9.250 +#footer {
   9.251 +	/* border-bottom: 1px solid #c1baad; */
   9.252 +	height: 25px;
   9.253 +	text-align: center;
   9.254 +	padding: 40px 10px;
   9.255 +	font-size: 11px;
   9.256 +}