tiny-slitaz rev 6

Refresh style (thanks Aleksej)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Nov 01 16:56:16 2015 +0100 (2015-11-01)
parents 577e6e91216d
children 69b7df0ddb67
files helper index.php step1.php step2.php step3.php step4.php step5.php
line diff
     1.1 --- a/helper	Wed Oct 07 23:37:02 2015 +0200
     1.2 +++ b/helper	Sun Nov 01 16:56:16 2015 +0100
     1.3 @@ -10,163 +10,194 @@
     1.4  	done | lzma e pkgs/files.list.lzma -si
     1.5  }
     1.6  
     1.7 +
     1.8 +
     1.9 +
    1.10  list_pkgs()
    1.11  {
    1.12  	TMPDIR=$2
    1.13  	shift 2
    1.14  	cat <<EOT
    1.15 +<div class="large">
    1.16  <table>
    1.17 -<tr>
    1.18 -<th></th>
    1.19 -<th>Package</th>
    1.20 -<th>Version</th>
    1.21 -<th>Description</th>
    1.22 -<th>Disk</th>
    1.23 -<th>Memory</th>
    1.24 -<th></th>
    1.25 -</tr>
    1.26 +	<thead>
    1.27 +		<tr>
    1.28 +			<th> </th>
    1.29 +			<th>Package</th>
    1.30 +			<th>Version</th>
    1.31 +			<th>Description</th>
    1.32 +			<th>Disk</th>
    1.33 +			<th>Memory</th>
    1.34 +			<th> </th>
    1.35 +		</tr>
    1.36 +	</thead>
    1.37 +	<tbody>
    1.38  EOT
    1.39 -	for i in $TMPDIR/pkgs/*/receipt pkgs/*/receipt ; do
    1.40 +	for i in $TMPDIR/pkgs/*/receipt pkgs/*/receipt; do
    1.41  		[ -s $i ] || continue
    1.42  		case "$i" in
    1.43 -		pkgs/kernel-*/receipt) continue;;
    1.44 -		pkgs/module-*/receipt) continue;;
    1.45 +			pkgs/kernel-*/receipt) continue;;
    1.46 +			pkgs/module-*/receipt) continue;;
    1.47  		esac
    1.48 -		AUTO_SELECTION=""
    1.49 -		UNPACKED_SIZE="-"
    1.50 -		PACKED_SIZE="-"
    1.51 -		checked=""
    1.52 +		AUTO_SELECTION=''
    1.53 +		UNPACKED_SIZE='-'
    1.54 +		PACKED_SIZE='-'
    1.55 +		checked=''; hidden_var=''
    1.56  		. $i
    1.57  		case " $@ " in
    1.58 -		*\ $PACKAGE\ *)	checked='checked="checked"';;
    1.59 -		*) [ -n "$2" ] && checked="";;
    1.60 +			*\ $PACKAGE\ *)	checked='checked="checked"';;
    1.61 +			*) [ -n "$2" ] && checked="";;
    1.62  		esac
    1.63  		grep -qs "^$PACKAGE " $TMPDIR/uploadconf &&
    1.64  			checked='checked="checked"'
    1.65  		case "$AUTO_SELECTION" in
    1.66 -		never)
    1.67 -			checked='disabled' ;;
    1.68 -		always)
    1.69 -			checked='checked="checked" disabled'
    1.70 -			cat <<EOT
    1.71 -<input type="hidden" name="selected[]" value="$PACKAGE" />
    1.72 -EOT
    1.73 +			never)
    1.74 +				continue;;
    1.75 +			always)
    1.76 +				checked='checked="checked" disabled'
    1.77 +				hidden_var="<input type=\"hidden\" name=\"selected[]\" value=\"$PACKAGE\" />";;
    1.78  		esac
    1.79  		cat <<EOT
    1.80 -<tr>
    1.81 -<td><input type="checkbox" name="selected[]" value="$PACKAGE" $checked /></td>
    1.82 -<td><a href="?dl=$PACKAGE-$VERSION&amp;tmp=$TMPDIR">$PACKAGE</a></td>
    1.83 -<td>$VERSION</td>
    1.84 -<td>$SHORT_DESC</td>
    1.85 -<td>$PACKED_SIZE</td>
    1.86 -<td>$UNPACKED_SIZE</td>
    1.87 -<td>$(grep -qs ^config_form $i && echo '&raquo;')</td>
    1.88 -</tr>
    1.89 +		<tr>
    1.90 +			<td>$hidden_var
    1.91 +				<input type="checkbox" name="selected[]" value="$PACKAGE" $checked /></td>
    1.92 +			<td><a href="?dl=$PACKAGE-$VERSION&amp;tmp=$TMPDIR">$PACKAGE</a></td>
    1.93 +			<td>$VERSION</td>
    1.94 +			<td>$SHORT_DESC</td>
    1.95 +			<td>$PACKED_SIZE</td>
    1.96 +			<td>$UNPACKED_SIZE</td>
    1.97 +			<td>$(grep -qs ^config_form $i && echo '&raquo;')</td>
    1.98 +		</tr>
    1.99  EOT
   1.100  	done
   1.101  	cat <<EOT
   1.102 +	</tbody>
   1.103  </table>
   1.104 -<p>
   1.105 -</p>
   1.106 +</div>
   1.107  EOT
   1.108  	exit
   1.109  }
   1.110  
   1.111 +
   1.112 +
   1.113 +
   1.114  list_kernels()
   1.115  {
   1.116  	TMPDIR=$2
   1.117  	shift 2
   1.118  	cat <<EOT
   1.119 +<div class="large">
   1.120  <table>
   1.121 -<tr>
   1.122 -<th></th>
   1.123 -<th>Kernel</th>
   1.124 -<th>Version</th>
   1.125 -<th>Description</th>
   1.126 -<!-- th>Size</th -->
   1.127 -</tr>
   1.128 +	<thead>
   1.129 +		<tr>
   1.130 +			<th> </th>
   1.131 +			<th>Kernel</th>
   1.132 +			<th>Version</th>
   1.133 +			<th>Description</th>
   1.134 +			<!-- th>Size</th -->
   1.135 +		</tr>
   1.136 +	</thead>
   1.137 +	<tbody>
   1.138  EOT
   1.139  	checked='checked="checked"'
   1.140  	for i in $TMPDIR/pkgs/*/receipt pkgs/*/receipt ; do
   1.141  		[ -s $i ] || continue
   1.142  		case "$i" in
   1.143 -		pkgs/kernel-*/receipt);;
   1.144 -		*) continue;;
   1.145 +			pkgs/kernel-*/receipt);;
   1.146 +			*) continue;;
   1.147  		esac
   1.148  		UNPACKED_SIZE="-"
   1.149  		. $i
   1.150  		case " $@ " in
   1.151 -		*\ $PACKAGE\ *)	checked='checked="checked"' ;;
   1.152 -		*) [ -n "$2" ] && checked="";;
   1.153 +			*\ $PACKAGE\ *)	checked='checked="checked"' ;;
   1.154 +			*) [ -n "$2" ] && checked="";;
   1.155  		esac
   1.156  		cat <<EOT
   1.157 -<tr>
   1.158 -<td><input type="radio" name="kernel" value="$PACKAGE" $checked/></td>
   1.159 -<td>${PACKAGE#kernel-}</td>
   1.160 -<td>$VERSION</td>
   1.161 -<td>$SHORT_DESC</td>
   1.162 -<!-- td>$UNPACKED_SIZE</td -->
   1.163 -</tr>
   1.164 +		<tr>
   1.165 +			<td><input type="radio" name="kernel" value="$PACKAGE" $checked/></td>
   1.166 +			<td>${PACKAGE#kernel-}</td>
   1.167 +			<td>$VERSION</td>
   1.168 +			<td>$SHORT_DESC</td>
   1.169 +			<!-- td>$UNPACKED_SIZE</td -->
   1.170 +		</tr>
   1.171  EOT
   1.172  		checked=""
   1.173  	done
   1.174  	cat <<EOT
   1.175 +	</tbody>
   1.176  </table>
   1.177 +</div>
   1.178  EOT
   1.179  	exit
   1.180  }
   1.181  
   1.182 +
   1.183 +
   1.184 +
   1.185  list_modules()
   1.186  {
   1.187  	TMPDIR=$2
   1.188  	shift 2
   1.189  	cat <<EOT
   1.190 +<input type="hidden" name="selected[]" value="" />
   1.191 +<div class="large">
   1.192  <table>
   1.193 -<tr>
   1.194 -<th></th>
   1.195 -<th>Module</th>
   1.196 -<th>Version</th>
   1.197 -<th>Description</th>
   1.198 -<th>Size</th>
   1.199 -<th></th>
   1.200 -</tr>
   1.201 +	<thead>
   1.202 +		<tr>
   1.203 +			<th> </th>
   1.204 +			<th>Module</th>
   1.205 +			<th>Version</th>
   1.206 +			<th>Description</th>
   1.207 +			<th>Size</th>
   1.208 +			<th> </th>
   1.209 +		</tr>
   1.210 +	</thead>
   1.211 +	<tbody>
   1.212  EOT
   1.213  	for i in $TMPDIR/pkgs/*/receipt pkgs/*/receipt ; do
   1.214  		[ -s $i ] || continue
   1.215  		case "$i" in
   1.216 -		pkgs/module-*/receipt);;
   1.217 -		*) continue;;
   1.218 +			pkgs/module-*/receipt);;
   1.219 +			*) continue;;
   1.220  		esac
   1.221 -		UNPACKED_SIZE="-"
   1.222 +		UNPACKED_SIZE='-'
   1.223  		. $i
   1.224 -		checked=""
   1.225 +		checked=''
   1.226  		case " $@ " in
   1.227 -		*\ $PACKAGE\ *)	checked='checked="checked"' ;;
   1.228 +			*\ $PACKAGE\ *)	checked='checked="checked"' ;;
   1.229  		esac
   1.230  		grep -qs "^$PACKAGE " $TMPDIR/uploadconf &&
   1.231  			checked='checked="checked"'
   1.232  		cat <<EOT
   1.233 -<tr>
   1.234 -<td><input type="checkbox" name="selected[]" value="$PACKAGE" $checked/></td>
   1.235 -<td>${PACKAGE#module-}</td>
   1.236 -<td>$VERSION</td>
   1.237 -<td>$SHORT_DESC</td>
   1.238 -<td>$UNPACKED_SIZE</td>
   1.239 -<td>$(grep -qs ^config_form $i && echo '?')</td>
   1.240 -</tr>
   1.241 +		<tr>
   1.242 +			<td><input type="checkbox" name="selected[]" value="$PACKAGE" $checked/></td>
   1.243 +			<td>${PACKAGE#module-}</td>
   1.244 +			<td>$VERSION</td>
   1.245 +			<td>$SHORT_DESC</td>
   1.246 +			<td>$UNPACKED_SIZE</td>
   1.247 +			<td>$(grep -qs ^config_form $i && echo '&raquo;')</td>
   1.248 +		</tr>
   1.249  EOT
   1.250  	done
   1.251  	cat <<EOT
   1.252 +	</tbody>
   1.253  </table>
   1.254 +</div>
   1.255  EOT
   1.256  	exit
   1.257  }
   1.258  
   1.259 +
   1.260 +
   1.261 +
   1.262  get_receipt()
   1.263  {
   1.264  	grep -l "PACKAGE=\"$1\"" $2/pkgs/*/receipt pkgs/*/receipt | head -1
   1.265  }
   1.266  
   1.267 +
   1.268 +
   1.269 +
   1.270  get_package()
   1.271  {
   1.272  	local pkg
   1.273 @@ -180,6 +211,9 @@
   1.274  	echo -n $pkg
   1.275  }
   1.276  
   1.277 +
   1.278 +
   1.279 +
   1.280  get_note()
   1.281  {
   1.282  	pkg=$(get_receipt $1 $2)
   1.283 @@ -189,6 +223,9 @@
   1.284  	config_note
   1.285  }
   1.286  
   1.287 +
   1.288 +
   1.289 +
   1.290  get_form()
   1.291  {
   1.292  	pkg=$(get_receipt $1 $2)
   1.293 @@ -209,6 +246,9 @@
   1.294  	exit
   1.295  }
   1.296  
   1.297 +
   1.298 +
   1.299 +
   1.300  do_pre_install()
   1.301  {
   1.302  	pkg=$(get_receipt $1 $2)
   1.303 @@ -221,6 +261,9 @@
   1.304  	exit 
   1.305  }
   1.306  
   1.307 +
   1.308 +
   1.309 +
   1.310  do_post_install()
   1.311  {
   1.312  	pkg=$(get_receipt $1 $2)
   1.313 @@ -237,6 +280,9 @@
   1.314  	exit 
   1.315  }
   1.316  
   1.317 +
   1.318 +
   1.319 +
   1.320  scan_depends()
   1.321  {
   1.322  	local pkg
   1.323 @@ -254,6 +300,9 @@
   1.324  	done
   1.325  }
   1.326  
   1.327 +
   1.328 +
   1.329 +
   1.330  get_depends()
   1.331  {
   1.332  	TMPDIR=$2
   1.333 @@ -264,6 +313,9 @@
   1.334  	exit
   1.335  }
   1.336  
   1.337 +
   1.338 +
   1.339 +
   1.340  pkgs_extract()
   1.341  {
   1.342  	cd $2
   1.343 @@ -292,6 +344,9 @@
   1.344  	exit
   1.345  }
   1.346  
   1.347 +
   1.348 +
   1.349 +
   1.350  lzma_set_size()
   1.351  {
   1.352  	n=$(unlzma -c $1 | wc -c)
   1.353 @@ -301,21 +356,27 @@
   1.354  	done | xargs echo -en | dd of=$1 conv=notrunc bs=1 seek=5 2> /dev/null
   1.355  }
   1.356  
   1.357 +
   1.358 +
   1.359 +
   1.360  case "$1" in
   1.361 ---list-modules) list_modules $@ ;;
   1.362 ---list-kernels) list_kernels $@ ;;
   1.363 ---list-pkgs) list_pkgs $@ ;;
   1.364 ---get-form) get_form $2 $3 ;;
   1.365 ---get-note) get_note $2 $3 ;;
   1.366 ---pre-install) do_pre_install $2 $3 ;;
   1.367 ---post-install) do_post_install $2 $3 ;;
   1.368 ---depends) get_depends $@ ;;
   1.369 ---pkgs-extract) pkgs_extract $2 $3 ;;
   1.370 ---remove) rm -rf $2; exit ;;
   1.371 ---get-pkg) get_package $2 $3 ;;
   1.372 ---init) init ;;
   1.373 +	--list-modules)	list_modules $@ ;;
   1.374 +	--list-kernels)	list_kernels $@ ;;
   1.375 +	--list-pkgs)	list_pkgs $@ ;;
   1.376 +	--get-form)		get_form $2 $3 ;;
   1.377 +	--get-note)		get_note $2 $3 ;;
   1.378 +	--pre-install)	do_pre_install $2 $3 ;;
   1.379 +	--post-install)	do_post_install $2 $3 ;;
   1.380 +	--depends)		get_depends $@ ;;
   1.381 +	--pkgs-extract)	pkgs_extract $2 $3 ;;
   1.382 +	--remove)		rm -rf $2; exit ;;
   1.383 +	--get-pkg)		get_package $2 $3 ;;
   1.384 +	--init)			init ;;
   1.385  esac
   1.386  
   1.387 +
   1.388 +
   1.389 +
   1.390  if [ "x$1" == "x--mkrootfs" ]; then
   1.391  	tmp=$2
   1.392  	cd $tmp/fs
   1.393 @@ -356,6 +417,8 @@
   1.394                  -boot-info-table $tmp/iso > /dev/null 2>&1
   1.395          [ -x /usr/bin/isohybrid ] &&
   1.396          /usr/bin/isohybrid $tmp/slitaz.iso 2> /dev/null
   1.397 +        [ -x /usr/bin/iso2exe ] &&
   1.398 +        /usr/bin/iso2exe $tmp/slitaz.iso 2> /dev/null
   1.399  fi
   1.400  if [ "x$1" == "x--mkexe" ]; then
   1.401  	tmp=$2
     2.1 --- a/index.php	Wed Oct 07 23:37:02 2015 +0200
     2.2 +++ b/index.php	Sun Nov 01 16:56:16 2015 +0100
     2.3 @@ -1,54 +1,53 @@
     2.4  <?php
     2.5  include "download.php";
     2.6 -$static = "http://mirror.slitaz.org/static/";
     2.7 +$static = "http://mirror1.slitaz.org/static/";
     2.8  ?>
     2.9 -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    2.10 -	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    2.11 -<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en">
    2.12 +<!DOCTYPE html>
    2.13 +<html lang="en">
    2.14  <head>
    2.15 +	<meta charset="UTF-8">
    2.16  	<title>Tiny SliTaz - Builder</title>
    2.17 -	<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
    2.18 -	<meta name="description" content="Tiny SliTaz Linux" />
    2.19 -	<meta name="keywords" lang="en" content="tiny slitaz, uclibx, tcc" />
    2.20 -	<meta name="robots" content="index, follow, all" />
    2.21 -	<meta name="revisit-after" content="7 days" />
    2.22 -	<meta name="expires" content="never" />
    2.23 -	<meta name="modified" content="<?php echo (date( "Y-m-d H:i:s", getlastmod())); ?>" />
    2.24 -	<meta name="author" content="SliTaz Contributors" />
    2.25 -	<meta name="publisher" content="www.slitaz.org" />
    2.26 -	<link rel="shortcut icon" href="<?php echo "$static"; ?>favicon.ico" />
    2.27 -	<link rel="stylesheet" type="text/css" href="<?php echo "$static"; ?>slitaz.css" />
    2.28 -	<link rel="stylesheet" type="text/css" href="tiny.css" />
    2.29 +	<meta name="description" content="Tiny SliTaz Linux">
    2.30 +	<meta name="keywords" lang="en" content="tiny slitaz, uclibx, tcc">
    2.31 +	<meta name="robots" content="index, follow, all">
    2.32 +	<meta name="revisit-after" content="7 days">
    2.33 +	<meta name="expires" content="never">
    2.34 +	<meta name="modified" content="<?php echo (date( "Y-m-d H:i:s", getlastmod())); ?>">
    2.35 +	<meta name="viewport" content="width=device-width, initial-scale=1">
    2.36 +	<meta name="author" content="SliTaz Contributors">
    2.37 +	<meta name="publisher" content="www.slitaz.org">
    2.38 +	<link rel="shortcut icon" href="/static/favicon.ico">
    2.39 +	<link rel="stylesheet" href="/static/slitaz.min.css">
    2.40 +	<link rel="stylesheet" href="tiny.css">
    2.41 +	<style>pre, tt, code { font-size: 0.9rem; }</style>
    2.42  </head>
    2.43  <body>
    2.44  
    2.45 -<!-- Header -->
    2.46 -<div id="header">
    2.47 -	<a name="top"></a>
    2.48 -	<div id="logo"></div>
    2.49 -	<div id="network">
    2.50 -		<a href="http://www.slitaz.org/">
    2.51 -		<img src="<?php echo "$static"; ?>/home.png" alt="[ Home ]" /></a>
    2.52 +<script>de=document.documentElement;de.className+=(("ontouchstart" in de)?' touch':' no-touch');</script>
    2.53 +
    2.54 +<header>
    2.55 +	<h1 id="top"><a href="http://tiny.slitaz.org/">Tiny SliTaz</a></h1>
    2.56 +	<div class="network">
    2.57 +		<a href="http://www.slitaz.org/" class="home"></a>
    2.58  		<!-- Get static files from Mirror Files vhost -->
    2.59  		<!-- <img src="http://mf.slitaz.org/images/people.png" alt="[ Group ]" /> -->
    2.60  		Tiny:
    2.61 -		<a href="http://scn.slitaz.org/groups/tiny">Group</a>
    2.62 +		<!-- a href="http://scn.slitaz.org/groups/tiny">Group</a -->
    2.63  		<a href="http://forum.slitaz.org/forum/tiny">Forum</a>
    2.64  		Screenshots:
    2.65  		<a href="tinyslitaz.png" title="Tiny SliTaz Manager">main</a>
    2.66  		<a href="tinyslitaz-boot.png" title="Tiny SliTaz Manager: boot.log">boot log</a>
    2.67  		<a href="tinyslitaz-httpinfo.png" title="Tiny SliTaz Manager: httpd info">httpd info</a>
    2.68  	</div>
    2.69 -	<h1><a href="http://tiny.slitaz.org/">Tiny SliTaz</a></h1>
    2.70 -</div>
    2.71 +</header>
    2.72  
    2.73  
    2.74  <!-- Content -->
    2.75 -<div id="content">
    2.76 +<main>
    2.77  
    2.78  <?php if (!empty($error)) echo "
    2.79  <div class=\"nav_box\">
    2.80 -	<h4>Error :</h4>
    2.81 +	<h4>Error:</h4>
    2.82  	<p>$error</p>
    2.83  </div>
    2.84  "; ?>
    2.85 @@ -64,89 +63,80 @@
    2.86  include "step5.php";
    2.87  ?>
    2.88  
    2.89 +<h3>Tiny SliTaz goals</h3>
    2.90  
    2.91 -<div class="box">
    2.92 -<h4>Tiny SliTaz goals</h4>
    2.93 -<p>
    2.94 -	Useful software, expansible, easy to configure, runs fully in RAM, 
    2.95 -	simple, light and fast for minimum hardware resources: ie fits on
    2.96 -	one floppy disk (IDE disk optional), runs on a 386sx processor and
    2.97 -	needs as little memory as possible (currently 4 MB with a 2.6.14 
    2.98 -	kernel).
    2.99 -	<a href="http://doc.slitaz.org/en:guides:pxe#why-use-pxe-the-vnc-example">
   2.100 -	Example</a>
   2.101 +<p>Useful software, expansible, easy to configure, runs fully in RAM, simple,
   2.102 +light and fast for minimum hardware resources: ie fits on one floppy disk (IDE
   2.103 +disk optional), runs on a 386SX processor and needs as little memory as possible
   2.104 +(currently 4MB with a 2.6.14 Kernel).
   2.105 +<a href="http://doc.slitaz.org/en:guides:pxe#why-use-pxe-the-vnc-example">Example</a>
   2.106  </p>
   2.107 -</div>
   2.108  
   2.109 -<div class="box">
   2.110 -<h4>Why this builder ?</h4>
   2.111 -<p>
   2.112 -	Tiny SliTaz should be as small as possible. Only the necessary
   2.113 -	software is kept. The package manager is run using this website.
   2.114 +
   2.115 +<h3>Why this builder?</h3>
   2.116 +
   2.117 +<p>Tiny SliTaz should be as small as possible. Only the necessary software is
   2.118 +kept. The package manager is run using this website.</p>
   2.119 +
   2.120 +
   2.121 +<h3>How is it built?</h3>
   2.122 +
   2.123 +<p>Tiny SliTaz uses a Linux Kernel with an <a href="dist/rootfs.cpio"
   2.124 +title="See CONFIG_INITRAMFS_SOURCE">embedded filesystem</a>. An extra initramfs
   2.125 +can also be loaded with the configuration and extra packages.</p>
   2.126 +
   2.127 +<p>The initramfs is based on <a href="http://uclibc.org/"
   2.128 +title="Instead of glibc">uClibc</a> and busybox with its <a
   2.129 +href="dist/busybox.config.txt">config</a> files and this <a
   2.130 +href="http://hg.slitaz.org/wok-tiny/file/tip/base-tiny/stuff">filesystem tree</a>.
   2.131  </p>
   2.132 -</div>
   2.133  
   2.134 -<div class="box">
   2.135 -<h4>How is it built ?</h4>
   2.136 -<p>
   2.137 -	Tiny SliTaz uses a Linux kernel
   2.138 -	with an <a href="dist/rootfs.cpio" title="See CONFIG_INITRAMFS_SOURCE">
   2.139 -	embedded filesystem</a>. An extra initramfs can also be loaded with 
   2.140 -	the configuration and extra packages.
   2.141 -</p>
   2.142 -<p>
   2.143 -	The initramfs is based on <a href="http://uclibc.org/"
   2.144 -	title="Instead of glibc">uClibc</a> and 
   2.145 -	busybox with its <a href="dist/busybox.config.txt">config</a>
   2.146 -	files and this
   2.147 -	<a href="http://hg.slitaz.org/wok-tiny/file/tip/base-tiny/stuff">
   2.148 -	filesystem tree</a>.
   2.149 -</p>
   2.150 -</div>
   2.151  
   2.152  <!-- End of content -->
   2.153 -</div>
   2.154 +</main>
   2.155  
   2.156 -<!-- Footer -->
   2.157 -<div id="footer">
   2.158 -	Copyright &copy; <span class="year"></span>
   2.159 -	<a href="http://www.slitaz.org/">SliTaz</a> - Network:
   2.160 -	<a href="http://scn.slitaz.org/">Community</a>
   2.161 -	<a href="http://doc.slitaz.org/">Doc</a>
   2.162 -	<a href="http://forum.slitaz.org/">Forum</a>
   2.163 -	<a href="http://pkgs.slitaz.org/">Packages</a>
   2.164 -	<a href="http://bugs.slitaz.org">Bugs</a>
   2.165 -	<a href="http://hg.slitaz.org/">Hg</a>
   2.166 -	<p>
   2.167 -		SliTaz @
   2.168 -		<a href="http://twitter.com/slitaz">Twitter</a>
   2.169 -		<a href="http://www.facebook.com/slitaz">Facebook</a>
   2.170 -		<a href="http://distrowatch.com/slitaz">Distrowatch</a>
   2.171 -		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a>
   2.172 -		<a href="http://flattr.com/profile/slitaz">Flattr</a>
   2.173 -	</p>
   2.174 -<p>
   2.175 -	<script type="text/javascript">
   2.176 +<script>
   2.177  	function QRCodePNG(str, obj) {
   2.178  		try {
   2.179 -			obj.height = obj.width += 200;
   2.180 +			obj.height = obj.width += 300;
   2.181  			return QRCode.generatePNG(str, {ecclevel: 'H'});
   2.182  		}
   2.183  		catch (any) {
   2.184  			var element = document.createElement("script");
   2.185 -			element.src = "/static/qrcode.js";
   2.186 -			element.type ="text/javascript"; 
   2.187 +			element.src = "/static/qrcode.min.js";
   2.188 +			element.type = "text/javascript";
   2.189  			element.onload = function() {
   2.190  				obj.src = QRCode.generatePNG(str, {ecclevel: 'H'});
   2.191  			};
   2.192  			document.body.appendChild(element);
   2.193  		}
   2.194  	}
   2.195 -	</script>
   2.196 +</script>
   2.197 +
   2.198 +<footer>
   2.199 +	<div>
   2.200 +		Copyright © 2015		<a href="http://www.slitaz.org/">SliTaz</a>
   2.201 +	</div>
   2.202 +	<div>
   2.203 +		Network:
   2.204 +		<a href="http://scn.slitaz.org/">Community</a> ·
   2.205 +		<a href="http://doc.slitaz.org/">Doc</a> ·
   2.206 +		<a href="http://forum.slitaz.org/">Forum</a> ·
   2.207 +		<a href="http://pkgs.slitaz.org/">Packages</a> ·
   2.208 +		<a href="http://bugs.slitaz.org">Bugs</a> ·
   2.209 +		<a href="http://hg.slitaz.org/?sort=lastchange">Hg</a>
   2.210 +	</div>
   2.211 +	<div>
   2.212 +		SliTaz @
   2.213 +		<a href="http://twitter.com/slitaz">Twitter</a> ·
   2.214 +		<a href="http://www.facebook.com/slitaz">Facebook</a> ·
   2.215 +		<a href="http://distrowatch.com/slitaz">Distrowatch</a> ·
   2.216 +		<a href="http://en.wikipedia.org/wiki/SliTaz">Wikipedia</a> ·
   2.217 +		<a href="http://flattr.com/profile/slitaz">Flattr</a>
   2.218 +	</div>
   2.219  	<img src="/static/qr.png" alt="#" onmouseover="this.title = location.href"
   2.220 -	 onclick="this.src = QRCodePNG(location.href, this)" />
   2.221 -</p>
   2.222 -</div>
   2.223 +	onclick="this.src = QRCodePNG(location.href, this)"/>
   2.224 +</footer>
   2.225  
   2.226  </body>
   2.227  </html>
     3.1 --- a/step1.php	Wed Oct 07 23:37:02 2015 +0200
     3.2 +++ b/step1.php	Sun Nov 01 16:56:16 2015 +0100
     3.3 @@ -59,17 +59,18 @@
     3.4  	if (!file_exists($_POST["tmp_dir"]."uploadconf")) {
     3.5  ?>
     3.6  
     3.7 -<p>
     3.8 -The file <u>/etc/packages.conf</u> in the initramfs holds all information
     3.9 -to rebuild your Tiny SliTaz system. You should upload your 
    3.10 -<u>/etc/packages.conf</u> first if you want to upgrade your system only.
    3.11 -</p>
    3.12 +<div class="box">
    3.13 +<h3>[Step 1/5] Packages and Kernel</h3>
    3.14 +
    3.15 +<p>The file <tt>/etc/packages.conf</tt> in the initramfs holds all information
    3.16 +to rebuild your Tiny SliTaz system. You should upload your
    3.17 +<tt>/etc/packages.conf</tt> first if you want to upgrade your system only.</p>
    3.18  
    3.19  <form method="post" enctype="multipart/form-data" action="<?php echo $_SERVER["PHP_SELF"]; ?>">
    3.20 -Packages configuration:
    3.21 -<input type="file" name="uploadconf" />
    3.22 -<input name="config" value="Get config" type="submit" />
    3.23 -<?php post_hidden(); ?>
    3.24 +	Packages configuration:
    3.25 +	<input type="file" name="uploadconf" />
    3.26 +	<input name="config" value="Get config" type="submit" />
    3.27 +	<?php post_hidden(); ?>
    3.28  </form>
    3.29  <?php
    3.30  	}
    3.31 @@ -80,55 +81,53 @@
    3.32  	if (!file_exists($_POST["tmp_dir"]."uploadpkgs")) {
    3.33  ?>
    3.34  
    3.35 -<p>
    3.36 -You can upload a tazpkg file (.tazpkg) or a tarball of tazpkg files (.tar).
    3.37 +<hr>
    3.38 +
    3.39 +<p>You can upload a tazpkg file (.tazpkg) or a tarball of tazpkg files (.tar).
    3.40  These packages will extend the official packages list and will be chosen when
    3.41  the package names are found to be matching. You can find some examples in the
    3.42 -<a href="http://hg.slitaz.org/wok-tiny/file/">Tiny SliTaz repository</a>.
    3.43 -</p>
    3.44 +<a href="http://hg.slitaz.org/wok-tiny/file/">Tiny SliTaz repository</a>.</p>
    3.45 +
    3.46  <div>
    3.47 -<form method="post" enctype="multipart/form-data" action="<?php echo $_SERVER["PHP_SELF"]; ?>">
    3.48 -Additional packages:
    3.49 -<input type="file" name="uploadpkgs" />
    3.50 -<input name="mypackages" value="Get packages" type="submit" />
    3.51 -<?php post_hidden(); ?>
    3.52 -</form>
    3.53 +	<form method="post" enctype="multipart/form-data" action="<?php echo $_SERVER["PHP_SELF"]; ?>">
    3.54 +		Additional packages:
    3.55 +		<input type="file" name="uploadpkgs" />
    3.56 +		<input name="mypackages" value="Get packages" type="submit" />
    3.57 +		<?php post_hidden(); ?>
    3.58 +	</form>
    3.59  </div>
    3.60 -<p>
    3.61 +
    3.62 +<hr>
    3.63  <?php
    3.64  	}
    3.65  ?>
    3.66 -</p>
    3.67  
    3.68 -<a name="kernel"></a>
    3.69 -<h2>Linux kernel</h2>
    3.70 -
    3.71 -<p>
    3.72 -You can upload a custom kernel or use an official one.
    3.73 -Your kernel should have an embedded initramfs with busybox like 
    3.74 -<a href="dist/rootfs.cpio" title="See CONFIG_INITRAMFS_SOURCE">this one</a>.
    3.75 -</p>
    3.76 +<p id="kernel">You can upload a custom Kernel or use an official one. Your
    3.77 +Kernel should have an embedded initramfs with busybox like <a
    3.78 +href="dist/rootfs.cpio" title="See CONFIG_INITRAMFS_SOURCE">this one</a>.</p>
    3.79  
    3.80  <div>
    3.81 -<form method="post" enctype="multipart/form-data" action="<?php echo $_SERVER["PHP_SELF"]; ?>">
    3.82 -Custom kernel (bzImage file):
    3.83 -<input type="file" name="uploadkernel" />
    3.84 -<input name="mykernel" value="Get kernel" type="submit" />
    3.85 -<?php post_hidden(); ?>
    3.86 -</form>
    3.87 +	<form method="post" enctype="multipart/form-data" action="<?php echo $_SERVER["PHP_SELF"]; ?>">
    3.88 +		Custom kernel (bzImage file):
    3.89 +		<input type="file" name="uploadkernel" />
    3.90 +		<input name="mykernel" value="Get kernel" type="submit" />
    3.91 +		<?php post_hidden(); ?>
    3.92 +	</form>
    3.93  </div>
    3.94  
    3.95 +<hr>
    3.96 +
    3.97  <div>
    3.98 -<form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post" name="kernels">
    3.99 -<input type="hidden" name="kernel" value="linux" />
   3.100 -<p>
   3.101 -</p>
   3.102 +	<form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post" name="kernels">
   3.103 +		<input type="hidden" name="kernel" value="linux" />
   3.104  
   3.105 -<div align="center">
   3.106 -<input name="continue" value="Continue" type="submit" />
   3.107 +		<div align="center">
   3.108 +			<input name="continue" value="Continue" type="submit" />
   3.109 +		</div>
   3.110 +	</form>
   3.111  </div>
   3.112 -</form>
   3.113  </div>
   3.114 +
   3.115  <?php
   3.116  }
   3.117  ?>
     4.1 --- a/step2.php	Wed Oct 07 23:37:02 2015 +0200
     4.2 +++ b/step2.php	Sun Nov 01 16:56:16 2015 +0100
     4.3 @@ -11,23 +11,21 @@
     4.4  
     4.5  ?>
     4.6  
     4.7 -<a name="modules"></a>
     4.8 -<h2>Additionnal modules</h2>
     4.9 +<div class="box">
    4.10 +<h3>[Step 2/5] Additional modules</h3>
    4.11  
    4.12  <form enctype="multipart/form-data" action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post" name="packages">
    4.13 -
    4.14 -<?php
    4.15 +	<?php
    4.16  	echo shell_exec("./helper --list-modules ".$_POST["tmp_dir"]);
    4.17  	post_hidden();
    4.18  ?>
    4.19 -<p>
    4.20 -</p>
    4.21  
    4.22 -<div align="center">
    4.23 -<input name="continue" value="Continue" type="submit" />
    4.24 -</div>
    4.25 +	<div align="center">
    4.26 +		<input name="continue" value="Continue" type="submit" />
    4.27 +	</div>
    4.28  
    4.29  </form>
    4.30 +</div>
    4.31  
    4.32  <?php
    4.33  }
     5.1 --- a/step3.php	Wed Oct 07 23:37:02 2015 +0200
     5.2 +++ b/step3.php	Sun Nov 01 16:56:16 2015 +0100
     5.3 @@ -25,24 +25,23 @@
     5.4  	}
     5.5  ?>
     5.6  
     5.7 -<a name="initramfs"></a>
     5.8 -<h2>Additional RAM filesystem</h2>
     5.9 +<div class="box">
    5.10 +<h3>[Step 3/5] Additional RAM filesystem</h3>
    5.11  
    5.12  <form enctype="multipart/form-data" action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post" name="packages">
    5.13  
    5.14 -<?php
    5.15 +	<?php
    5.16  	echo shell_exec("./helper --list-pkgs ".$_POST["tmp_dir"]);
    5.17  	post_hidden();
    5.18  ?>
    5.19 -<p>
    5.20 -</p>
    5.21  
    5.22 -<div align="center">
    5.23 -<input name="continue" value="Continue" type="submit" />
    5.24 +		<div align="center">
    5.25 +			<input name="continue" value="Continue" type="submit" />
    5.26 +		</div>
    5.27 +
    5.28 +	</form>
    5.29  </div>
    5.30  
    5.31 -</form>
    5.32 -
    5.33  <?php
    5.34  }
    5.35  ?>
     6.1 --- a/step4.php	Wed Oct 07 23:37:02 2015 +0200
     6.2 +++ b/step4.php	Sun Nov 01 16:56:16 2015 +0100
     6.3 @@ -32,24 +32,25 @@
     6.4  		}
     6.5  ?>
     6.6  
     6.7 -<a name="configuration"></a>
     6.8 -<h2><?php echo $pkg; ?> configuration</h2>
     6.9 +<div class="box">
    6.10 +<h3>[Step 4/5] <?php echo $pkg; ?> configuration</h3>
    6.11  
    6.12  <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
    6.13  
    6.14 -<input name="configuring" value="<?php echo $pkg; ?>" type="hidden" />
    6.15 -<?php
    6.16 +	<input name="configuring" value="<?php echo $pkg; ?>" type="hidden" />
    6.17 +	<div class="large">
    6.18 +		<?php
    6.19  		echo $output;
    6.20  		post_hidden();
    6.21  ?>
    6.22 -<p>
    6.23 -</p>
    6.24 +	</div>
    6.25  
    6.26 -<div align="center">
    6.27 -<input name="continue" value="Continue" type="submit" />
    6.28 -</div>
    6.29 +	<div align="center">
    6.30 +		<input name="continue" value="Continue" type="submit" />
    6.31 +	</div>
    6.32  
    6.33  </form>
    6.34 +</div>
    6.35  
    6.36  <?php
    6.37  		echo shell_exec("./helper --get-note $pkg ".$_POST['tmp_dir']); 
     7.1 --- a/step5.php	Wed Oct 07 23:37:02 2015 +0200
     7.2 +++ b/step5.php	Sun Nov 01 16:56:16 2015 +0100
     7.3 @@ -4,104 +4,108 @@
     7.4  {
     7.5  	return shell_exec("du -h ".$_POST['tmp_dir'].
     7.6  		"$file | awk '{ printf \"%s\",$1 }'");
     7.7 -	
     7.8  }
     7.9 - 
    7.10 +
    7.11  if (isset($_POST['toconfigure']) && $_POST['toconfigure'] == ""
    7.12      && $output == "") {
    7.13  	shell_exec("sudo ./helper --mkrootfs ".$_POST['tmp_dir']); 
    7.14  ?>
    7.15  
    7.16 -<a name="get"></a>
    7.17 -<h2>Get Tiny SliTaz files</h2>
    7.18 +<div class="box">
    7.19 +<h3 id="get">[Step 5/5] Get Tiny SliTaz files</h3>
    7.20  
    7.21  <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post" name="config">
    7.22  
    7.23 -<?php	post_hidden(); ?>
    7.24 -<h3>Bootable images</h3>
    7.25 -<p>
    7.26 -<div align="center">
    7.27 -<input name="download" value="Floppy image" type="submit" />
    7.28 -&nbsp;
    7.29 -<input name="download" value="DOS/EXE" type="submit" />
    7.30 -<?php if (file_exists("/boot/isolinux/isolinux.bin")) { ?>
    7.31 -&nbsp;
    7.32 -<input name="download" value="ISO image" type="submit" />
    7.33 +	<?php	post_hidden(); ?>
    7.34 +
    7.35 +<table>
    7.36 +	<tr><td class="first">Bootable images:</td><td>
    7.37 +
    7.38 +<?php
    7.39 +      $title="Neither Windows nor emm386 support. Need a real mode DOS";
    7.40 +      if ((filesize($_POST['tmp_dir']."rootfs.gz") + 
    7.41 +	   filesize($_POST['tmp_dir']."fs/boot/bzImage")) <= 18*80*1024) {
    7.42 +	   $title .= ". Tip: can be splitted in several boot floppies too";
    7.43 +	    ?>
    7.44 +		<input name="download" value="Floppy image" type="submit"
    7.45 +		       title="You can use dd or rawrite to create the 1.44M floppy disk" />
    7.46  <?php } ?>
    7.47 -</div>
    7.48 -</p>
    7.49 +		<input name="download" value="DOS/EXE" type="submit"
    7.50 +		       title="<?php echo $title; ?>" />
    7.51 +<?php if (file_exists("/boot/isolinux/isolinux.bin")) {
    7.52 +	  $title="Can be burn on a CD-ROM or written on a USB Key / memory card";
    7.53 +	  if (file_exists("/usr/bin/iso2exe"))
    7.54 +	  	$title .= ", or renamed with the .exe suffix and run with DOS or Windows";
    7.55 +	   ?>
    7.56 +		<input name="download" value="ISO image" type="submit"
    7.57 +		       title="<?php echo $title; ?>" />
    7.58 +<?php } ?>
    7.59 +	</td></tr>
    7.60  
    7.61 -<h3>Files for bootloaders</h3>
    7.62 -<p>
    7.63 -<div align="center">
    7.64 -<input name="download" value="Kernel (<?php echo show_size("fs/boot/bzImage");
    7.65 - ?>)" type="submit" />
    7.66 -&nbsp;
    7.67 -<input name="download" value="Rootfs (<?php echo show_size("rootfs.gz");
    7.68 - ?>)" type="submit" />
    7.69 -</div>
    7.70 -</p>
    7.71  
    7.72 -<h3>Configuration info</h3>
    7.73 -<p>
    7.74 -<div align="center">
    7.75 -<input name="download" value="Configuration files" type="submit" />
    7.76 -&nbsp;
    7.77 -<input name="download" value="packages.conf (<?php 
    7.78 -echo show_size("fs/etc/packages.conf"); ?>)" type="submit" />
    7.79 -</div>
    7.80 -</p>
    7.81 +	<tr><td class="first">Files for bootloaders:</td><td>
    7.82 +
    7.83 +		<input name="download" value="Kernel (<?php echo show_size("fs/boot/bzImage");
    7.84 +					 ?>)" type="submit" />
    7.85 +		<input name="download" value="Rootfs (<?php echo show_size("rootfs.gz");
    7.86 +			 ?>)" title="For the initrd= parameter" type="submit" />
    7.87 +	</td></tr>
    7.88 +
    7.89 +
    7.90 +	<tr><td class="first">Configuration info:</td><td>
    7.91 +
    7.92 +		<input name="download" value="Configuration files" type="submit" />
    7.93 +		<input name="download" value="packages.conf (<?php 
    7.94 +					echo show_size("fs/etc/packages.conf"); ?>)" type="submit" />
    7.95 +	</td></tr>
    7.96 +
    7.97  
    7.98  <?php if (show_size("fs/boot/System.map") != "") { ?>
    7.99 -<h3>Debug info</h3>
   7.100 -<p>
   7.101 -<div align="center">
   7.102 -<input name="download" value="System.map (<?php echo show_size("fs/boot/System.map");
   7.103 - ?>)" type="submit" />
   7.104 -&nbsp;
   7.105 -<input name="download" value="linux.config (<?php echo show_size("fs/boot/config");
   7.106 - ?>)" type="submit" />
   7.107 -</div>
   7.108 -</p>
   7.109 -<p>
   7.110 -<div align="center">
   7.111 -<input name="download" value="busybox.config (<?php echo show_size("fs/boot/config-busybox");
   7.112 - ?>)" type="submit" />
   7.113 -&nbsp;
   7.114 -<input name="download" value="post_install.log (<?php echo show_size("post_install.log");
   7.115 - ?>)" type="submit" />
   7.116 -</div>
   7.117 -</p>
   7.118 +	<tr><td class="first">Debug info:</td><td>
   7.119 +
   7.120 +		<input name="download" value="System.map (<?php echo show_size("fs/boot/System.map");
   7.121 +					?>)" type="submit" />
   7.122 +		<input name="download" value="linux.config (<?php echo show_size("fs/boot/config");
   7.123 +					?>)" type="submit" />
   7.124 +		<br>
   7.125 +		<input name="download" value="busybox.config (<?php echo show_size("fs/boot/config-busybox");
   7.126 +					?>)" type="submit" />
   7.127 +		<input name="download" value="post_install.log (<?php echo show_size("post_install.log");
   7.128 +					?>)" type="submit" />
   7.129 +	</td></tr>
   7.130 +
   7.131  <?php } ?>
   7.132  
   7.133 +</table>
   7.134  </form>
   7.135 +</div>
   7.136  
   7.137  <h2>Going further</h2>
   7.138 -<p>
   7.139 -Tiny SliTaz should be smaller to have more functionality
   7.140 -and/or needs less RAM.<br />
   7.141 -The kernel can be <a href="http://elinux.org/Linux_Tiny">tuned/patched</a>
   7.142 -or you can use an earlier version.
   7.143 -</p>
   7.144 -<p>
   7.145 -You can test Tiny SliTaz without pre-historic hardware using qemu (need the ne module) :
   7.146 -</p>
   7.147 +
   7.148 +<p>Tiny SliTaz should be smaller to have more functionality and/or needs less
   7.149 +RAM.<br>
   7.150 +The kernel can be <a href="http://elinux.org/Linux_Tiny">tuned/patched</a> or
   7.151 +you can use an earlier version.</p>
   7.152 +
   7.153 +<p>You can test Tiny SliTaz without pre-historic hardware using qemu (need the
   7.154 +<tt>ne</tt> module):</p>
   7.155 +
   7.156  <pre>
   7.157  qemu -cpu 486 -m 4 -net nic,model=ne2k_isa -net tap -fda slitaz.img
   7.158  </pre>
   7.159 -<p>
   7.160 -Or
   7.161 -</p>
   7.162 +
   7.163 +<p>Or</p>
   7.164 +
   7.165  <pre>
   7.166  qemu -cpu 486 -m 4 -net nic,model=ne2k_isa -net tap -kernel kernel -initrd rootfs.gz /dev/null
   7.167  </pre>
   7.168 -<p>
   7.169 -And the executable file /etc/qemu-ifup:
   7.170 -</p>
   7.171 +
   7.172 +<p>And the executable file <code>/etc/qemu-ifup</code>:</p>
   7.173 +
   7.174  <pre>
   7.175  #!/bin/sh
   7.176  
   7.177 -tunctl -u $(id -un) -t $1                           
   7.178 +tunctl -u $(id -un) -t $1
   7.179  ifconfig $1 192.168.0.1 broadcast 192.168.0.255 netmask 255.255.255.0
   7.180  </pre>
   7.181