Changeset 2567 in subversion


Ignore:
Timestamp:
May 29, 2009 5:37:32 AM (4 years ago)
Author:
thomasb
Message:

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

Location:
trunk/roundcubemail
Files:
1 deleted
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/program/steps/mail/attachments.inc

    r2431 r2567  
    9292      $_SESSION['compose']['attachments'][$id] = $attachment; 
    9393       
    94       if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) { 
     94      if (($icon = $_SESSION['compose']['deleteicon']) && is_file($icon)) { 
    9595        $button = html::img(array( 
    9696          'src' => $icon, 

  • trunk/roundcubemail/program/steps/mail/compose.inc

    r2556 r2567  
    717717  if (is_array($_SESSION['compose']['attachments'])) 
    718718  { 
    719     if ($attrib['deleteicon']) 
     719    if ($attrib['deleteicon']) { 
    720720      $button = html::img(array( 
    721721        'src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 
    722722        'alt' => rcube_label('delete') 
    723         )); 
     723      )); 
     724      $_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon']; 
     725    } 
    724726    else 
    725727      $button = Q(rcube_label('delete')); 

  • trunk/roundcubemail/skins/default/templates/compose.html

    r2541 r2567  
    9494<div id="compose-attachments"> 
    9595<div id="attachment-title"><roundcube:label name="attachments" /></div> 
    96 <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/remove-attachment.png"/ > 
     96<roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png"/ > 
    9797<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> 
    9898</div> 

  • trunk/roundcubemail/skins/default/templates/managefolders.html

    r2560 r2567  
    1717<roundcube:object name="foldersubscription" form="subscriptionform" id="subscription-table" 
    1818  cellpadding="1" cellspacing="0" summary="Folder subscription table" class="records-table" 
    19   deleteIcon="/images/icons/trash.png" 
     19  deleteIcon="/images/icons/delete.png" 
    2020  renameIcon="/images/icons/rename.png" /> 
    2121</div> 
Note: See TracChangeset for help on using the changeset viewer.