diff options
| author | alecpl <alec@alec.pl> | 2009-06-15 18:43:20 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-06-15 18:43:20 +0000 |
| commit | 21d6827c700b2d016d12aa9c39f90e1a700f021b (patch) | |
| tree | 01e0ef178be7b907a61329fb650d35c9cffbf33b | |
| parent | 3a2b270c9d1f531c2e2d1c422a4756afd639ef47 (diff) | |
- fix delete icon on attachment list (#1485921)
| -rw-r--r-- | program/steps/mail/compose.inc | 4 | ||||
| -rw-r--r-- | skins/default/templates/compose.html | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index fbd0cc44d..3c82c8e03 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -725,7 +725,6 @@ function rcmail_compose_attachment_list($attrib) 'src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'alt' => rcube_label('delete') )); - $_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon']; } else $button = Q(rcube_label('delete')); @@ -744,6 +743,9 @@ function rcmail_compose_attachment_list($attrib) } } + if ($attrib['deleteicon']) + $_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon']; + $OUTPUT->add_gui_object('attachmentlist', $attrib['id']); return html::tag('ul', $attrib, $out, html::$common_attrib); diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html index 3225b2895..0e122edeb 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/delete.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> |