From eac1b7a32d702b0f69d175c2867bd807ad26e7f2 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 11 Sep 2012 15:07:21 +0200
Subject: Init splitter in Preferences also when env.action is empty

---
 skins/larry/ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'skins')

diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index e3b5eefe4..c221b8681 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -144,7 +144,7 @@ function rcube_mail_ui()
         new rcube_splitter({ id:'identviewsplitter', p1:'#identitieslist', p2:'#identity-details',
           orientation:'v', relative:true, start:266, min:180, size:12 }).init();
       }
-      else if (rcmail.env.action == 'preferences') {
+      else if (rcmail.env.action == 'preferences' || !rcmail.env.action) {
         new rcube_splitter({ id:'prefviewsplitter', p1:'#sectionslist', p2:'#preferences-box',
           orientation:'v', relative:true, start:266, min:180, size:12 }).init();
       }
-- 
cgit v1.2.3


From 41b3fe17824b1c8c00037addc0e9bdbc5506ece9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 13 Sep 2012 15:32:43 +0200
Subject: Fix so "Edit as new" on draft creates a new message (#1488687)

---
 CHANGELOG                                  | 1 +
 program/js/app.js                          | 2 +-
 skins/classic/includes/messagetoolbar.html | 2 +-
 skins/larry/includes/mailtoolbar.html      | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'skins')

diff --git a/CHANGELOG b/CHANGELOG
index 36e80f354..9c205c61d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix so "Edit as new" on draft creates a new message (#1488687)
 - Fix invalid error message on deleting mail from read only folder (#1488694)
 - Fix error where session wasn't updated after folder rename/delete (#1488692)
 - Replace data URIs of images (pasted in HTML editor) with inline attachments (#1488502)
diff --git a/program/js/app.js b/program/js/app.js
index 48de21764..2182a2b88 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -669,7 +669,7 @@ function rcube_webmail()
           this.load_identity(props, 'edit-identity');
         else if (this.task == 'mail' && (cid = this.get_single_uid())) {
           url = { _mbox: this.env.mailbox };
-          url[this.env.mailbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid'] = cid;
+          url[this.env.mailbox == this.env.drafts_mailbox && props != 'new' ? '_draft_uid' : '_uid'] = cid;
           this.goto_url('compose', url, true);
         }
         break;
diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
index 3f4995b83..ecaf8f79b 100644
--- a/skins/classic/includes/messagetoolbar.html
+++ b/skins/classic/includes/messagetoolbar.html
@@ -45,7 +45,7 @@
   <ul class="toolbarmenu">
     <li><roundcube:button class="printlink" command="print" label="printmessage" classAct="printlink active" /></li>
     <li><roundcube:button class="downloadlink" command="download" label="emlsave" classAct="downloadlink active" /></li>
-    <li><roundcube:button class="editlink" command="edit" label="editasnew" classAct="editlink active" /></li>
+    <li><roundcube:button class="editlink" command="edit" prop="new" label="editasnew" classAct="editlink active" /></li>
     <li class="separator_below"><roundcube:button class="sourcelink" command="viewsource" label="viewsource" classAct="sourcelink active" /></li>
     <li><roundcube:button class="openlink" command="open" label="openinextwin" target="_blank" classAct="openlink active" /></li>
     <roundcube:container name="messagemenu" id="messagemenu" />
diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html
index f750e061a..60cebe01b 100644
--- a/skins/larry/includes/mailtoolbar.html
+++ b/skins/larry/includes/mailtoolbar.html
@@ -37,7 +37,7 @@
   <ul class="toolbarmenu iconized">
 	<li><roundcube:button command="print" label="printmessage" class="icon" classAct="icon active" innerclass="icon print" /></li>
 	<li><roundcube:button command="download" label="emlsave" class="icon" classAct="icon active" innerclass="icon download" /></li>
-	<li><roundcube:button command="edit" label="editasnew" class="icon" classAct="icon active" innerclass="icon edit" /></li>
+	<li><roundcube:button command="edit" prop="new" label="editasnew" class="icon" classAct="icon active" innerclass="icon edit" /></li>
 	<li><roundcube:button command="viewsource" label="viewsource" class="icon" classAct="icon active" innerclass="icon viewsource" /></li>
 	<li><roundcube:button command="open" label="openinextwin" target="_blank" class="icon" classAct="icon active" innerclass="icon extwin" /></li>
 	<roundcube:container name="messagemenu" id="messagemenu" />
-- 
cgit v1.2.3


From f158dc3e8f2b77cfe83f0b3cc75c19d04208ea4c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 16 Sep 2012 09:36:47 +0200
Subject: Fix #messageheader for case when the message has no subject

---
 skins/larry/mail.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'skins')

diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 496cbbd15..04f56e134 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -837,6 +837,7 @@ h3.subject {
 #messageheader {
 	position: relative;
 	height: auto;
+	min-height: 52px;
 	margin: 0 8px 0 0;
 	padding: 0 0 0 72px;
 	border-bottom: 2px solid #f0f0f0;
-- 
cgit v1.2.3