SliTaz Repositories

     1.1 --- a/installer.cgi	Wed Mar 30 01:45:52 2016 +0300
     1.2 +++ b/installer.cgi	Mon Apr 04 12:03:29 2016 +0200
     1.3 @@ -47,6 +47,8 @@
     1.4  			href="installer.cgi?page=install" data-root>$(gettext 'Install SliTaz')</a></li>
     1.5  		<li><a data-icon="upgrade"
     1.6  			href="installer.cgi?page=upgrade" data-root>$(gettext 'Upgrade system')</a></li>
     1.7 +		<li><a data-icon="slitaz"
     1.8 +			href="installer.cgi?page=evaluate" data-root>$(gettext 'Evaluate SliTaz')</a></li>
     1.9  	</menu>
    1.10  </li>
    1.11  EOT
    1.12 @@ -68,6 +70,9 @@
    1.13  hard disk drive from a device like a Live-CD or LiveUSB key, from a SliTaz \
    1.14  ISO file, or from the web by downloading an ISO file.")</p>
    1.15  
    1.16 +<p>$(gettext "Windows&trade; users can evaluate SliTaz in the directory \
    1.17 +\\slitaz on their hard disk.")</p>
    1.18 +
    1.19  <p>$(gettext "Which type of installation do you want to start?")</p>
    1.20  EOT
    1.21  }
    1.22 @@ -128,6 +133,50 @@
    1.23  }
    1.24  
    1.25  
    1.26 +select_evaluate() {
    1.27 +	cat <<EOT
    1.28 +<!-- Evaluate message -->
    1.29 +
    1.30 +<section>
    1.31 +	<header>$(gettext "Evaluate:") $(gettext "Without Partitioning / Formating")</header>
    1.32 +
    1.33 +	<div>
    1.34 +	<p>$(gettext "SliTaz and Windows&trade; can coexist in the same partition.")</p>
    1.35 +	<p>$(gettext "SliTaz will be in the \slitaz directory like UMSDOS did \
    1.36 +in the previous century...")</p>
    1.37 +	</div>
    1.38 +
    1.39 +	<footer>
    1.40 +		<form action="boot.cgi">
    1.41 +			<input type="hidden" name="iso"/>
    1.42 +			<input type="hidden" name="action" value="install"/>
    1.43 +			<table>
    1.44 +			<tr><td>$(gettext 'ISO image file full path')
    1.45 +				<span data-img="info" title="$(gettext 'set /dev/cdrom for a physical CD-ROM')"></span>
    1.46 +			</td>
    1.47 +			<td>$(file_chooser "iso" "")</td></tr>
    1.48 +			<tr><td>$(gettext 'Target partition')</td>
    1.49 +			<td><select name="instdev">
    1.50 +				<option value="/dev/null">$(gettext 'Choose a partition')</option>
    1.51 +EOT
    1.52 +	blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | \
    1.53 +		sed -e 's|[A-Z]*ID="[^"]*"||g;s| SEC[^ ]*||;s|LABEL=||;s|:||' \
    1.54 +		    -e 's|TYPE="\([^"]*\)"|\1|;s|/dev/||' | \
    1.55 +	while read dev label type; do
    1.56 +		echo -n "<option value=\"/dev/$dev\">/dev/$dev $label $type "
    1.57 +		echo "$(blk2h < /sys/block/${dev:0:3}/$dev/size)</option>"
    1.58 +	done 
    1.59 +	cat <<EOT
    1.60 +			</select></td></tr>
    1.61 +			</table>
    1.62 +			<button data-icon="install">$(gettext 'Install')</button>
    1.63 +		</form>
    1.64 +	</footer>
    1.65 +</section>
    1.66 +EOT
    1.67 +}
    1.68 +
    1.69 +
    1.70  #--------------------
    1.71  # partitioning page
    1.72  #--------------------
    1.73 @@ -180,25 +229,6 @@
    1.74  	</footer>
    1.75  </section>
    1.76  
    1.77 -<section>
    1.78 -	<header>$(gettext "Without Partitioning / Formating")</header>
    1.79 -
    1.80 -	<div>
    1.81 -	<p>$(gettext "SliTaz and Windows&trade; can coexist in the same partition.")</p>
    1.82 -	<p>$(gettext "SliTaz will be in the \slitaz directory like UMSDOS did \
    1.83 -in the previous century...")</p>
    1.84 -	</div>
    1.85 -
    1.86 -	<footer>
    1.87 -		<form action="boot.cgi">
    1.88 -			<input type="hidden" name="iso"/>
    1.89 -			<input type="hidden" name="action" value="install"/>
    1.90 -			<button data-icon="install">$(gettext 'Install')</button>
    1.91 -		</form>
    1.92 -	</footer>
    1.93 -</section>
    1.94 -
    1.95 -
    1.96  <h5>$(gettext "Continue installation")</h5>
    1.97  
    1.98  <p>$(gettext "Once you've made room for SliTaz on your drive, you should \
    1.99 @@ -1147,6 +1177,11 @@
   1.100  		select_action
   1.101  		select_install
   1.102  		select_upgrade
   1.103 +		select_evaluate
   1.104 +		;;
   1.105 +	evaluate)
   1.106 +		xhtml_header
   1.107 +		select_evaluate
   1.108  		;;
   1.109  	install)
   1.110  		xhtml_header