From f5e7a1f36a04bdf830ee935a651295cb9794ecf4 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 19 Dec 2012 10:11:58 +0100
Subject: [PATCH] Add Compose button on message view page (#1488747) Fixed
 javascript error on extwin message page (classic skin) - removed splitter.

---
 CHANGELOG                                  | 1 +
 skins/classic/includes/messagetoolbar.html | 2 +-
 skins/classic/templates/message.html       | 2 ++
 skins/larry/includes/mailtoolbar.html      | 2 ++
 skins/larry/templates/mail.html            | 2 --
 skins/larry/templates/message.html         | 1 -
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8cfeaf89d..41e266d0c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Add Compose button on message view page (#1488747)
 - Display 'Sender' header in message preview
 - Plugin API: Added message_before_send hook
 - Fix contact copy/add-to-group operations on search result (#1488862)
diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
index 371c83fd9..bd14f490f 100644
--- a/skins/classic/includes/messagetoolbar.html
+++ b/skins/classic/includes/messagetoolbar.html
@@ -5,8 +5,8 @@
 <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
 <roundcube:else />
 <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:endif />
+<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=" " />
diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html
index fcf0b22c8..b9c928f8f 100644
--- a/skins/classic/templates/message.html
+++ b/skins/classic/templates/message.html
@@ -58,10 +58,12 @@
 
 </div>
 
+<roundcube:if condition="!env:extwin" />
 <script type="text/javascript">
     var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'messageframe', orientation: 'v', relative: true, start: 165});
     rcmail.add_onload('mailviewsplitv.init()');
 </script>
+<roundcube:endif />
 
 </body>
 </html>
diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html
index 8efcc762c..59f2d581a 100644
--- a/skins/larry/includes/mailtoolbar.html
+++ b/skins/larry/includes/mailtoolbar.html
@@ -1,3 +1,5 @@
+<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
+<span class="spacer"></span>
 <roundcube:button command="reply" type="link" class="button reply disabled" classAct="button reply" classSel="button reply pressed" label="reply" title="replytomessage" />
 <span class="dropbutton">
 	<roundcube:button command="reply-all" type="link" class="button reply-all disabled" classAct="button reply-all" classSel="button reply-all pressed" label="replyall" title="replytoallmessage" />
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 8b205efbe..751ab82a4 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -21,8 +21,6 @@
 <!-- toolbar -->
 <div id="messagetoolbar" class="toolbar">
 	<roundcube:button command="checkmail" type="link" class="button checkmail disabled" classAct="button checkmail" classSel="button checkmail pressed" label="refresh" title="checkmail" />
-	<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
-	<span class="spacer"></span>
 	<roundcube:include file="/includes/mailtoolbar.html" />
 </div>
 
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index 04381f5e9..ae77c0dc0 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -14,7 +14,6 @@
 <div id="messagetoolbar" class="toolbar fullwidth">
 <roundcube:if condition="!env:extwin" />
 	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
-	<span class="spacer"></span>
 <roundcube:endif />
 	<roundcube:include file="/includes/mailtoolbar.html" />
 	<div class="toolbarselect">