# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1301793660 -7200
# Node ID 64f564036b883fa9f25035dd379d2e083d22c79a
# Parent  4c1174a446ee5ab94feb7d6a299f1509bd60862b
A bunch of change, users mangement, javascript small function, css, tazpg.cgi

diff -r 4c1174a446ee -r 64f564036b88 index.cgi
--- a/index.cgi	Sat Apr 02 21:45:16 2011 +0200
+++ b/index.cgi	Sun Apr 03 03:21:00 2011 +0200
@@ -1,55 +1,191 @@
 #!/bin/sh
 #
-# CGI/Shell script example for TazPanel
+# Main CGI interface for TazPanel. In on word: KISS
 #
 echo "Content-Type: text/html"
 echo ""
 
-. tazpanel.conf
+# We need a config file first
+CONFIG="/etc/slitaz/tazpanel.conf"
+[ -f $CONFIG ] && . $CONFIG
+[ -f tazpanel.conf ] && . tazpanel.conf
+[ -z $PANEL ] && echo "No config file found" && exit 1
 
+# xHTML 5 header
 xhtml_header() {
-	# xHTML 5 header
 	cat $HEADER | sed s/'- %TITLE%'/"$TITLE"/
 }
 
-[ $DEBUG == "1" ] && echo "<p class='debug'>DEBUG on</p>"
+table_start() {
+	cat << EOT
+<table>
+	<tbody>
+EOT
+}
+
+table_end () {
+	cat << EOT
+	</tbody>
+</table>
+EOT
+}
 
 #
 # Commands
 #
 
 case "$QUERY_STRING" in
-	users)
+	boot)
+		# Everything until user login
+		TITLE="- Network"
+		xhtml_header
+		cat << EOT
+<div id="wrapper">
+<h2>`gettext "Boot &amp; startup"`</h2>
+<p>
+	`gettext "Everything that appends before user login."` 
+</p>
+
+<h3>`gettext "Kernel cmdline"`</h3>
+<pre>
+`cat /proc/cmdline`
+</pre>
+EOT
+		echo '</div>' ;;
+	users|user=*)
+		# Manage system user accounts
 		TITLE="- Users"
 		xhtml_header
-		echo '<ul>'
-		fgrep /home /etc/passwd | while read line
+
+		cmdline=`echo ${QUERY_STRING#user*=} | sed s'/&/ /g'`		
+		#user=`echo ${cmdline} | sed s'/=/ /' | awk '{print $1}'`
+		#cmd=`echo ${cmdline} | sed s'/=/ /' |awk '{print $2}'`
+		
+		[ $DEBUG == "1" ] && echo \
+			"<p class='debug'>$cmdline</p>"
+			#$REQUEST_METHOD $QUERY_STRING
+		# Parse cmdline
+		for opt in $cmdline
 		do
-			echo '<li>'
-			echo "	<img src='$IMAGES/user.png' />$line"
-			echo '</li>'
+			case $opt in
+				adduser=*)
+					user=${opt#adduser=}
+					cmd=adduser ;;
+				deluser=*)
+					user=${opt#deluser=}
+					deluser $user ;;
+				passwd=*)
+					pass=${opt#passwd=} ;;
+			esac
 		done
-		echo '</ul>' ;;
+		case "$cmd" in
+			adduser)
+				echo "$user"
+				echo $pass
+				adduser -D $user
+				echo "$pass" | chpasswd
+				for g in audio cdrom floppy video
+				do
+					addgroup $user $g
+				done ;;
+			*) continue ;;
+		esac
+		cat << EOT
+<div id="wrapper">
+<h2>`gettext "Manage users"`</h2>
+<div>`gettext "Manage human users on your SliTaz system"`</div>
+<form method="get" action="$SCRIPT_NAME">
+EOT
+		table_start
+		cat << EOT
+<tr id="thead">
+	<td>`gettext "Name"`</td>
+	<td>`gettext "User ID"`</td>
+	<td>`gettext "Name"`</td>
+	<td>`gettext "Home"`</td>
+	<td>`gettext "SHell"`</td>
+</tr>
+EOT
+		for i in `cat /etc/passwd | cut -d ":" -f 1`
+		do
+			if [ -d /home/$i ]; then
+				login=$i
+				uid=`cat /etc/passwd | grep $i | cut -d ":" -f 3`
+				gid=`cat /etc/passwd | grep $i | cut -d ":" -f 4`
+				name=`cat /etc/passwd | grep $i | cut -d ":" -f 5 | \
+					sed s/,,,//`
+				home=`cat /etc/passwd | grep $i | cut -d ":" -f 6`
+				shell=`cat /etc/passwd | grep $i | cut -d ":" -f 7`
+				echo '<tr>'
+				echo "<td><input type='hidden' name='user' />
+					<input type='checkbox' name='deluser' value='$login' />
+					<img src='$IMAGES/user.png' />$login</td>"
+				echo "<td>$uid:$gid</td>"
+				echo "<td>$name</td>"
+				echo "<td>$home</td>"
+				echo "<td>$shell</td>"
+				echo '</tr>'
+			fi
+		done
+		table_end
+		#`gettext "Selection:"`
+		cat << EOT
+<div>
+	<input type="submit" value="`gettext "Delete selected user"`" />
+</div>
+
+</form>
+</div>
+
+<h3>`gettext "Add a user"`</h3>
+<form method="get" action="$SCRIPT_NAME">
+<input type="hidden" name="user" size="30" />
+<p>
+	`gettext ""`
+	<input type="text" name="adduser" size="30" />
+</p>
+<p>
+	`gettext ""`
+	<input type="password" name="passwd" size="30" />
+</p>
+<input type="submit" value="`gettext ""`Create user" />
+</form
+EOT
+		;;
 	network)
