From 50844277ca2ce9b98f5d732b07ffe7a4627ff72c Mon Sep 17 00:00:00 2001 From: thomascube Date: Sat, 1 Jul 2006 12:38:38 +0000 Subject: [PATCH] Changed label and icon for attachment removal and some styles --- program/steps/mail/compose.inc | 12 ++++++++++-- program/steps/mail/sendmail.inc | 2 +- program/steps/mail/upload.inc | 2 +- .../default/images/icons/remove-attachment.png | Bin 775 -> 787 bytes skins/default/mail.css | 13 +++++++++---- 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('%s', $CONFIG['skin_path'], $attrib['deleteicon'], rcube_label('delete')); + $button = sprintf('%s', + $CONFIG['skin_path'], + $attrib['deleteicon'], + rcube_label('delete')); else $button = rcube_label('delete'); foreach ($_SESSION['compose']['attachments'] as $i => $a_prop) - $out .= sprintf('
  • %s%s
    • ', $a_prop['name'], $JS_OBJECT_NAME, $a_prop['name'], rcube_label('deletefolder'), $button, $a_prop['name']); + $out .= sprintf('
  • %s%s
    • ', + $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('%s', $CONFIG['skin_path'], rcube_label('delete')); - $content = sprintf('%s%s',$JS_OBJECT_NAME, $_FILES['_attachments']['name'][$i], rcube_label('deletefolder'), $button, $_FILES['_attachments']['name'][$i]); + $content = sprintf('%s%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 index 0712aaa71f1a35c6a5711feaed42938530e2ec1d..8d496fe10ffbb3cd6f951f9267e611bc54afab58 100644 GIT binary patch delta 763 zcmV004R=004l4008;_004mL004C`008P>0026e000+nl3&F}0007sNkl+YVg$;E}CTuF(cLs>cdy_3_g|88#ox0{=9-eYHX zV+WA^=GLwMFns_41UF!to!ytSuCCA5czW`c$;&fz%74pef3mXr_21F)|1u4YrG;v0 zJZnr%yS4%?xv_OC+yH<8f*Y^{Xuw4mmlqw{+G3T0f~hw(HGjR<(fL0^PHuL9kPz=w z4Go5cYHE`=Iys>j01!ZM12$S)UpruC_GhlF?8XyHN+0g2s{Zd07hmkf!^79ErpB;9 zU0q~>l7G_O<+gfM);z002ovPDHLkV1imdXSVe5Jup4ApPhQQ z@8131z0c?OeZKEg1fb}D^w$TQ-OA(hyZ!C$?HQR&c5buTemR}a-&U(Ns~T2+QK{4+ zQGfrVYXQy8Eqg63_tDhU42Q#kKp=ojCWDKM3#9k=5e~0GtJUF&un!MAxk(0~q2b<7 zHoFb%);6$MEPvG2-bH0)C90~bP+wnczlo(0(9mW0J41YYGoBeL&G39Xl!gm zO-)Uqki+2=j807Ln%*=SOv=qXe&kvt}9`E8?NPnjGu(q}iv)LSD07gbMUbn{s zuh)m!**PeNln{#t5RJz0A(0?(l!6SyZg;?7FfK3vqoX>#PH({0_IoImO1RzAc)7R; zr*i_6Za3mv+eoE8!9Tx%v9U2517I?lgm$|VezNN!2crI`=QadDm|iNUukJ6>tBFk(hX7>=@zMibo){j hmuF>{cZ#p-{s1l!qLRS4ZxsLl002ovPDHLkV1h`SU7Y{` 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);
    -
    +