From 21d6827c700b2d016d12aa9c39f90e1a700f021b Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Mon, 15 Jun 2009 14:43:20 -0400 Subject: [PATCH] - fix delete icon on attachment list (#1485921) --- program/steps/mail/compose.inc | 4 +++- 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 fbd0cc4..3c82c8e 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -725,7 +725,6 @@ '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 @@ } } + 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 3225b28..0e122ed 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> -- Gitblit v1.9.1