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} -