# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1333358526 -7200
# Node ID 42a96c3bc97e8678f1dec5626c5dc622e9d4a8b9
# Parent  2e6d97c044c2537a376f654592a926533cf6261c
live: make live usb into tazpanle, new input and button style

diff -r 2e6d97c044c2 -r 42a96c3bc97e live.cgi
--- a/live.cgi	Mon Apr 02 10:12:40 2012 +0200
+++ b/live.cgi	Mon Apr 02 11:22:06 2012 +0200
@@ -56,11 +56,6 @@
 		$TERMINAL $TERM_OPTS \
 			-T "write-iso" \
 			-e "tazlito writeiso $(GET write_iso)" & ;;
-	*\ gen_liveusb\ *)
-		$TERMINAL $TERM_OPTS \
-			-T "Tazusb gen-liveusb" \
-			-e "tazusb gen-liveusb $(GET gen_liveusb); \
-				gettext \"ENTER to quit\"; read i" & ;;
 	*\ loramoutput\ *)
 		$TERMINAL $TERM_OPTS \
 			-T "build loram iso" \
@@ -86,27 +81,23 @@
 		# Step by step interface and store files in cache.
 		#
 		gettext "TODO" ;;
-	*)
-		#
-		# Default xHTML content
-		#
+	*\ liveusb\ *)
 		xhtml_header
 		cat << EOT
 <div id="wrapper">
-	<h2>`gettext "SliTaz Live Systems"`</h2>
-	<p>`gettext "Create and manage Live CD or USB SliTaz systems"`<p>
+	<h2>$(gettext "SliTaz LiveUSB")</h2>
+	<p>$(gettext "Create Live USB SliTaz systems")<p>
 </div>
 
-<a name="liveusb"></a>
-<h3>`gettext "Live USB"`</h3>
 <p>
-	`gettext "Generate SliTaz LiveUSB media and boot in RAM! Insert a
+	$(gettext "Generate SliTaz LiveUSB media and boot in RAM! Insert a
 	LiveCD into the cdrom drive, select the correct device and press
-	Generate."`
+	Generate.")
 </p>
 <form method="get" action="$SCRIPT_NAME">
-	`gettext "USB Media to use:"`
-	<select name="gen_liveusb">
+	<input type="hidden" name="liveusb" />
+	$(gettext "USB Media to use:")
+	<select name="gen">
 EOT
 		# List disk if there is a plugged USB device
 		if [ -d /proc/scsi/usb-storage ]; then
@@ -120,6 +111,29 @@
 	</select>
 	<input type="submit" value="`gettext "Generate"`" />
 </form>
+EOT
+		if [ "$(GET gen)" ]; then
+			echo "<h3>tazusb gen-liveusb $(GET gen)</h3>"
+			echo '<pre>'
+			# No pipe here so output is displayed in realtime
+			tazusb gen-liveusb $(GET gen)
+			echo '</pre>'
+		fi ;;
+	*)
+		#
+		# Default xHTML content
+		#
+		xhtml_header
+		cat << EOT
+<div id="wrapper">
+	<h2>`gettext "SliTaz Live Systems"`</h2>
+	<p>`gettext "Create and manage Live CD or USB SliTaz systems"`<p>
+</div>
+
+<div id="actions">
+	<a class="button" href="$SCRIPT_NAME?liveusb">
+		<img src="$IMAGES/harddisk.png" />$(gettext "Create LiveUSB")</a>
+</div>
 
 <a name="livecd"></a>
 <h3>`gettext "Write a Live CD"`</h3>
diff -r 2e6d97c044c2 -r 42a96c3bc97e network.cgi
--- a/network.cgi	Mon Apr 02 10:12:40 2012 +0200
+++ b/network.cgi	Mon Apr 02 11:22:06 2012 +0200
@@ -285,7 +285,6 @@
 </p>
 <div id="actions">
 	<div class="float-left">
-		`gettext "Connection:"`
 		<a class="button" href="$SCRIPT_NAME?start">
 			<img src="$IMAGES/start.png" />$(gettext "Start")</a>
 		<a class="button" href="$SCRIPT_NAME?stop">
diff -r 2e6d97c044c2 -r 42a96c3bc97e styles/default/header.html
--- a/styles/default/header.html	Mon Apr 02 10:12:40 2012 +0200
+++ b/styles/default/header.html	Mon Apr 02 11:22:06 2012 +0200
@@ -78,7 +78,7 @@
 		</li>
 		<li><a href="/live.cgi">Live</a>
 			<ul>
-				<li><a href="/live.cgi#liveusb">Create a live USB key</a></li>
+				<li><a href="/live.cgi?liveusb">Create a live USB key</a></li>
 				<li><a href="/live.cgi#liveiso">Create a live CD-ROM</a></li>
 				<li><a href="/live.cgi#loram">Convert ISO to loram</a></li>
 				<li><a href="/live.cgi#meta">Build a meta ISO</a></li>
diff -r 2e6d97c044c2 -r 42a96c3bc97e styles/default/images/down.png
Binary file styles/default/images/down.png has changed