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

thomascube

2009-05-29 991a25ab5df66752d8bdb460d1b622b9f52358b1

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

 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')

 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'));


 skins/default/images/icons/delete.png

 skins/default/images/icons/trash.png

Binary files differ

 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>


 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>