- Fixed quota img height/width setting from template (#1484857)

release-0.6
alecpl 16 years ago
parent 85a9130647
commit 6cd00992a2

@ -6,6 +6,7 @@ CHANGELOG RoundCube Webmail
- Added vertical splitter for folders list resizing - Added vertical splitter for folders list resizing
- Added possibility to view all headers in message view - Added possibility to view all headers in message view
- Fixed splitter drag/resize on Opera (#1485170) - Fixed splitter drag/resize on Opera (#1485170)
- Fixed quota img height/width setting from template (#1484857)
2008/09/12 (thomasb) 2008/09/12 (thomasb)
---------- ----------

@ -159,7 +159,7 @@ function genQuota($used, $total, $width, $height)
} }
$quota_width = $quota / 100 * $width; $quota_width = $quota / 100 * $width;
imagefilledrectangle($im, $border, 0, $quota, $height-2*$border, $fill); imagefilledrectangle($im, $border, 0, $quota_width, $height-2*$border, $fill);
$string = $quota . '%'; $string = $quota . '%';
$mid = floor(($width-(strlen($string)*imagefontwidth($font)))/2)+1; $mid = floor(($width-(strlen($string)*imagefontwidth($font)))/2)+1;

@ -446,7 +446,7 @@ function rcmail_quota_display($attrib)
$attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'display')); $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'display'));
$out = '<span' . $attrib_str . '>'; $out = '<span' . $attrib_str . '>';
$out .= rcmail_quota_content(); $out .= rcmail_quota_content(NULL, $attrib);
$out .= '</span>'; $out .= '</span>';
return $out; return $out;
} }
@ -455,7 +455,7 @@ function rcmail_quota_display($attrib)
/** /**
* *
*/ */
function rcmail_quota_content($quota=NULL) function rcmail_quota_content($quota=NULL, $attrib=NULL)
{ {
global $IMAP, $COMM_PATH, $RCMAIL; global $IMAP, $COMM_PATH, $RCMAIL;
@ -481,14 +481,23 @@ function rcmail_quota_content($quota=NULL)
// show quota as image (by Brett Patterson) // show quota as image (by Brett Patterson)
if ($display == 'image' && function_exists('imagegif')) if ($display == 'image' && function_exists('imagegif'))
{ {
$attrib = array('width' => 100, 'height' => 14); if (!$attrib['width'])
$attrib['width'] = isset($_SESSION['quota_width']) ? $_SESSION['quota_width'] : 100;
else
$_SESSION['quota_width'] = $attrib['width'];
if (!$attrib['height'])
$attrib['height'] = isset($_SESSION['quota_height']) ? $_SESSION['quota_height'] : 14;
else
$_SESSION['quota_height'] = $attrib['height'];
$quota_text = sprintf('<img src="./bin/quotaimg.php?u=%s&amp;q=%d&amp;w=%d&amp;h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />', $quota_text = sprintf('<img src="./bin/quotaimg.php?u=%s&amp;q=%d&amp;w=%d&amp;h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />',
$quota['used'], $quota['total'], $quota['used'], $quota['total'],
$attrib['width'], $attrib['height'], $attrib['width'], $attrib['height'],
$attrib['width'], $attrib['height'], $attrib['width'], $attrib['height'],
$quota_text, $quota_text,
show_bytes($quota["used"] * 1024), show_bytes($quota['used'] * 1024),
show_bytes($quota["total"] * 1024)); show_bytes($quota['total'] * 1024));
} }
} }
else else

@ -109,7 +109,7 @@ body_keypress: function(evt, p)
<roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />&nbsp; <roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />&nbsp;
<roundcube:button command="select-none" label="none" classAct="active" /> &nbsp;&nbsp;&nbsp; <roundcube:button command="select-none" label="none" classAct="active" /> &nbsp;&nbsp;&nbsp;
<roundcube:if condition="env:quota" /> <roundcube:if condition="env:quota" />
<roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="120" id="quotadisplay" /> <roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" />
<roundcube:endif /> <roundcube:endif />
</div> </div>

Loading…
Cancel
Save