diff options
| -rw-r--r-- | program/steps/mail/attachments.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 6 | ||||
| -rw-r--r-- | skins/default/images/icons/delete.png (renamed from skins/default/images/icons/remove-attachment.png) | bin | 787 -> 787 bytes | |||
| -rw-r--r-- | skins/default/images/icons/trash.png | bin | 775 -> 0 bytes | |||
| -rw-r--r-- | skins/default/templates/compose.html | 2 | ||||
| -rw-r--r-- | skins/default/templates/managefolders.html | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc index 81ac2fe5c..7cd089e04 100644 --- a/program/steps/mail/attachments.inc +++ b/program/steps/mail/attachments.inc @@ -91,7 +91,7 @@ if (is_array($_FILES['_attachments']['tmp_name'])) { 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 8d43de050..f753b35dd 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -716,11 +716,13 @@ function rcmail_compose_attachment_list($attrib) 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 Binary files differindex 8d496fe10..8d496fe10 100644 --- a/skins/default/images/icons/remove-attachment.png +++ b/skins/default/images/icons/delete.png diff --git a/skins/default/images/icons/trash.png b/skins/default/images/icons/trash.png Binary files differdeleted file mode 100644 index 0712aaa71..000000000 --- a/skins/default/images/icons/trash.png +++ /dev/null diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html index d5abd47cc..3225b2895 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 b886cf6fc..80f5df279 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> |
