Partially revert changes on compose screen from r3789

1 files changed, 53 insertions, 60 deletions

diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index bd5860372..4e167ce12 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -24,9 +24,11 @@
     <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 name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attachSel" title="addattachment" onclick="rcmail_ui.show_uploadform();return false" 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" />
+    <roundcube:button name="messageoptions" id="composemenulink" type="link" class="button messagemenu" title="messageoptions" onclick="rcmail_ui.show_composemenu();return false" content=" " />
 </div>
 
 <div id="mainscreen">
@@ -34,7 +36,7 @@
 <div id="compose-attachments">
 <div class="boxtitle"><roundcube:label name="attachments" /></div>
 <div class="boxlistcontent">
-  <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
+    <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
 </div>
 <div class="boxfooter">
   <roundcube:button name="uploadform" id="uploadformlink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_uploadform();return false" content=" " />
@@ -42,76 +44,66 @@
 </div>
 
 <script type="text/javascript">
-  var composesplitv = new rcube_splitter({id:'composesplitterv', p1: 'compose-attachments', p2: 'compose-container', orientation: 'v', relative: true, start: 165});
+  var composesplitv = new rcube_splitter({id:'composesplitterv', p1: 'compose-attachments', p2: 'compose-container', orientation: 'v', relative: true, start: 175});
   rcmail.add_onload('composesplitv.init()');
 </script>
 
 <div id="compose-container">
     <div id="compose-headers-div" style="width: 100%;">
-	    <table border="0" cellspacing="0" cellpadding="1" id="compose-headers">
-	    <tr>
-		    <td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
-		    <td class="editfield">
-                <roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
-            </td>
-            <td id="formlinks">
-		        <a href="#cc" onclick="return rcmail_ui.show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a>
-		        <span class="separator">|</span>
-		        <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>
-            </td>
-	    </tr><tr>
-		    <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td>
-		    <td colspan="2" class="editfield">
-                <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">
+        <table border="0" cellspacing="0" cellpadding="1" id="compose-headers">
+        <tr>
+            <td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
+            <td class="editfield"><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 class="editfield"><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_ui.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 colspan="2" class="editfield">
-                <roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="2" tabindex="3" />
+                <label for="_cc"><roundcube:label name="cc" /></label>
             </td>
-	    </tr><tr id="compose-bcc">
-		    <td class="title top">
+            <td class="editfield"><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_ui.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>
+                <label for="_bcc"><roundcube:label name="bcc" /></label>
             </td>
-		    <td colspan="2" class="editfield">
-                <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">
+            <td colspan="2" class="editfield"><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_ui.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 colspan="2" class="editfield">
-                <roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" />
+                <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>
-		    <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
-		    <td colspan="2" class="editfield">
-                <roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="6" />
+            <td></td>
+            <td id="formlinks">
+                <a href="#cc" onclick="return rcmail_ui.show_header_form('cc')" id="cc-link"><roundcube:label name="addcc" /></a>
+                <span class="separator">|</span>
+                <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>
             </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>
+        </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="7" />
         </div>
         <div class="boxfooter">
-            <roundcube:button name="messageoptions" id="composemenulink" type="link" title="messageoptions" class="button groupactions" onclick="rcmail_ui.show_composemenu();return false" content=" " />
-            <span 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" />
-            </span>
-            <div id="compose-editorfooter" class="pagenav">
-                <span id="spellcheck-control" style="margin-right: 10px"></span>
+            <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" />
+            </div>
+            <div id="compose-editorfooter">
+                <span id="spellcheck-control" style="margin-right:10px"></span>
                 <span>
-                <roundcube:label name="editortype" />
-                <roundcube:object name="editorSelector" editorid="compose-body" tabindex="10" />
+                    <roundcube:label name="editortype" />
+                    <roundcube:object name="editorSelector" editorid="compose-body" tabindex="10" />
                 </span>
             </div>
         </div>
@@ -122,15 +114,16 @@
 
 <div id="composeoptionsmenu" class="popupmenu">
     <table>
-        <tr><td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td>
-            <td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td>
-        </tr>
-        <tr><td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td>
-            <td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td>
-        </tr>
-        <tr><td><label><roundcube:label name="savesentmessagein" />:</label></td>
-            <td><roundcube:object name="storetarget" maxlength="30" /></td>
-        </tr>
+    <tr>
+        <td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td>
+        <td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td>
+    </tr><tr>
+        <td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td>
+        <td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td>
+    </tr><tr>
+        <td><label><roundcube:label name="savesentmessagein" />:</label></td>
+        <td><roundcube:object name="storetarget" maxlength="30" /></td>
+    </tr>
     </table>
 </div>