From 50844277ca2ce9b98f5d732b07ffe7a4627ff72c Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 01 Jul 2006 08:38:38 -0400
Subject: [PATCH] Changed label and icon for attachment removal and some styles
---
program/steps/mail/upload.inc | 2 +-
program/steps/mail/compose.inc | 12 ++++++++++--
skins/default/mail.css | 13 +++++++++----
skins/default/images/icons/remove-attachment.png | 0
skins/default/templates/compose.html | 2 +-
program/steps/mail/sendmail.inc | 2 +-
6 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 6d4cf9a..64b0d63 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -626,12 +626,20 @@
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 a57f2d4..33c1a40 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -114,7 +114,7 @@
// 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 7fe7d3d..39164bb 100644
--- a/program/steps/mail/upload.inc
+++ b/program/steps/mail/upload.inc
@@ -46,7 +46,7 @@
'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
index 0712aaa..8d496fe 100644
--- a/skins/default/images/icons/remove-attachment.png
+++ b/skins/default/images/icons/remove-attachment.png
Binary files differ
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 4d54be3..eebe541 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -593,16 +593,15 @@
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 @@
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 bcb232f..0ecfb8f 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -111,7 +111,7 @@
</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>
--
Gitblit v1.9.1