From 3cbdd88110a6b9f2147d29f557acc53cb7eb5405 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 15 Dec 2009 00:32:31 -0700 Subject: [PATCH] Appledouble viewer improvements --- imp/config/mime_drivers.php.dist | 3 +++ imp/lib/Mime/Viewer/Appledouble.php | 8 +++----- imp/themes/graphics/{ => mime}/apple.png | Bin imp/themes/silver/graphics/mime/apple.png | Bin 0 -> 157 bytes imp/themes/tango-blue/graphics/mime/apple.png | Bin 0 -> 157 bytes 5 files changed, 6 insertions(+), 5 deletions(-) rename imp/themes/graphics/{ => mime}/apple.png (100%) create mode 100644 imp/themes/silver/graphics/mime/apple.png create mode 100644 imp/themes/tango-blue/graphics/mime/apple.png diff --git a/imp/config/mime_drivers.php.dist b/imp/config/mime_drivers.php.dist index e6b05132f..64a225f2d 100644 --- a/imp/config/mime_drivers.php.dist +++ b/imp/config/mime_drivers.php.dist @@ -220,6 +220,9 @@ $mime_drivers['imp']['appledouble'] = array( 'inline' => true, 'handles' => array( 'multipart/appledouble' + ), + 'icons' => array( + 'default' => 'apple.png' ) ); diff --git a/imp/lib/Mime/Viewer/Appledouble.php b/imp/lib/Mime/Viewer/Appledouble.php index c81676f31..18e60f69b 100644 --- a/imp/lib/Mime/Viewer/Appledouble.php +++ b/imp/lib/Mime/Viewer/Appledouble.php @@ -78,7 +78,7 @@ class IMP_Horde_Mime_Viewer_Appledouble extends Horde_Mime_Viewer_Driver } $status = array( - 'icon' => Horde::img('apple.png', _("Macintosh File")), + 'icon' => Horde::img('mime/apple.png', _("Macintosh File")), 'text' => array( sprintf(_("This message contains a Macintosh file (named \"%s\")."), $data_name), sprintf(_("The Macintosh resource fork can be downloaded %s."), $this->_params['contents']->linkViewJS($applefile_part, 'download_attach', _("HERE"), array('jstext' => _("The Macintosh resource fork")))) @@ -89,9 +89,6 @@ class IMP_Horde_Mime_Viewer_Appledouble extends Horde_Mime_Viewer_Driver $ret = array(); if ($inline && (($disp = $this->_params['contents']->canDisplay($data_part, IMP_Contents::RENDER_INLINE | IMP_Contents::RENDER_INFO)))) { $ret = $this->_params['contents']->renderMIMEPart($data_id, $disp, array('params' => $this->_params)); - $status['text'][] = _("The contents of the Macintosh file are below."); - } else { - $status['text'][] = sprintf(_("The contents of the Macintosh file can be downloaded %s."), $this->_params['contents']->linkViewJS($data_part, 'download_attach', _("HERE"), array('jstext' => _("The Macintosh file")))); } foreach ($parts_list as $val) { @@ -100,7 +97,8 @@ class IMP_Horde_Mime_Viewer_Appledouble extends Horde_Mime_Viewer_Driver ? array( 'data' => '', 'status' => array($status), - 'type' => 'text/html; charset=' . Horde_Nls::getCharset() + 'type' => 'text/html; charset=' . Horde_Nls::getCharset(), + 'wrap' => 'mimePartWrap' ) : null; } diff --git a/imp/themes/graphics/apple.png b/imp/themes/graphics/mime/apple.png similarity index 100% rename from imp/themes/graphics/apple.png rename to imp/themes/graphics/mime/apple.png diff --git a/imp/themes/silver/graphics/mime/apple.png b/imp/themes/silver/graphics/mime/apple.png new file mode 100644 index 0000000000000000000000000000000000000000..6fe4f121cf12239484166e3fc3308a29b2b53eef GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp@KrFz)3?zTmvT_3{(Ey(i*8&EHI}8ke8D=o-V)&cN z@b@oJ;*QaT+!sKau_VYZn8D%MjWi&~%+tj&q~ccY32rV11rC>kx~qT7TW0-j`IgWs z_}|6I>3sY< literal 0 HcmV?d00001 diff --git a/imp/themes/tango-blue/graphics/mime/apple.png b/imp/themes/tango-blue/graphics/mime/apple.png new file mode 100644 index 0000000000000000000000000000000000000000..6fe4f121cf12239484166e3fc3308a29b2b53eef GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp@KrFz)3?zTmvT_3{(Ey(i*8&EHI}8ke8D=o-V)&cN z@b@oJ;*QaT+!sKau_VYZn8D%MjWi&~%+tj&q~ccY32rV11rC>kx~qT7TW0-j`IgWs z_}|6I>3sY< literal 0 HcmV?d00001 -- 2.11.0