SliTaz Repositories

     1.1 --- a/installer.cgi	Thu Mar 01 15:19:35 2012 +0100
     1.2 +++ b/installer.cgi	Thu Mar 01 15:38:57 2012 +0100
     1.3 @@ -2,9 +2,10 @@
     1.4  #
     1.5  # Main CGI interface for Tazinst, the SliTaz installer.
     1.6  #
     1.7 -# Copyright (C) 2011 SliTaz GNU/Linux - BSD License
     1.8 +# Copyright (C) 2012 SliTaz GNU/Linux - BSD License
     1.9  #
    1.10  # Authors : Dominique Corbex <domcox@slitaz.org>
    1.11 +#           Christophe Lincoln <pankso@slitaz.org>
    1.12  #
    1.13  
    1.14  VERSION=0.22
    1.15 @@ -123,58 +124,50 @@
    1.16  select_gparted()
    1.17  {
    1.18  	cat <<EOT
    1.19 -<table>
    1.20 -<tr>
    1.21 -	<td><h4>$(gettext "About")</h4></td>
    1.22 -</tr>
    1.23 -<tr>
    1.24 -	<td>$(gettext "Before installation, you may need to resize partitions
    1.25 -on your hard disk drive in order to make space for SliTaz GNU/Linux.")</td>
    1.26 -</tr>
    1.27 -</table>
    1.28 +<div class="box">
    1.29 +	<h4>$(gettext "About")</h4>
    1.30 +<p>
    1.31 +	$(gettext "Before installation, you may need to resize partitions
    1.32 +	on your hard disk drive in order to make space for SliTaz GNU/Linux.
    1.33 +	You can graphically manage your partions with Gparted")
    1.34 +</p>
    1.35 +</div>
    1.36 +<a class="button" href="$SCRIPT_NAME?page=gparted">Execute Gparted</a>
    1.37  EOT
    1.38  }
    1.39  
    1.40  select_install()
    1.41  {
    1.42  	cat <<EOT
    1.43 -</table>
    1.44 -<form method="get" action="$SCRIPT_NAME">
    1.45 -<table>
    1.46 -<tr>
    1.47 -	<td><h4>$(gettext "Install")</h4></td>
    1.48 -</tr>
    1.49 -<tr>
    1.50 -	<td>$(gettext "Install SliTaz on a partition of your hard disk drive. If
    1.51 +<div class="box">
    1.52 +	<h4>$(gettext "Install")</h4>
    1.53 +<p>
    1.54 +	$(gettext "Install SliTaz on a partition of your hard disk drive. If
    1.55  	you decide to format your HDD, all data will be lost. If you do not 
    1.56  	format, all data except for any existing /home directory will be removed, 
    1.57 -	the home directory will be kept as is.")</td>
    1.58 -</tr>
    1.59 -<tr>
    1.60 -	<td><a class="button" href="$SCRIPT_NAME?page=install">$(gettext "Install SliTaz")</a></td>
    1.61 -</tr>
    1.62 -</table>
    1.63 +	the home directory will be kept as is.")
    1.64 +</p>
    1.65 +</div>
    1.66 +<p>
    1.67 +<a class="button" href="$SCRIPT_NAME?page=install">$(gettext "Install SliTaz")</a>
    1.68  EOT
    1.69  }
    1.70  
    1.71  select_upgrade()
    1.72  {
    1.73  	cat <<EOT
    1.74 -<table>
    1.75 -<tr>
    1.76 -	<td><h4>$(gettext "Upgrade")</h4></td>
    1.77 -</tr>
    1.78 -<tr>
    1.79 -	<td>$(gettext "Upgrade an already installed SliTaz system on your hard disk
    1.80 +<div class="box">
    1.81 +	<h4>$(gettext "Upgrade")</h4>
    1.82 +<p>
    1.83 +	$(gettext "Upgrade an already installed SliTaz system on your hard disk
    1.84  	drive. Your /home /etc /var/www directories will be kept, all other directories
    1.85  	will be removed. Any additional packages added to your old Slitaz system
    1.86 -	will be updated as long you have an active internet connection.")</td>
    1.87 -</tr>
    1.88 -<tr>
    1.89 -	<td><a class="button" href="$SCRIPT_NAME?page=upgrade">$(gettext "Upgrade SliTaz")</a></td>
    1.90 -</tr>
    1.91 -</table>
    1.92 -</form>
    1.93 +	will be updated as long you have an active internet connection.")
    1.94 +</p>
    1.95 +</div>
    1.96 +<p>
    1.97 +	<a class="button" href="$SCRIPT_NAME?page=upgrade">$(gettext "Upgrade SliTaz")</a>
    1.98 +</p>
    1.99  EOT
   1.100  }
   1.101