From 554818bcd078eab8a6184034e3b5940c6caaa02f Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 4 Oct 2010 12:27:06 +0000
Subject: - Add Reply-to-List feature (#1484252) - Add
 Mail-Followup-To/Mail-Reply-To support (#1485547)

git-svn-id: https://svn.roundcube.net/trunk@4032 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/skins/default/common.css             |  25 +++++++++++++++++++-
 roundcubemail/skins/default/functions.js           |  14 +++++------
 roundcubemail/skins/default/images/dbutton.png     | Bin 0 -> 465 bytes
 .../skins/default/includes/replyallmenu.html       |   7 ++++++
 roundcubemail/skins/default/mail.css               |   8 ++++---
 roundcubemail/skins/default/templates/compose.html |  26 +++++++++++++++++----
 roundcubemail/skins/default/templates/mail.html    |   3 +++
 roundcubemail/skins/default/templates/message.html |   3 +++
 8 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 roundcubemail/skins/default/images/dbutton.png
 create mode 100644 roundcubemail/skins/default/includes/replyallmenu.html

(limited to 'roundcubemail/skins/default')

diff --git a/roundcubemail/skins/default/common.css b/roundcubemail/skins/default/common.css
index 4a9155211..c068ca270 100644
--- a/roundcubemail/skins/default/common.css
+++ b/roundcubemail/skins/default/common.css
@@ -462,6 +462,30 @@ img
   background-color: #F2F2F2 !important;
 }
 
+.dropbutton,
+.dropbutton span
+{
+  float: left;
+  height: 32px;
+}
+
+.dropbutton:hover
+{
+  background: url(images/dbutton.png) 0 0 no-repeat transparent;
+}
+
+.dropbutton span
+{
+  width: 9px;
+  background: url(images/dbutton.png) -53px 0 no-repeat transparent;
+}
+
+.dropbutton span:hover
+{
+  cursor: pointer;
+  background-position: -64px 0;
+}
+
 
 /***** common table settings ******/
 
@@ -752,4 +776,3 @@ font.bold
 {
   font-weight: bold;
 }
-  
\ No newline at end of file
diff --git a/roundcubemail/skins/default/functions.js b/roundcubemail/skins/default/functions.js
index 4615a462a..64a6d9921 100644
--- a/roundcubemail/skins/default/functions.js
+++ b/roundcubemail/skins/default/functions.js
@@ -29,6 +29,7 @@ function rcube_mail_ui()
 {
   this.popups = {
     markmenu:       {id:'markmessagemenu'},
+    replyallmenu:   {id:'replyallmenu'},
     searchmenu:     {id:'searchmenu', editable:1},
     messagemenu:    {id:'messagemenu'},
     listmenu:       {id:'listmenu', editable:1},
@@ -293,16 +294,15 @@ switch_preview_pane: function(elem)
 /* Message composing */
 init_compose_form: function()
 {
-  var cc_field = document.getElementById('_cc'),
-    bcc_field = document.getElementById('_bcc'),
+  var f, field, fields = ['cc', 'bcc', 'replyto', 'mailreplyto', 'mailfollowupto'],
     div = document.getElementById('compose-div'),
     headers_div = document.getElementById('compose-headers-div');
 
-  if (cc_field && cc_field.value != '')
-    rcmail_ui.show_header_form('cc');
-
-  if (bcc_field && bcc_field.value != '')
-    rcmail_ui.show_header_form('bcc');
+  // Show input elements with non-empty value
+  for (f=0; f<fields.length; f++) {
+    if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
+      rcmail_ui.show_header_form(fields[f]);
+  }
 
   // prevent from form data loss when pressing ESC key in IE
   if (bw.ie) {
diff --git a/roundcubemail/skins/default/images/dbutton.png b/roundcubemail/skins/default/images/dbutton.png
new file mode 100644
index 000000000..31f9d6347
Binary files /dev/null and b/roundcubemail/skins/default/images/dbutton.png differ
diff --git a/roundcubemail/skins/default/includes/replyallmenu.html b/roundcubemail/skins/default/includes/replyallmenu.html
new file mode 100644
index 000000000..5cf1236b4
--- /dev/null
+++ b/roundcubemail/skins/default/includes/replyallmenu.html
@@ -0,0 +1,7 @@
+<div id="replyallmenu" class="popupmenu">
+    <ul>
+        <li><roundcube:button command="reply-all" label="replyall" prop="sub" classAct="replyalllink active" class="replyalllink" /></li>
+        <li><roundcube:button command="reply-list" label="replylist" prop="sub" classAct="replylistlink active" class="replylistlink" /></li>
+        <roundcube:container name="replyallmenu" id="replyallmenu" />
+    </ul>
+</div>
diff --git a/roundcubemail/skins/default/mail.css b/roundcubemail/skins/default/mail.css
index 8baf836e4..84313a8da 100644
--- a/roundcubemail/skins/default/mail.css
+++ b/roundcubemail/skins/default/mail.css
@@ -13,7 +13,7 @@
 /*  border: 1px solid #cccccc; */
 }
 
-#messagetoolbar > a
+#messagetoolbar a
 {
   display: block;
   float: left;
@@ -27,7 +27,7 @@
   width: 32px;
   height: 32px;
   padding: 0;
-  margin-right: 10px;
+  margin: 0 5px;
   overflow: hidden;
   background: url(images/mail_toolbar.png) 0 0 no-repeat transparent;
   opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
@@ -1228,7 +1228,9 @@ td.hide-headers
 
 #compose-cc,
 #compose-bcc,
-#compose-replyto
+#compose-replyto,
+#compose-mailreplyto,
+#compose-mailfollowupto
 {
   display: none;
 }
diff --git a/roundcubemail/skins/default/templates/compose.html b/roundcubemail/skins/default/templates/compose.html
index 2e08b8669..f99afdd9e 100644
--- a/roundcubemail/skins/default/templates/compose.html
+++ b/roundcubemail/skins/default/templates/compose.html
@@ -78,6 +78,18 @@
                 <label for="_replyto"><roundcube:label name="replyto" /></label>
             </td>
             <td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
+        </tr><tr id="compose-mailreplyto">
+            <td class="title top">
+                <a href="#mailreplyto" onclick="return rcmail_ui.hide_header_form('mailreplyto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a>
+                <label for="_mailreplyto"><roundcube:label name="mailreplyto" /></label>
+            </td>
+            <td class="editfield"><roundcube:object name="composeHeaders" part="mailreplyto" form="form" id="_mailreplyto" size="70" tabindex="6" /></td>
+        </tr><tr id="compose-mailfollowupto">
+            <td class="title top">
+                <a href="#mailfollowupto" onclick="return rcmail_ui.hide_header_form('mailfollowupto');"><img src="/images/icons/minus.gif" alt="" title="<roundcube:label name='delete' />" /></a>
+                <label for="_mailfollowupto"><roundcube:label name="mailfollowupto" /></label>
+            </td>
+            <td class="editfield"><roundcube:object name="composeHeaders" part="mailfollowupto" form="form" id="_mailfollowupto" size="70" tabindex="7" /></td>
         </tr><tr>
             <td></td>
             <td class="formlinks">
@@ -86,27 +98,31 @@
                 <a href="#bcc" onclick="return rcmail_ui.show_header_form('bcc')" id="bcc-link"><roundcube:label name="addbcc" /></a>
                 <span class="separator">|</span>
                 <a href="#reply-to" onclick="return rcmail_ui.show_header_form('replyto')" id="replyto-link"><roundcube:label name="addreplyto" /></a>
+                <span class="separator">|</span>
+                <a href="#mailreply-to" onclick="return rcmail_ui.show_header_form('mailreplyto')" id="mailreplyto-link"><roundcube:label name="addmailreplyto" /></a>
+                <span class="separator">|</span>
+                <a href="#mailfollowup-to" onclick="return rcmail_ui.show_header_form('mailfollowupto')" id="mailfollowupto-link"><roundcube:label name="addmailfollowupto" /></a>
             </td>
         </tr><tr>
             <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
-            <td class="editfield"><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" /></td>
+            <td class="editfield"><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="8" /></td>
         </tr>
         </table>
     </div>
     <div id="compose-div">
         <div class="boxlistcontent" style="overflow: hidden; top: 0">
-            <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="7" />
+            <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="9" />
         </div>
         <div class="boxfooter">
             <div id="compose-buttons">
-                <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" />
+                <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="10" />
+                <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="11" />
             </div>
             <div id="compose-editorfooter">
                 <span id="spellcheck-control" style="margin-right:10px"></span>
                 <span>
                     <label><roundcube:label name="editortype" /></label>
-                    <roundcube:object name="editorSelector" editorid="compose-body" tabindex="10" />
+                    <roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
                 </span>
             </div>
         </div>
diff --git a/roundcubemail/skins/default/templates/mail.html b/roundcubemail/skins/default/templates/mail.html
index 55fbc73a1..a0847283a 100644
--- a/roundcubemail/skins/default/templates/mail.html
+++ b/roundcubemail/skins/default/templates/mail.html
@@ -120,7 +120,9 @@
 <roundcube:button command="checkmail" type="link" class="button checkmail" classAct="button checkmail" classSel="button checkmailSel" title="checkmail" content=" " />
 <roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
 <roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " />
+<span class="dropbutton">
 <roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " />
+<span id="replyallmenulink" onclick="rcmail_ui.show_popup('replyallmenu');return false"></span></span>
 <roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " />
 <roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " />
 <roundcube:container name="toolbar" id="messagetoolbar" />
@@ -138,6 +140,7 @@
   </ul>
 </div>
 
+<roundcube:include file="/includes/replyallmenu.html" />
 <roundcube:include file="/includes/messagemenu.html" />
 
 <div id="searchmenu" class="popupmenu">
diff --git a/roundcubemail/skins/default/templates/message.html b/roundcubemail/skins/default/templates/message.html
index 6bc1e2953..809da3333 100644
--- a/roundcubemail/skins/default/templates/message.html
+++ b/roundcubemail/skins/default/templates/message.html
@@ -21,7 +21,9 @@
 <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
 <roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
 <roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " />
+<span class="dropbutton">
 <roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " />
+<span id="replyallmenulink" onclick="rcmail_ui.show_popup('replyallmenu');return false"></span></span>
 <roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " />
 <roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " />
 <roundcube:container name="toolbar" id="messagetoolbar" />
@@ -29,6 +31,7 @@
 <roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" />
 </div>
 
+<roundcube:include file="/includes/replyallmenu.html" />
 <roundcube:include file="/includes/messagemenu.html" />
 
 <div id="mainscreen">
-- 
cgit v1.2.3