From 991a25ab5df66752d8bdb460d1b622b9f52358b1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 29 May 2009 05:37:32 -0400
Subject: [PATCH] Better icon for deleting folders + remove hard-coded icon path
---
/dev/null | 0
skins/default/images/icons/delete.png | 0
program/steps/mail/attachments.inc | 2 +-
program/steps/mail/compose.inc | 6 ++++--
skins/default/templates/managefolders.html | 2 +-
skins/default/templates/compose.html | 2 +-
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 81ac2fe..7cd089e 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -91,7 +91,7 @@
unset($attachment['status']);
$_SESSION['compose']['attachments'][$id] = $attachment;
- if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) {
+ if (($icon = $_SESSION['compose']['deleteicon']) && is_file($icon)) {
$button = html::img(array(
'src' => $icon,
'alt' => rcube_label('delete')
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 8d43de0..f753b35 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -716,11 +716,13 @@
if (is_array($_SESSION['compose']['attachments']))
{
- if ($attrib['deleteicon'])
+ if ($attrib['deleteicon']) {
$button = html::img(array(
'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
'alt' => rcube_label('delete')
- ));
+ ));
+ $_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
+ }
else
$button = Q(rcube_label('delete'));
diff --git a/skins/default/images/icons/remove-attachment.png b/skins/default/images/icons/delete.png
similarity index 100%
rename from skins/default/images/icons/remove-attachment.png
rename to skins/default/images/icons/delete.png
Binary files differ
diff --git a/skins/default/images/icons/trash.png b/skins/default/images/icons/trash.png
deleted file mode 100644
index 0712aaa..0000000
--- a/skins/default/images/icons/trash.png
+++ /dev/null
Binary files differ
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index d5abd47..3225b28 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -93,7 +93,7 @@
<div id="compose-attachments">
<div id="attachment-title"><roundcube:label name="attachments" /></div>
-<roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/remove-attachment.png"/ >
+<roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png"/ >
<p><roundcube:button command="add-attachment" imagePas="/images/buttons/add_pas.png" imageSel="/images/buttons/add_sel.png" imageAct="/images/buttons/add_act.png" width="23" height="18" title="addattachment" /></p>
</div>
diff --git a/skins/default/templates/managefolders.html b/skins/default/templates/managefolders.html
index b886cf6..80f5df2 100644
--- a/skins/default/templates/managefolders.html
+++ b/skins/default/templates/managefolders.html
@@ -16,7 +16,7 @@
<div id="folder-manager">
<roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table"
- deleteIcon="/images/icons/trash.png"
+ deleteIcon="/images/icons/delete.png"
renameIcon="/images/icons/rename.png" />
</div>
--
Gitblit v1.9.1