From 1116a3f05010b2ea0ae74a36e5c19814ba66cca2 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Sat, 18 Oct 2014 21:43:02 +0000
Subject: [PATCH] diskspace tweaks

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@2056 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                   | 2 +-
 webif/html/css/style.css          | 6 ++++--
 webif/html/diskspace/diskspace.js | 1 +
 webif/lib/system.class            | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index e9282c48..12b81355 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.17-5
+Version: 1.0.17-6
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.13),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.0.13),hmt(>=1.1.21),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),mongoose
diff --git a/webif/html/css/style.css b/webif/html/css/style.css
index 29fa0afc..1f22726d 100644
--- a/webif/html/css/style.css
+++ b/webif/html/css/style.css
@@ -504,6 +504,8 @@ span.foldernum
 {
 	float: right;
 	padding-top: 1.2em;
+	position: relative;
+	right: -10px;
 }
 
 #tbdiskpie
@@ -511,7 +513,8 @@ span.foldernum
 	float: right;
 	width: 150px;
 	height: 150px;
-	margin-left: 10px;
+	position: relative;
+	right: -10px;
 }
 
 .tbdiskpie
@@ -519,4 +522,3 @@ span.foldernum
 	top: -10px !important;
 }
 
-
diff --git a/webif/html/diskspace/diskspace.js b/webif/html/diskspace/diskspace.js
index 2eeed16c..0248dfdb 100644
--- a/webif/html/diskspace/diskspace.js
+++ b/webif/html/diskspace/diskspace.js
@@ -17,6 +17,7 @@ $('#tbdiskpie')
 		}
 	    }
         },
+	// Blue #7cb5ec, Green #90ed7d
 	colors:
 	  Highcharts.map(['#7cb5ec', '#e4d354', '#cccccc'], function(color) {
 		return {
diff --git a/webif/lib/system.class b/webif/lib/system.class
index 2310171e..7f1c8226 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -211,7 +211,7 @@ proc {system diskspace} {{raw 0}} {
 		HD { set tsrdir "/media/drive1/.tsr" }
 	}
 
-	if {[file isdirectory $tsrdir]} {
+	if {[file exists "$tsrdir/0.ts"]} {
 		set tsrbuf 21474836480
 		lassign [exec du -ks $tsrdir] tsrused
 		set tsrused $($tsrused * 1024)