# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1303087494 -7200
# Node ID e4381f2e73f66ef08c35b920862679a1bcc7479e
# Parent  3e240532b3dbfaebbe3a60427c862493aae35ad5
boot.cgi: Add grub page configuration

diff -r 3e240532b3db -r e4381f2e73f6 boot.cgi
--- a/boot.cgi	Mon Apr 18 01:00:41 2011 +0200
+++ b/boot.cgi	Mon Apr 18 02:44:54 2011 +0200
@@ -171,33 +171,84 @@
 			echo '</td></tr>'
 		done
 		table_end ;;
+	*\ grub\ *)
+		if [ "$(GET splash)" ]; then
+			default=$(GET default)
+			timeout=$(GET timeout)
+			splash=$(GET splash)
+			sed -i \
+				-e s"/default .*/default $default/" \
+				-e s"/timeout .*/timeout $timeout/" \
+				-e s"#splashimage=.*#splashimage=$splash#" \
+				/boot/grub/menu.lst
+		fi
+		default=$(cat /boot/grub/menu.lst | grep ^default | cut -d " " -f 2)
+		timeout=$(cat /boot/grub/menu.lst | grep ^timeout | cut -d " " -f 2)
+		splash=$(cat /boot/grub/menu.lst | grep ^splashimage | cut -d "=" -f 2)
+		xhtml_header
+				cat << EOT
+<div id="wrapper">
+	<h2>$(gettext "GRUB Boot loader")</h2>
+	<p>
+		$(gettext "The first application stated when computer got power on")
+	</p>
+</div>
+
+<form method="get" action="$SCRIPT_NAME">
+	<input type="hidden" name="grub" />
+<pre>
+Default entry : <input type="text" name="default" value="$default" />
+
+Timeout       : <input type="text" name="timeout" value="$timeout" />
+
+Splash image  : <input type="text" name="splash" value="$splash" size="40" />
+</pre>
+	<input type="submit" value="$(gettext "Change")" />
+	<a class="button" href="index.cgi?file=/boot/grub/menu.lst">
+		<img src="$IMAGES/text.png" />View or edit menu.lst</a>
+</form>
+
+<h3>$(gettext "Boot entries")</h3>
+EOT
+	entry='-1'
+	grep ^title /boot/grub/menu.lst | while read title
+	do
+		entry=$(($entry + 1))
+		echo "<strong>$(gettext "Entry") $entry</strong>"
+		echo '<pre>'
+		grep -A 2 "$title" /boot/grub/menu.lst
+		echo '</pre>'
+	done
+	# Here we could check if an entry for gpxe is present if not
+	# display a form to add it.
+	[ -f "/boot/gpxe" ] && echo "<h3>gPXE</h3>" && \
+		gettext "Web boot is avalaible with gPXE"
+	;;
 	*)
 		#
 		# Default content with summary
 		#
 		. /etc/rcS.conf
 		xhtml_header
-		
 		cat << EOT
 <div id="wrapper">
-	<h2>`gettext "Boot &amp; Start services"`</h2>
+	<h2>$(gettext "Boot &amp; Start services")</h2>
 	<p>
-		`gettext "Everything that happens before user login"` 
+		$(gettext "Everything that happens before user login")
 	</p>
 </div>
 <div>
 	<a class="button" href="$SCRIPT_NAME?log">
-		<img src="$IMAGES/text.png" />`gettext "Boot logs"`</a>
+		<img src="$IMAGES/text.png" />$(gettext "Boot logs")</a>
 	<a class="button" href="$SCRIPT_NAME?daemons">
-		<img src="$IMAGES/recharge.png" />`gettext "Manage daemons"`</a>
+		<img src="$IMAGES/recharge.png" />$(gettext "Manage daemons")</a>
+	<a class="button" href="$SCRIPT_NAME?grub">$(gettext "Boot loader")</a>
 </div>
 
 <h3>`gettext "Configuration files"`</h3>
 <ul>
 	<li>`gettext "Main configuration file:"`
 		<a href="index.cgi?file=/etc/rcS.conf">rcS.conf</a></li>
-	<li>`gettext "Grub menu:"`
-		<a href="index.cgi?file=/boot/grub/menu.lst">menu.lst</a></li>
 	<li>`gettext "Login manager settings:"`
 		<a href="index.cgi?file=/etc/slim.conf">slim.conf</a></li>
 </ul>
diff -r 3e240532b3db -r e4381f2e73f6 data/tazpanel.conf
--- a/data/tazpanel.conf	Mon Apr 18 01:00:41 2011 +0200
+++ b/data/tazpanel.conf	Mon Apr 18 02:44:54 2011 +0200
@@ -13,7 +13,7 @@
 FOOTER="/styles/$STYLE/footer.html"
 
 # Display some debug messages
-DEBUG="0"
+DEBUG="1"
 
 # Activity log file
 LOG_FILE="/var/log/slitaz/tazpanel.log"
diff -r 3e240532b3db -r e4381f2e73f6 lib/libtazpanel
--- a/lib/libtazpanel	Mon Apr 18 01:00:41 2011 +0200
+++ b/lib/libtazpanel	Mon Apr 18 02:44:54 2011 +0200
@@ -45,7 +45,9 @@
 
 # Remove status and ESC char from tazpkg/tazlito commands output
 filter_taztools_msgs() {
-	grep ^[a-zA-Z0-9] | sed s'/\[^Gm]*.//g'
+	grep ^[a-zA-Z0-9] | sed \
+		-e s'/\[^Gm]*.//g' \
+		-e s'@OK@<span class="diff-add">OK</span>@'
 }
 
 # LOG activities