Changeset 2137 in subversion

Timestamp:

Dec 9, 2008 8:48:42 AM (4 years ago)

Author:

alec

Message:

#1485544: quota image better look

Location:

trunk/roundcubemail

Files:

• bin/quotaimg.php (modified) (7 diffs)
• skins/default/mail.css (modified) (1 diff)

trunk/roundcubemail/bin/quotaimg.php

@@ -71 +71 @@
         $padding = 0;
 
-        $limit['high'] = 70;
-        $limit['mid']  = 45;
+        $limit['high'] = 80;
+        $limit['mid']  = 55;
         $limit['low']  = 0;
 
         // Fill Colors
-        $color['fill']['high'] = '215, 13, 13';   // Near quota fill color
-        $color['fill']['mid']  = '126, 192, 238'; // Mid-area of quota fill color
-        $color['fill']['low']  = '147, 225, 100'; // Far from quota fill color
+        $color['fill']['high'] = '243, 49, 49';   // Near quota fill color
+        $color['fill']['mid']  = '245, 173, 60'; // Mid-area of quota fill color
+        $color['fill']['low']  = '145, 225, 100'; // Far from quota fill color
 
         // Background colors
@@ -87 +87 @@
         // Misc. Colors
         $color['border'] = '0, 0, 0';
-        $color['text']   = '102, 102, 102';
+        $color['text']['high'] = '255, 255, 255';  // white text for red background
+        $color['text']['mid'] = '102, 102, 102';
+        $color['text']['low'] = '102, 102, 102';
+        $color['text']['normal'] = '102, 102, 102';
 
 
@@ -94 +97 @@
          ***********************************/
 
-    // @todo: Set to "??" instead?
+        // @todo: Set to "??" instead?
         if (ereg("^[^0-9?]*$", $used) || ereg("^[^0-9?]*$", $total)) {
                 return false; 
@@ -116 +119 @@
         }
                 
-        list($r, $g, $b) = explode(',', $color['text']);
-        $text = imagecolorallocate($im, $r, $g, $b);
-
         if ($unknown) {
+                list($r, $g, $b) = explode(',', $color['text']['normal']);
+                $text = imagecolorallocate($im, $r, $g, $b);
                 list($r, $g, $b) = explode(',', $color['bg']['Unknown']);
                 $background = imagecolorallocate($im, $r, $g, $b);
+
                 imagefilledrectangle($im, 0, 0, $width, $height, $background);
 
@@ -128 +131 @@
                 imagestring($im, $font, $mid, $padding, $string, $text);
         } else if ($used > $total) {
+                list($r, $g, $b) = explode(',', $color['text']['normal']);
+                $text = imagecolorallocate($im, $r, $g, $b);
                 list($r, $g, $b) = explode(',', $color['bg']['OL']);
-        
                 $background = imagecolorallocate($im, $r, $g, $b);
         
@@ -139 +143 @@
         } else {
                 list($r, $g, $b) = explode(',', $color['bg']['quota']);
-        
                 $background = imagecolorallocate($im, $r, $b, $g);
         
@@ -147 +150 @@
 
                 if ($quota >= $limit['high']) {
+                        list($r, $g, $b) = explode(',', $color['text']['high']);
+                        $text = imagecolorallocate($im, $r, $g, $b);
                         list($r, $g, $b) = explode(',', $color['fill']['high']);
                         $fill = imagecolorallocate($im, $r, $g, $b);
                 } elseif($quota >= $limit['mid']) {
+                        list($r, $g, $b) = explode(',', $color['text']['mid']);
+                        $text = imagecolorallocate($im, $r, $g, $b);
                         list($r, $g, $b) = explode(',', $color['fill']['mid']);
                         $fill = imagecolorallocate($im, $r, $g, $b);
                 } else {
                         // if($quota >= $limit['low'])
+                        list($r, $g, $b) = explode(',', $color['text']['low']);
+                        $text = imagecolorallocate($im, $r, $g, $b);
                         list($r, $g, $b) = explode(',', $color['fill']['low']);
                         $fill = imagecolorallocate($im, $r, $g, $b);

trunk/roundcubemail/skins/default/mail.css

@@ -651 +651 @@
   vertical-align: middle;
   margin-left: 4px;
-  border: 1px solid #666666;
+  border: 1px solid #999;
 }