+		# Network configuration
 		TITLE="- Network"
 		xhtml_header
+		cat << EOT
+<div id="wrapper">
+<h2>`gettext "Connections`</h2>
+EOT
 		echo '<pre>'
 		ifconfig
-		echo '</pre>' ;;
+		echo '</pre>'
+		echo '</div>' ;;
 	hardware)
 		TITLE="- Hardware"
 		xhtml_header
+		cat << EOT
+<div id="wrapper">
+<h2>`gettext "Drivers &amp; Devices"`</h2>
+EOT
 		echo '<pre>'
 		lspci
-		echo '</pre>' ;;
+		echo '</pre>'
+		echo '</div>' ;;
 	*)
 		# Default xHTML content
 		xhtml_header
 		cat << EOT
+<div id="wrapper">
+<h2>`gettext "Host:"` `hostname`</h2>
 <p>
 	Uptime: `uptime`
 </p>
 EOT
+		echo '</div>'
 		;;
 esac
 
diff -r 4c1174a446ee -r 64f564036b88 lib/checkbox.js
--- a/lib/checkbox.js	Sat Apr 02 21:45:16 2011 +0200
+++ b/lib/checkbox.js	Sun Apr 03 03:21:00 2011 +0200
@@ -1,20 +1,19 @@
-javascript:(function(){
-function checkFrames(w) {
-
-  try {
-    var inputs = w.document.getElementsByTagName('input');
-    for (var i = 0; i < inputs.length; i++) {
-      if (inputs[i].type && inputs[i].type == 'checkbox'){
-        inputs[i].checked = !inputs[i].checked;
-      }
-    }
-  } catch (e){}
-  if(w.frames && w.frames.length>0){
-    for(var i = 0; i < w.frames.length;i++){
-      var fr = w.frames[i];
-      checkFrames(fr);
-    }
-  }
+javascript:(function() {
+function checkBoxes(w) {
+	try {
+		var inputs = w.document.getElementsByTagName('input');
+		for (var i = 0; i < inputs.length; i++) {
+			if (inputs[i].type && inputs[i].type == 'checkbox') {
+				inputs[i].checked = !inputs[i].checked;
+			}
+		}
+	} catch (e){}
+	if (w.frames && w.frames.length>0) {
+		for (var i = 0; i < w.frames.length;i++) {
+			var fr = w.frames[i];
+			checkFrames(fr);
+		}
+	}
 }
-checkFrames(window);
+checkBoxes(window);
 })()
diff -r 4c1174a446ee -r 64f564036b88 po/tazpkg-cgi/tazpkg-cgi.pot
--- a/po/tazpkg-cgi/tazpkg-cgi.pot	Sat Apr 02 21:45:16 2011 +0200
+++ b/po/tazpkg-cgi/tazpkg-cgi.pot	Sun Apr 03 03:21:00 2011 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tazpkg CGI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-02 21:33+0200\n"
+"POT-Creation-Date: 2011-04-03 03:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -41,55 +41,55 @@
 msgid "Blocked packages     : "
 msgstr ""
 
-#: tazpkg.cgi:97
+#: tazpkg.cgi:96
 msgid "Search"
 msgstr ""
 
-#: tazpkg.cgi:109
+#: tazpkg.cgi:108
 msgid "Name"
 msgstr ""
 
-#: tazpkg.cgi:110
+#: tazpkg.cgi:109
 msgid "Version"
 msgstr ""
 
-#: tazpkg.cgi:111
+#: tazpkg.cgi:110
 msgid "Description"
 msgstr ""
 
-#: tazpkg.cgi:112
+#: tazpkg.cgi:111
 msgid "Web"
 msgstr ""
 
-#: tazpkg.cgi:127
+#: tazpkg.cgi:126
 msgid "List:"
 msgstr ""
 
-#: tazpkg.cgi:128 tazpkg.cgi:182
+#: tazpkg.cgi:127 tazpkg.cgi:181
 msgid "My packages"
 msgstr ""
 
-#: tazpkg.cgi:129 tazpkg.cgi:213 tazpkg.cgi:231
+#: tazpkg.cgi:128 tazpkg.cgi:213 tazpkg.cgi:231
 msgid "All packages"
 msgstr ""
 
-#: tazpkg.cgi:130 tazpkg.cgi:246
+#: tazpkg.cgi:129 tazpkg.cgi:246
 msgid "Recharge"
 msgstr ""
 
-#: tazpkg.cgi:131
+#: tazpkg.cgi:130
 msgid "Upgradeable"
 msgstr ""
 
-#: tazpkg.cgi:132 tazpkg.cgi:349
+#: tazpkg.cgi:131 tazpkg.cgi:349
 msgid "Configuration"
 msgstr ""
 
-#: tazpkg.cgi:141 tazpkg.cgi:151 tazpkg.cgi:162
+#: tazpkg.cgi:140 tazpkg.cgi:150 tazpkg.cgi:161
 msgid "Selection:"
 msgstr ""
 
-#: tazpkg.cgi:165
+#: tazpkg.cgi:164
 msgid "Toogle all"
 msgstr ""
 
diff -r 4c1174a446ee -r 64f564036b88 styles/default/header.html
--- a/styles/default/header.html	Sat Apr 02 21:45:16 2011 +0200
+++ b/styles/default/header.html	Sun Apr 03 03:21:00 2011 +0200
@@ -6,13 +6,14 @@
 	<link rel="shortcut icon" href="styles/default/favicon.ico" />
 	<link rel="stylesheet" type="text/css" href="styles/default/style.css" />
 </head>
-<body>
-
+<body onLoad="init()">
+	
 <h1>TazPanel - %TITLE%</h1>
 
 <div id="block">
 	<a href="./">Panel</a>
 	| <a href="tazpkg.cgi">Packages</a>
+	| <a href="index.cgi?boot">Boot</a>
 	| <a href="index.cgi?users">Users</a>
 	| <a href="index.cgi?network">Network</a>
 	| <a href="index.cgi?hardware">Hardware</a>
diff -r 4c1174a446ee -r 64f564036b88 styles/default/style.css
--- a/styles/default/style.css	Sat Apr 02 21:45:16 2011 +0200
+++ b/styles/default/style.css	Sun Apr 03 03:21:00 2011 +0200
@@ -49,6 +49,7 @@
 /* Content */
 
 #content { margin: 0; }
+#wrapper { margin: 80px 0 20px; }
 
 .search {
 	position: absolute;
@@ -67,7 +68,7 @@
 .box {
 	margin: 10px 0;
 	padding: 12px;
-	background: #efefef;
+	background: #f8f8f8;
 	border: 1px solid #ddd;
 }
 
@@ -80,12 +81,15 @@
 	border: 1px solid #ddd;
 }
 
+.float_left { float: right; }
+.float_right { float: right; }
+
 /* Table */
 
 table {
 	background-color: #f8f8f8;
 	border: 1px solid #ddd;
-	margin: 30px 0 0 0;
+	margin: 40px 0 0 0;
 	padding: 10px 10px 10px 0;
 	width: 100%;
 }
diff -r 4c1174a446ee -r 64f564036b88 tazpanel
--- a/tazpanel	Sat Apr 02 21:45:16 2011 +0200
+++ b/tazpanel	Sun Apr 03 03:21:00 2011 +0200
@@ -3,8 +3,11 @@
 # Tiny Tazpanel cmdline interface
 #
 
-#. /etc/slitaz/tazpanel.conf
+CONFIG="/etc/slitaz/tazpanel.conf"
+
+[ -f $CONFIG ] && . $CONFIG
 [ -f tazpanel.conf ] && . tazpanel.conf
+[ -z $PANEL ] && echo "No config file found" && exit 1
 
 case "$1" in
 	start)
diff -r 4c1174a446ee -r 64f564036b88 tazpanel.conf
--- a/tazpanel.conf	Sat Apr 02 21:45:16 2011 +0200
+++ b/tazpanel.conf	Sun Apr 03 03:21:00 2011 +0200
@@ -14,9 +14,9 @@
 
 # Busybox HTTP deamon config
 # /etc/slitaz/httpd.conf
-HTTPD_CONF="httpd.conf"
+HTTPD_CONF="/etc/slitaz/httpd.conf"
 HTTPD_PORT="8080"
 
-# Tazpkg paths
+# Shared Tazpkg paths
 LOCALSTATE="/var/lib/tazpkg"
 INSTALLED="$LOCALSTATE/installed"
diff -r 4c1174a446ee -r 64f564036b88 tazpanel.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tazpanel.desktop	Sun Apr 03 03:21:00 2011 +0200
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=TazPanel
+Icon=slitaz-menu
+Exec=browser http://tazpanel:8080/
+Type=Application
+Categories=System;
diff -r 4c1174a446ee -r 64f564036b88 tazpkg.cgi
--- a/tazpkg.cgi	Sat Apr 02 21:45:16 2011 +0200
+++ b/tazpkg.cgi	Sun Apr 03 03:21:00 2011 +0200
@@ -92,7 +92,6 @@
 <div class="search">
 <form method="get" action="$SCRIPT_NAME">
 	<p>
-		
 		<input type="text" name="search" size="20">
 		<input type="submit" value="`gettext "Search"`">
 	</p>
@@ -207,6 +206,7 @@
 	list-all)
 		# List all available packages on mirror
 		cd  $LOCALSTATE
+		loader
 		search_form
 		sub_block
 		cat << EOT