From 2f2f15b7aabe19e45dad9bddb7eb7f4394aa1e21 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 04 Sep 2006 08:26:30 -0400
Subject: [PATCH] Little improvements for message parsing and encoding
---
skins/default/templates/compose.html | 106 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 66 insertions(+), 40 deletions(-)
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 5774b78..ed44bb5 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -1,9 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<title>RoundCube|Mail :: <roundcube:label name="compose" /></title>
-<link rel="stylesheet" type="text/css" href="/common.css" />
+<title><roundcube:object name="productname" /> :: <roundcube:label name="compose" /></title>
+<roundcube:include file="/includes/links.html" />
<link rel="stylesheet" type="text/css" href="/mail.css" />
+<link rel="stylesheet" type="text/css" href="/googiespell.css" />
<script type="text/javascript">
<!--
@@ -12,7 +13,7 @@
var row, disp;
if (row = document.getElementById(id))
{
- disp = (!row.style.display || row.style.display=='none') ? (document.all ? 'block' : 'table-row') : 'none';
+ disp = (!row.style.display || row.style.display=='none') ? ((document.all && !window.opera) ? 'block' : 'table-row') : 'none';
row.style.display = disp;
}
@@ -24,93 +25,118 @@
</head>
<body>
+<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
-<form name="form" method="post">
+<form name="form" action="./" method="post">
<div id="messagetoolbar">
-<roundcube:button command="list" image="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
-<roundcube:button command="send" imageAct="/images/buttons/send_act.png" imagePas="/images/buttons/send_pas.png" width="32" height="32" title="sendmessage" />
-<roundcube:button command="contacts" imageAct="/images/buttons/contacts_act.png" imagePas="/images/buttons/contacts_pas.png" width="32" height="32" title="addressbook" />
-<roundcube:button command="add-attachment" imageAct="/images/buttons/attach_act.png" imagePas="/images/buttons/attach_pas.png" width="32" height="32" title="addattachment" />
+<!--<roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />-->
+<roundcube:button command="send" imageSel="/images/buttons/send_sel.png" imageAct="/images/buttons/send_act.png" imagePas="/images/buttons/send_pas.png" width="32" height="32" title="sendmessage" />
+<roundcube:button command="spellcheck" imageSel="/images/buttons/spellcheck_sel.png" imageAct="/images/buttons/spellcheck_act.png" imagePas="/images/buttons/spellcheck_pas.png" width="32" height="32" title="checkspelling" />
+<roundcube:button command="add-attachment" imageSel="/images/buttons/attach_sel.png" imageAct="/images/buttons/attach_act.png" imagePas="/images/buttons/attach_pas.png" width="32" height="32" title="addattachment" />
+<roundcube:button command="savedraft" imageSel="/images/buttons/drafts_sel.png" imageAct="/images/buttons/drafts_act.png" imagePas="/images/buttons/drafts_pas.png" width="32" height="32" title="savemessage" />
<div id="priority-selector">
-<roundcube:label name="priority" />: <roundcube:object name="prioritySelector" form="form" />
+<label for="rcmcomposepriority"><roundcube:label name="priority" />:</label> <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" />
+</div>
+
+<div id="receipt-selector">
+<roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> <label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" /></label>
</div>
</div>
<div id="compose-container">
-<table border="0" cellspacing="0" cellpadding="1" style="width:100%; height:100%;" summary=""><tr>
+<table border="0" cellspacing="0" cellpadding="1" style="width:100%; height:99%;" summary="">
+<tbody>
+<tr>
<td>
-<table border="0" cellspacing="0" cellpadding="1" id="compose-headers" summary=""><tr>
+<table border="0" cellspacing="0" cellpadding="1" id="compose-headers" summary="">
+<tbody><tr>
-<td class="title"><roundcube:label name="from" /></td>
-<td><roundcube:object name="composeHeaders" part="from" form="form" /></td>
+<td class="title"><label for="rcmcomposefrom"><roundcube:label name="from" /></label></td>
+<td><roundcube:object name="composeHeaders" part="from" form="form" id="rcmcomposefrom" tabindex="1" /></td>
</tr><tr>
-<td class="title top"><roundcube:label name="to" /></td>
-<td><roundcube:object name="composeHeaders" part="to" form="form" cols="80" rows="2" /></td>
+<td class="title top"><label for="rcmcomposeto"><roundcube:label name="to" /></label></td>
+<td><roundcube:object name="composeHeaders" part="to" form="form" id="rcmcomposeto" cols="80" rows="2" tabindex="2" /></td>
<td class="add-button"><a href="#" onclick="return rcmail_toggle_display('compose-cc')">[Cc]</a><br />
<a href="#" onclick="return rcmail_toggle_display('compose-bcc')">[Bcc]</a><br /></td>
</tr><tr id="compose-cc">
-<td class="title top"><roundcube:label name="cc" /></td>
-<td><roundcube:object name="composeHeaders" part="cc" form="form" cols="80" rows="2" /></td>
+<td class="title top"><label for="rcmcomposecc"><roundcube:label name="cc" /></label></td>
+<td><roundcube:object name="composeHeaders" part="cc" form="form" id="rcmcomposecc" cols="80" rows="2" tabindex="3" /></td>
</tr><tr id="compose-bcc">
-<td class="title top"><roundcube:label name="bcc" /></td>
-<td><roundcube:object name="composeHeaders" part="bcc" form="form" cols="80" rows="2" /></td>
+<td class="title top"><label for="rcmcomposebcc"><roundcube:label name="bcc" /></label></td>
+<td><roundcube:object name="composeHeaders" part="bcc" form="form" id="rcmcomposebcc" cols="80" rows="2" tabindex="4" /></td>
</tr><tr id="compose-replyto">
-<td class="title top"><roundcube:label name="replyto" /></td>
-<td><roundcube:object name="composeHeaders" part="replyto" form="form" size="80" /></td>
-
-<!-- </tr><tr>
-
-<td><roundcube:object name="composeAttachment" size="20" /></td> -->
+<td class="title top"><label for="rcmcomposereplyto"><roundcube:label name="replyto" /></label></td>
+<td><roundcube:object name="composeHeaders" part="replyto" form="form" id="rcmcomposereplyto" size="80" tabindex="5" /></td>
</tr><tr>
-<td class="title"><roundcube:label name="subject" /></td>
-<td><roundcube:object name="composeSubject" id="compose-subject" form="form" /></td>
+<td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
+<td><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /></td>
-</tr></table>
+</tr>
+</tbody>
+</table>
</td>
</tr><tr>
-<td style="width:100%; height:100%;">
-<roundcube:object name="composeBody" id="compose-body" form="form" cols="80" rows="20" warp="virtual" />
+<td style="width:100%; height:98%; vertical-align:top;">
+<roundcube:object name="composeBody" id="compose-body" form="form" cols="80" rows="20" wrap="virtual" tabindex="7" />
+
+<table border="0" cellspacing="0" width="100%" summary=""><tbody><tr>
+
+<td>
+<roundcube:button type="input" command="send" class="button" label="sendmessage" />
+<roundcube:button type="input" command="list" class="button" label="cancel" />
+</td>
+<td align="right">
+<roundcube:label name="charset" />: <roundcube:object name="charsetSelector" tabindex="8" />
</td>
-</tr></table>
+</tr></tbody></table>
+
+</td>
+
+</tr>
+</tbody>
+</table>
</div>
<div id="compose-attachments">
-<div><roundcube:label name="attachments" /></div>
-<roundcube:object name="composeAttachmentList" />
-<p><roundcube:button command="add-attachment" imagePas="/images/buttons/add_pas.png" imageAct="/images/buttons/add_act.png" width="23" height="18" title="addattachment" />
+<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>
</form>
<roundcube:object name="composeAttachmentForm" id="attachment-form" />
+<script type="text/javascript">
<!--
-<div id="attachment-form">
-<roundcube:object name="composeAttachment" size="20" /><br />
-<input type="button" value="<roundcube:label name='close' />" onclick="rcmail_show_attachment_form(0)" />
-<input type="button" value="<roundcube:label name='send' />" onclick="rcmail.command('send-attachment', this)" />
-</div>
--->
+
+var cc_field = document.form._cc;
+if (cc_field && cc_field.value!='')
+ rcmail_toggle_display('compose-cc');
+
+//-->
+</script>
+
</body>
</html>
--
Gitblit v1.9.1