diff options
| -rw-r--r-- | program/steps/mail/compose.inc | 12 | ||||
| -rw-r--r-- | program/steps/mail/sendmail.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/upload.inc | 2 | ||||
| -rw-r--r-- | skins/default/images/icons/remove-attachment.png | bin | 775 -> 787 bytes | |||
| -rw-r--r-- | skins/default/mail.css | 13 | ||||
| -rw-r--r-- | skins/default/templates/compose.html | 2 |
6 files changed, 22 insertions, 9 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 6d4cf9a61..64b0d6364 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -626,12 +626,20 @@ function rcmail_compose_attachment_list($attrib) if (is_array($_SESSION['compose']['attachments'])) { if ($attrib['deleteicon']) - $button = sprintf('<img src="%s%s" alt="%s" border="0" / style="padding-right:2px;vertical-align:middle">', $CONFIG['skin_path'], $attrib['deleteicon'], rcube_label('delete')); + $button = sprintf('<img src="%s%s" alt="%s" border="0" / style="padding-right:2px;vertical-align:middle">', + $CONFIG['skin_path'], + $attrib['deleteicon'], + rcube_label('delete')); else $button = rcube_label('delete'); foreach ($_SESSION['compose']['attachments'] as $i => $a_prop) - $out .= sprintf('<li id="%s"><a href="#" onclick="%s.command(\'remove-attachment\',\'%s\')" title="%s">%s</a>%s</li>', $a_prop['name'], $JS_OBJECT_NAME, $a_prop['name'], rcube_label('deletefolder'), $button, $a_prop['name']); + $out .= sprintf('<li id="%s"><a href="#" onclick="%s.command(\'remove-attachment\',\'%s\')" title="%s">%s</a>%s</li>', + $a_prop['name'], + $JS_OBJECT_NAME, + $a_prop['name'], + rcube_label('delete'), + $button, $a_prop['name']); } $OUTPUT->add_script(sprintf("%s.gui_object('attachmentlist', '%s');", $JS_OBJECT_NAME, $attrib['id'])); diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index a57f2d4ed..33c1a405e 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -114,7 +114,7 @@ if (empty($identity_arr['string'])) // compose headers array $headers = array('Date' => date('D, j M Y G:i:s O'), 'From' => $identity_arr['string'], - 'To' => $mailto); + 'To' => rcube_charset_convert($mailto, $input_charset, $message_charset)); // additional recipients if (!empty($_POST['_cc'])) diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc index 7fe7d3dcc..39164bb46 100644 --- a/program/steps/mail/upload.inc +++ b/program/steps/mail/upload.inc @@ -46,7 +46,7 @@ foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) 'path' => $tmpfname); $button = sprintf('<img src="%s/images/icons/remove-attachment.png" alt="%s" border="0" style="padding-right:2px;vertical-align:middle">', $CONFIG['skin_path'], rcube_label('delete')); - $content = sprintf('<a href="#" onclick="%s.command(\\\'remove-attachment\\\',\\\'%s\\\')" title="%s">%s</a>%s',$JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i], rcube_label('deletefolder'), $button, $_FILES['_attachments']['name'][$i]); + $content = sprintf('<a href="#" onclick="%s.command(\\\'remove-attachment\\\',\\\'%s\\\')" title="%s">%s</a>%s',$JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i], rcube_label('delete'), $button, $_FILES['_attachments']['name'][$i]); $response .= sprintf('parent.%s.add2attachment_list(\'%s\',\'%s\');',$JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i], $content); } } diff --git a/skins/default/images/icons/remove-attachment.png b/skins/default/images/icons/remove-attachment.png Binary files differindex 0712aaa71..8d496fe10 100644 --- a/skins/default/images/icons/remove-attachment.png +++ b/skins/default/images/icons/remove-attachment.png diff --git a/skins/default/mail.css b/skins/default/mail.css index 4d54be31d..eebe5411e 100644 --- a/skins/default/mail.css +++ b/skins/default/mail.css @@ -593,16 +593,15 @@ table.headers-table tr td.subject width: 95%; font-weight: bold; } - + #attachment-list { margin: 0px; - padding: 0px 0px 0px 0px; + padding: 0px 0px 0px 68px; height: 18px; list-style-image: none; list-style-type: none; - background-color: #DFDFDF; - background-position: 52px 1px; + background: url(images/icons/attachment.png) 52px 1px no-repeat #DFDFDF; border-bottom: 1px solid #FFFFFF; } @@ -825,6 +824,12 @@ div.message-part pre overflow: hidden; } +#attachment-title +{ + background: url(images/icons/attachment.png) top left no-repeat; + padding: 0px 0px 3px 22px; +} + #attachment-form { position: absolute; diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html index bcb232fbc..0ecfb8f1b 100644 --- a/skins/default/templates/compose.html +++ b/skins/default/templates/compose.html @@ -111,7 +111,7 @@ self.setTimeout('rcmail_auto_save()',300000); </div> <div id="compose-attachments"> -<div><roundcube:label name="attachments" /></div> +<div id="attachment-title"><roundcube:label name="attachments" /></div> <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/remove-attachment.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" /> </div> |
