From 884e17b3a7678bbd2ade7cf801c2bcb41406e488 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Tue, 21 Jun 2011 22:38:20 +0000
Subject: [PATCH] add download option, require busybox 1.18.3-1

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@188 2a923420-c742-0410-a762-8d5b09965624
---
 var/mongoose/cgi-bin/browse.jim    | 12 ++++++++++--
 var/mongoose/cgi-bin/status.jim    |  5 ++---
 var/mongoose/include/diskspace.jim |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/var/mongoose/cgi-bin/browse.jim b/var/mongoose/cgi-bin/browse.jim
index c6da53b..c12a753 100755
--- a/var/mongoose/cgi-bin/browse.jim
+++ b/var/mongoose/cgi-bin/browse.jim
@@ -185,6 +185,7 @@ puts {
 	<li><a href=#lock>Toggle Lock</a></li>
 	<li><a href=#rename>Rename</a></li>
 	<li><a href=#title>Change Title</a></li>
+	<li><a href=#download>Download</a></li>
 </ul>
 
 <div id=dialogue></div>
@@ -226,6 +227,10 @@ function (action, el, pos)
 		confirm_action('change the lock on', lock_callback, ts, did);
 		break;
 
+	    case 'download':
+		window.location.href = ts;
+		break;
+
 	    default:
 		alert('Unhandled action: ' + action);
 		break;
@@ -292,8 +297,11 @@ function (action, el, pos)
 		height: 600, width: 700,
 		show: 'scale', hide: 'fade',
 		draggable: true, resizable: true,
-		buttons: { "Close":
-		    function() {$(this).dialog('close');}},
+		buttons: {
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
 		close: function(e,u) { $('#dialogue').empty().html(
 		    '<img src="/img/loading.gif" alt="loading">'); }
 	});
diff --git a/var/mongoose/cgi-bin/status.jim b/var/mongoose/cgi-bin/status.jim
index 94e35f8..50c5b87 100755
--- a/var/mongoose/cgi-bin/status.jim
+++ b/var/mongoose/cgi-bin/status.jim
@@ -43,9 +43,8 @@ foreach line $lines {
 
 	incr seen($name)
 
-	lappend output "<img style=\"vertical-align: middle\"
-	    src=/images/$icon><span
-	    style=\"vertical-align: middle\">$mode&nbsp;$name</span>"
+	lappend output "<img class=va src=/images/$icon><span class=va>
+	    $mode&nbsp;$name</span><br>"
 }
 
 if {[llength $output]} {
diff --git a/var/mongoose/include/diskspace.jim b/var/mongoose/include/diskspace.jim
index 131e2b0..1154300 100755
--- a/var/mongoose/include/diskspace.jim
+++ b/var/mongoose/include/diskspace.jim
@@ -5,7 +5,7 @@ if {[os.gethostname] eq "hosting"} {
 	set used "100GB"
 	set perc "10"
 } else {
-	foreach df [split [exec df -h] "\n\r"] {
+	foreach df [split [exec df -h 2>>/dev/null] "\n\r"] {
 		if [string match *sd*2* $df] {
 			regsub -all -- {[[:space:]]+} $df " " df
 			set fields [split $df]