Better icon for deleting folders + remove hard-coded icon path

release-0.6
thomascube 16 years ago
parent bb7509c607
commit 991a25ab5d

@ -91,7 +91,7 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
unset($attachment['status']); unset($attachment['status']);
$_SESSION['compose']['attachments'][$id] = $attachment; $_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( $button = html::img(array(
'src' => $icon, 'src' => $icon,
'alt' => rcube_label('delete') 'alt' => rcube_label('delete')

@ -716,11 +716,13 @@ function rcmail_compose_attachment_list($attrib)
if (is_array($_SESSION['compose']['attachments'])) if (is_array($_SESSION['compose']['attachments']))
{ {
if ($attrib['deleteicon']) if ($attrib['deleteicon']) {
$button = html::img(array( $button = html::img(array(
'src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
'alt' => rcube_label('delete') 'alt' => rcube_label('delete')
)); ));
$_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
}
else else
$button = Q(rcube_label('delete')); $button = Q(rcube_label('delete'));

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 787 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 775 B

@ -93,7 +93,7 @@
<div id="compose-attachments"> <div id="compose-attachments">
<div id="attachment-title"><roundcube:label name="attachments" /></div> <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> <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> </div>

@ -16,7 +16,7 @@
<div id="folder-manager"> <div id="folder-manager">
<roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" <roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table"
cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-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" /> renameIcon="/images/icons/rename.png" />
</div> </div>

Loading…
Cancel
Save