From c16986be7f5f4df21bfc85a93a2c35f38c86bf12 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 17 Mar 2010 14:21:07 -0400
Subject: [PATCH] - use popupmenu style for attachments upload form - move .popupmenu style definition to common.css
---
skins/default/templates/compose.html | 183 ++++++++++++++++++++-------------------------
1 files changed, 81 insertions(+), 102 deletions(-)
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index d160dd9..3b9cd40 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -3,26 +3,10 @@
<head>
<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" />
-<script type="text/javascript">
-<!--
-
-function rcmail_toggle_display(id)
- {
- var row, disp;
- if (row = document.getElementById(id))
- {
- disp = (!row.style.display || row.style.display=='none') ? (document.all ? 'block' : 'table-row') : 'none';
- row.style.display = disp;
- }
-
- return false;
- }
-
-//-->
-</script>
+<link rel="stylesheet" type="text/css" href="/googiespell.css" />
+<script type="text/javascript" src="/functions.js"></script>
</head>
-<body>
+<body onload="rcmail_init_compose_form()">
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
@@ -30,99 +14,94 @@
<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" />
-
-<div id="priority-selector">
-<roundcube:label name="priority" />: <roundcube:object name="prioritySelector" form="form" />
-</div>
-
+<table border="0" cellspacing="0" cellpadding="0"><tr>
+ <td id="compose-toolbar">
+ <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
+ <roundcube:button command="send" type="link" class="buttonPas send" classAct="button send" classSel="button sendSel" title="sendmessage" content=" " />
+ <roundcube:button command="spellcheck" type="link" class="buttonPas spellcheck" classAct="button spellcheck" classSel="button spellcheckSel" title="checkspelling" content=" " />
+ <roundcube:button command="add-attachment" type="link" class="buttonPas attach" classAct="button attach" classSel="button attachSel" title="addattachment" content=" " />
+ <roundcube:button command="insert-sig" type="link" class="buttonPas insertsig" classAct="button insertsig" classSel="button insertsigSel" title="insertsignature" content=" " />
+ <roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " />
+ <roundcube:container name="toolbar" id="compose-toolbar" />
+ </td>
+ <td id="priority-selector">
+ <label for="rcmcomposepriority"><roundcube:label name="priority" />:</label> <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" />
+ </td>
+ <td id="receipt-selector">
+ <roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> <label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" /></label>
+ </td>
+</tr></table>
</div>
<div id="compose-container">
-<table border="0" cellspacing="0" cellpadding="1" style="width:100%; height:100%;" summary=""><tr>
-<td>
-
-<table border="0" cellspacing="0" cellpadding="1" id="compose-headers" summary=""><tr>
-
-<td class="title"><roundcube:label name="from" /></td>
-<td><roundcube:object name="composeHeaders" part="from" form="form" 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" 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" 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" 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" tabindex="5" /></td>
-
-<!-- </tr><tr>
-
-<td><roundcube:object name="composeAttachment" size="20" /></td> -->
-
-</tr><tr>
-
-<td class="title"><roundcube:label name="subject" /></td>
-<td><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /></td>
-
-</tr></table>
-
-</td>
-
-</tr><tr>
-
-<td style="width:100%; height:95%; vertical-align:top;">
-<roundcube:object name="composeBody" id="compose-body" form="form" cols="80" rows="20" wrap="virtual" tabindex="7" /><br />
-<roundcube:label name="charset" />: <roundcube:object name="charsetSelector" tabindex="8" />
-</td>
-
-</tr></table>
-
+ <div id="compose-headers-div" style="width: 100%;">
+ <table border="0" cellspacing="0" cellpadding="1" id="compose-headers" summary="">
+ <tbody>
+ <tr>
+ <td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
+ <td><roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" /></td>
+ </tr><tr>
+ <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td>
+ <td><roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="2" tabindex="2" /></td>
+ </tr><tr id="compose-cc">
+ <td class="title top"><a href="#cc" onclick="return rcmail_hide_header_form('cc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a>
+ <label for="_cc"><roundcube:label name="cc" /></label></td>
+ <td><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="2" tabindex="3" /></td>
+ </tr><tr id="compose-bcc">
+ <td class="title top"><a href="#bcc" onclick="return rcmail_hide_header_form('bcc');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a>
+ <label for="_bcc"><roundcube:label name="bcc" /></label></td>
+ <td><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="2" tabindex="4" /></td>
+ </tr><tr id="compose-replyto">
+ <td class="title top"><a href="#replyto" onclick="return rcmail_hide_header_form('replyto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a>
+ <label for="_replyto"><roundcube:label name="replyto" /></label></td>
+ <td><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
+ </tr><tr id="compose-links">
+ <td></td>
+ <td class="formlinks">
+ <a href="#cc" onclick="return rcmail_show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a>
+ <span class="separator">|</span>
+ <a href="#bcc" onclick="return rcmail_show_header_form('bcc')" id="bcc-link"><roundcube:label name="addbcc" /></a>
+ <span class="separator">|</span>
+ <a href="#reply-to" onclick="return rcmail_show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a>
+ </td>
+ </tr><tr>
+ <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><tr>
+ <td class="title"><roundcube:label name="editortype" /></td>
+ <td>
+ <div id="editor-select"><roundcube:object name="editorSelector" editorid="compose-body" /></div>
+ <div id="spellcheck-control"></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div id="compose-div">
+ <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="7" />
+ <table border="0" cellspacing="0" summary="" style="width:100%; margin-top: 5px;"><tbody>
+ <tr>
+ <td style="white-space: nowrap">
+ <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="8" />
+ <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" />
+ </td>
+ <td style="text-align:right; white-space: nowrap">
+ <label><roundcube:label name="savesentmessagein" />: <roundcube:object name="storetarget" maxlength="30" tabindex="10" /></label>
+ </td>
+ </tr>
+ </tbody></table>
+ </div>
</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/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
+<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>
</form>
-<roundcube:object name="composeAttachmentForm" id="attachment-form" />
-
-<script type="text/javascript">
-<!--
-
-var cc_field = document.form._cc;
-if (cc_field && cc_field.value!='')
- rcmail_toggle_display('compose-cc');
-
-//-->
-</script>
-
-<!--
-<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>
--->
+<roundcube:object name="composeAttachmentForm" id="attachment-form" attachmentFieldSize="40" class="popupmenu" />
</body>
</html>
--
Gitblit v1.9.1