# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1303094931 -7200
# Node ID ed55f0e369b31fae9d41374465949fdd534f9b2b
# Parent  29a4a55db6e35e11bc721762afd10795715ec50b
hardware.cgi and index.cgi better output of df and prepare for disk management

diff -r 29a4a55db6e3 -r ed55f0e369b3 hardware.cgi
--- a/hardware.cgi	Mon Apr 18 03:44:20 2011 +0200
+++ b/hardware.cgi	Mon Apr 18 04:48:51 2011 +0200
@@ -111,9 +111,25 @@
 EOT
 		fdisk -l | fgrep Disk
 		echo '</pre>'
-		echo '<pre>'
-			df -h | grep ^/dev
-		echo '</pre>'
+		#
+		# Disk stats and management (mount, umount, heck)
+		#
+		table_start
+		df_thead
+		df -h | grep ^/dev | while read fs size used av pct mp
+		do
+				cat << EOT
+<tr>
+	<td><img src="$IMAGES/harddisk.png" />$fs</td>
+	<td>$size</td>
+	<td>$av</td>
+	<td class="pct"><div class="pct"
+		style="width: $pct;">$used - $pct</div></td>
+	<td>$mp</td>
+</tr>
+EOT
+		done
+		table_end
 		echo "<h3>$(gettext "System memory")</h3>"
 		echo '<pre>'
 		free -m | sed \
diff -r 29a4a55db6e3 -r ed55f0e369b3 index.cgi
--- a/index.cgi	Mon Apr 18 03:44:20 2011 +0200
+++ b/index.cgi	Mon Apr 18 04:48:51 2011 +0200
@@ -142,13 +142,27 @@
 
 <h4>`gettext "Network status"`</h4>
 `list_network_interfaces`
-
-<h4>`gettext "Filesystem usage statistics"`</h4>
-<pre>
-`df -h | grep ^/dev`
-</pre>
-
-<h3>`gettext "Panel Activity"`</h3>
+EOT
+		# Disk stats (management is done is hardwar.cgi)
+		table_start
+		df_thead
+		df -h | grep ^/dev | while read fs size used av pct mp
+		do
+				cat << EOT
+<tr>
+	<td><a href="hardware.cgi">
+		<img src="$IMAGES/harddisk.png" />$fs</a></td>
+	<td>$size</td>
+	<td>$av</td>
+	<td class="pct"><div class="pct"
+		style="width: $pct;">$used - $pct</div></td>
+	<td>$mp</td>
+</tr>
+EOT
+		done
+		table_end
+		cat << EOT
+<h3>$(gettext "Panel Activity")</h3>
 <pre id="panel-activity">
 $(cat $LOG_FILE | tail -n 8 | sort -r | syntax_highlighter activity)
 </pre>
diff -r 29a4a55db6e3 -r ed55f0e369b3 lib/libtazpanel
--- a/lib/libtazpanel	Mon Apr 18 03:44:20 2011 +0200
+++ b/lib/libtazpanel	Mon Apr 18 04:48:51 2011 +0200
@@ -164,3 +164,17 @@
 EOT
 	
 }
+
+df_thead() {
+	cat << EOT
+<thead>
+	<tr>
+		<td>$(gettext "Filesystem")</td>
+		<td>$(gettext "Size")</td>
+		<td>$(gettext "Available")</td>
+		<td>$(gettext "Used")</td>
+		<td>$(gettext "Mount point")</td>
+	</tr>
+</thead>
+EOT
+}
diff -r 29a4a55db6e3 -r ed55f0e369b3 styles/default/images/harddisk.png
Binary file styles/default/images/harddisk.png has changed
diff -r 29a4a55db6e3 -r ed55f0e369b3 styles/default/style.css
--- a/styles/default/style.css	Mon Apr 18 03:44:20 2011 +0200
+++ b/styles/default/style.css	Mon Apr 18 04:48:51 2011 +0200
@@ -183,6 +183,9 @@
 td.small { min-width: 60px; }
 td.pkg { max-width: 160px; }
 td.desc { max-width: 300px; }
+td.pct { min-width: 200px; background: #eee; }
+div.pct { background: #ccc; }
+td.pct, div.pct { border-radius: 2px; }
 
 #thead, .thead, thead {
 	height: 10px;
@@ -198,8 +201,9 @@
 span.activity-log { color: #888; font-size: 95%; }
 span.diff-rm { color: red; }
 span.diff-add { color: green; }
-span.diff-at { color: blue; }
+span.diff-at { color: blue;  }
 span.top { color: #00c800; font-weight: bold; font-size: 95%; }
+
 /* Misc */
 
 pre, .pre-main {