From d20e965c48565fecff9562155951cd89c0c8a4e3 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 17 Nov 2012 11:01:37 -0500
Subject: [PATCH] Improve thumbnail display: center images and display a 'show' link for attachments the browser is capable to display them
---
program/steps/mail/func.inc | 4 +++-
program/localization/en_US/labels.inc | 1 +
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 4dbe9f9..44a5a3d 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -63,6 +63,7 @@
$labels['move'] = 'Move';
$labels['moveto'] = 'Move to...';
$labels['download'] = 'Download';
+$labels['showattachment'] = 'Show';
$labels['filename'] = 'File name';
$labels['filesize'] = 'File size';
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index df83b03..dc97d1f 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1189,6 +1189,7 @@
// list images after mail body
if ($RCMAIL->config->get('inline_images', true) && !empty($MESSAGE->attachments)) {
$thumbnail_size = $RCMAIL->config->get('image_thumbnail_size', 240);
+ $client_mimetypes = (array)$RCMAIL->config->get('client_mimetypes');
foreach ($MESSAGE->attachments as $attach_prop) {
// skip inline images
@@ -1209,7 +1210,7 @@
rcmail_fix_mimetype($attach_prop->mimetype))
);
$out .= html::p('image-attachment',
- html::a($show_link + array('class' => 'image-link'),
+ html::a($show_link + array('class' => 'image-link', 'style' => sprintf('width:%dpx', $thumbnail_size)),
html::img(array(
'class' => 'image-thumbnail',
'src' => $MESSAGE->get_part_url($attach_prop->mime_id, true) . '&_thumb=1',
@@ -1221,6 +1222,7 @@
html::span('image-filename', Q($attach_prop->filename)) .
html::span('image-filesize', Q($RCMAIL->show_bytes($attach_prop->size))) .
html::span('attachment-links',
+ (in_array($attach_prop->mimetype, $client_mimetypes) ? html::a($show_link['href'], rcube_label('showattachment')) . ' ' : '') .
html::a($show_link['href'] . '&_download=1', rcube_label('download'))
) .
html::br(array('style' => 'clear:both'))
--
Gitblit v1.9.1