# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1489525535 -3600
# Node ID ad9ff08f754a6542d403139f35f8d5870d892f38
# Parent  cb51498760ab2d68a9519bc95492086880b4748e
Improve web/gui and use new tazweb --small

diff -r cb51498760ab -r ad9ff08f754a seb
--- a/seb	Mon Mar 13 19:56:17 2017 +0100
+++ b/seb	Tue Mar 14 22:05:35 2017 +0100
@@ -12,6 +12,8 @@
 # --iso --work --linux can be set in config file or from cmdline
 [ -f "build.conf" ] && . build.conf
 
+[ "$work" ]  || work="$(pwd)"
+
 rootfs="$work/rootfs"
 rootiso="$work/rootiso"
 sebfs="$work/sebfs"
@@ -24,7 +26,6 @@
 initfs="/usr/share/seb/initfs"
 packages="/usr/share/seb/packages"
 
-[ "$work" ]  || work="$(pwd)"
 [ "$iso" ]   || iso="seb-os-$(date '+%Y%m%d').iso"
 [ "$linux" ] || linux="$tools/bzImage-4.9.13"
 [ "$port" ] || port="8940"
@@ -467,7 +468,7 @@
 			httpd -p ${port} -u 0:0 -h ${work} \
 				-c ${tools}/web/httpd.conf
 		fi 
-		tazweb --notoolbar http://localhost:${port}/ & ;;
+		tazweb --small --raw http://localhost:${port}/ & ;;
 
 	env)
 		title "SEB environment"
diff -r cb51498760ab -r ad9ff08f754a tools/web/seb.cgi
--- a/tools/web/seb.cgi	Mon Mar 13 19:56:17 2017 +0100
+++ b/tools/web/seb.cgi	Tue Mar 14 22:05:35 2017 +0100
@@ -10,9 +10,10 @@
 . /usr/lib/slitaz/httphelper.sh
 header
 
+. /lib/libseb.sh
 work="$(pwd)"
+packages="/usr/share/seb/packages"
 export output=html
-. /lib/libseb.sh
 
 # Everything preformatted for a cmdline style output
 cat << EOT
@@ -22,8 +23,8 @@
 	<meta charset="utf-8" />
 	<title>SliTaz Embedded Builder</title>
 	<style type="text/css">
-		h1 { color: #aaa; font-size: 140%; } .info { color: #800057; }
-		hr { border: 1px solid #ddd; }
+		h1 { color: #888; font-size: 140%; } .info { color: #800057; }
+		hr { border: 1px solid #ddd; } .pkg { color: #800057; padding: 0 20px 0 0; }
 	</style>
 </head>
 <h1>SliTaz Embedded Builder</h1>
@@ -41,11 +42,20 @@
 
 	*\ help\ *)      seb | sed '1,2d' ;;
 	*\ build\ *)     seb -b ;;
-	*\ packages\ *)  seb -p ;;
 	*\ emulate\ *)   seb -e ;;
 	*\ debug\ *)     seb env; seb testsuite ;;
+	*\ packages\ *)
+		title "Seb packages"
+		IFS=":"
+		echo "<table>"
+		ls ${packages} | while read pkg; do
+			. ${packages}/${pkg}
+			echo "<tr><td class='pkg'>$pkg</td><td>$desc</td></tr>"
+		done; unset IFS
+		echo "</table><hr />" ;;
 	
 	*)
+		title "Seb summary"
 		echo "Work path   : <span class='info'>$work</span>"
 		if [ -d "$work/rootfs" ]; then
 			cat << EOT
@@ -54,7 +64,7 @@
 EOT
 		else
 			echo "Seb OS      : Not built yet!"
-		fi ;;
+		fi; footer ;;
 esac
 
 cat << EOT