From 11320e628e0fe4eab600afb665d34395de7a91d5 Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Mon, 4 Feb 2008 11:24:23 +0000
Subject: [PATCH] Merged in from DEV trunk...

---
 plugins/housekeeper/DiskUsageDashlet.inc.php   | 5 +----
 plugins/housekeeper/templates/DiskUsage.smarty | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/housekeeper/DiskUsageDashlet.inc.php b/plugins/housekeeper/DiskUsageDashlet.inc.php
index fb629f7..3ae4f6c 100644
--- a/plugins/housekeeper/DiskUsageDashlet.inc.php
+++ b/plugins/housekeeper/DiskUsageDashlet.inc.php
@@ -108,6 +108,7 @@ class DiskUsageDashlet extends KTBaseDashlet
 
 				if ($size === 0) continue;
 
+				$colour = '';
 				if ($usedp >= 100 - $this->urgentPercent)
 				{
 					$colour = 'red';
@@ -116,10 +117,6 @@ class DiskUsageDashlet extends KTBaseDashlet
 				{
 					$colour = 'orange';
 				}
-                elseif ( $usedp < 100 - $this->warningPercent)
-                {
-                    $colour = 'none';
-                }
 
 				$usage[] = array(
 						'filesystem'=>$filesystem,
diff --git a/plugins/housekeeper/templates/DiskUsage.smarty b/plugins/housekeeper/templates/DiskUsage.smarty
index cd28575..41a1d30 100644
--- a/plugins/housekeeper/templates/DiskUsage.smarty
+++ b/plugins/housekeeper/templates/DiskUsage.smarty
@@ -12,13 +12,16 @@
 {assign var=red value=0}
 {section name=usage loop=$usages}
 
+{assign var=colorstr value=""}
 {if $usages[usage].colour == 'orange'}
     {assign var=orange value=1}
+    {assign var=colorstr value="bgcolor='orange'"}
 {/if}
 {if $usages[usage].colour == 'red'}
     {assign var=red value=1}
+    {assign var=colorstr value="bgcolor='red'"}
 {/if}
-    <tr bgcolor="{$usages[usage].colour}">
+    <tr {$colorstr}>
         <td>{$usages[usage].mounted}</td>
 		<td align=right>{$usages[usage].size}&nbsp;&nbsp;</td>
 		<td align=right>{$usages[usage].used}&nbsp;&nbsp;</td>
--
libgit2 0.21.4