Commit 11320e628e0fe4eab600afb665d34395de7a91d5

Authored by kevin_fourie
1 parent 33ca257d

Merged in from DEV trunk...

KTS-2884
"Storage Utilization dashlet rendering on IE 7 is broken: a black box covers the text."
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8008 c91229c3-7414-0410-bfa2-8a42b809f60b
plugins/housekeeper/DiskUsageDashlet.inc.php
... ... @@ -108,6 +108,7 @@ class DiskUsageDashlet extends KTBaseDashlet
108 108  
109 109 if ($size === 0) continue;
110 110  
  111 + $colour = '';
111 112 if ($usedp >= 100 - $this->urgentPercent)
112 113 {
113 114 $colour = 'red';
... ... @@ -116,10 +117,6 @@ class DiskUsageDashlet extends KTBaseDashlet
116 117 {
117 118 $colour = 'orange';
118 119 }
119   - elseif ( $usedp < 100 - $this->warningPercent)
120   - {
121   - $colour = 'none';
122   - }
123 120  
124 121 $usage[] = array(
125 122 'filesystem'=>$filesystem,
... ...
plugins/housekeeper/templates/DiskUsage.smarty
... ... @@ -12,13 +12,16 @@
12 12 {assign var=red value=0}
13 13 {section name=usage loop=$usages}
14 14  
  15 +{assign var=colorstr value=""}
15 16 {if $usages[usage].colour == 'orange'}
16 17 {assign var=orange value=1}
  18 + {assign var=colorstr value="bgcolor='orange'"}
17 19 {/if}
18 20 {if $usages[usage].colour == 'red'}
19 21 {assign var=red value=1}
  22 + {assign var=colorstr value="bgcolor='red'"}
20 23 {/if}
21   - <tr bgcolor="{$usages[usage].colour}">
  24 + <tr {$colorstr}>
22 25 <td>{$usages[usage].mounted}</td>
23 26 <td align=right>{$usages[usage].size}&nbsp;&nbsp;</td>
24 27 <td align=right>{$usages[usage].used}&nbsp;&nbsp;</td>
... ...