tazpanel rev 153
hardware.cgi and index.cgi better output of df and prepare for disk management
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Mon Apr 18 04:48:51 2011 +0200 (2011-04-18) |
parents | 29a4a55db6e3 |
children | 4911d9797833 |
files | hardware.cgi index.cgi lib/libtazpanel styles/default/images/harddisk.png styles/default/style.css |
line diff
1.1 --- a/hardware.cgi Mon Apr 18 03:44:20 2011 +0200 1.2 +++ b/hardware.cgi Mon Apr 18 04:48:51 2011 +0200 1.3 @@ -111,9 +111,25 @@ 1.4 EOT 1.5 fdisk -l | fgrep Disk 1.6 echo '</pre>' 1.7 - echo '<pre>' 1.8 - df -h | grep ^/dev 1.9 - echo '</pre>' 1.10 + # 1.11 + # Disk stats and management (mount, umount, heck) 1.12 + # 1.13 + table_start 1.14 + df_thead 1.15 + df -h | grep ^/dev | while read fs size used av pct mp 1.16 + do 1.17 + cat << EOT 1.18 +<tr> 1.19 + <td><img src="$IMAGES/harddisk.png" />$fs</td> 1.20 + <td>$size</td> 1.21 + <td>$av</td> 1.22 + <td class="pct"><div class="pct" 1.23 + style="width: $pct;">$used - $pct</div></td> 1.24 + <td>$mp</td> 1.25 +</tr> 1.26 +EOT 1.27 + done 1.28 + table_end 1.29 echo "<h3>$(gettext "System memory")</h3>" 1.30 echo '<pre>' 1.31 free -m | sed \
2.1 --- a/index.cgi Mon Apr 18 03:44:20 2011 +0200 2.2 +++ b/index.cgi Mon Apr 18 04:48:51 2011 +0200 2.3 @@ -142,13 +142,27 @@ 2.4 2.5 <h4>`gettext "Network status"`</h4> 2.6 `list_network_interfaces` 2.7 - 2.8 -<h4>`gettext "Filesystem usage statistics"`</h4> 2.9 -<pre> 2.10 -`df -h | grep ^/dev` 2.11 -</pre> 2.12 - 2.13 -<h3>`gettext "Panel Activity"`</h3> 2.14 +EOT 2.15 + # Disk stats (management is done is hardwar.cgi) 2.16 + table_start 2.17 + df_thead 2.18 + df -h | grep ^/dev | while read fs size used av pct mp 2.19 + do 2.20 + cat << EOT 2.21 +<tr> 2.22 + <td><a href="hardware.cgi"> 2.23 + <img src="$IMAGES/harddisk.png" />$fs</a></td> 2.24 + <td>$size</td> 2.25 + <td>$av</td> 2.26 + <td class="pct"><div class="pct" 2.27 + style="width: $pct;">$used - $pct</div></td> 2.28 + <td>$mp</td> 2.29 +</tr> 2.30 +EOT 2.31 + done 2.32 + table_end 2.33 + cat << EOT 2.34 +<h3>$(gettext "Panel Activity")</h3> 2.35 <pre id="panel-activity"> 2.36 $(cat $LOG_FILE | tail -n 8 | sort -r | syntax_highlighter activity) 2.37 </pre>
3.1 --- a/lib/libtazpanel Mon Apr 18 03:44:20 2011 +0200 3.2 +++ b/lib/libtazpanel Mon Apr 18 04:48:51 2011 +0200 3.3 @@ -164,3 +164,17 @@ 3.4 EOT 3.5 3.6 } 3.7 + 3.8 +df_thead() { 3.9 + cat << EOT 3.10 +<thead> 3.11 + <tr> 3.12 + <td>$(gettext "Filesystem")</td> 3.13 + <td>$(gettext "Size")</td> 3.14 + <td>$(gettext "Available")</td> 3.15 + <td>$(gettext "Used")</td> 3.16 + <td>$(gettext "Mount point")</td> 3.17 + </tr> 3.18 +</thead> 3.19 +EOT 3.20 +}
4.1 Binary file styles/default/images/harddisk.png has changed
5.1 --- a/styles/default/style.css Mon Apr 18 03:44:20 2011 +0200 5.2 +++ b/styles/default/style.css Mon Apr 18 04:48:51 2011 +0200 5.3 @@ -183,6 +183,9 @@ 5.4 td.small { min-width: 60px; } 5.5 td.pkg { max-width: 160px; } 5.6 td.desc { max-width: 300px; } 5.7 +td.pct { min-width: 200px; background: #eee; } 5.8 +div.pct { background: #ccc; } 5.9 +td.pct, div.pct { border-radius: 2px; } 5.10 5.11 #thead, .thead, thead { 5.12 height: 10px; 5.13 @@ -198,8 +201,9 @@ 5.14 span.activity-log { color: #888; font-size: 95%; } 5.15 span.diff-rm { color: red; } 5.16 span.diff-add { color: green; } 5.17 -span.diff-at { color: blue; } 5.18 +span.diff-at { color: blue; } 5.19 span.top { color: #00c800; font-weight: bold; font-size: 95%; } 5.20 + 5.21 /* Misc */ 5.22 5.23 pre, .pre-main {