Backported commit dd525814ca27

5 files changed, 44 insertions, 28 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 6b131d2f5..01cb6a9d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Add full headers view in message preview window (#1488538)
+- Fix message display page issues (#1488590, #1488642)
 - Fix handling vCard entries with TEL;TYPE=CELL (#1488728)
 - Fix error where session wasn't updated after folder rename/delete (#1488692)
 - Fix PLAIN authentication for some IMAP servers (#1488674)
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 7944e7f3c..86bb0b416 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -697,6 +697,11 @@ a.iconbutton.threadmode.selected {
 	background: linear-gradient(top, #fff 0%, #e9e9e9 100%);
 }
 
+#mailview-right #messageheader {
+	border-radius: 4px 4px 0 0;
+	border-bottom: 2px solid #e6e6e6;
+}
+
 h2.subject {
 	font-size: 15px;
 	margin: 0 15em 0 0;
@@ -801,9 +806,17 @@ h3.subject {
 	background-position: -5px -242px;
 }
 
+#full-headers {
+	position: relative;
+}
+
 div.more-headers {
-	cursor: pointer;
+	position: absolute;
+	top: -12px;
+	right: 10px;
+	width: 12px;
 	height: 10px;
+	cursor: pointer;
 	background: url(images/buttons.png) center -1619px no-repeat;
 }
 
@@ -812,13 +825,13 @@ div.hide-headers {
 }
 
 #all-headers {
-    position: relative;
-	margin: 0 10px;
+	position: relative;
+	margin: 4px 10px;
 	padding: 0;
 	height: 180px;
-	border: 1px solid #bbb;
+	border: 1px solid #ccc;
 	border-radius: 4px;
-	background: #fff;
+	background: #fdfdfd;
 }
 
 #headers-source {
@@ -828,12 +841,16 @@ div.hide-headers {
 	left: 0;
 	right: 0;
 	bottom: 0;
-	padding: 2px 5px;
+	padding: 3px 5px;
 	overflow: auto;
 	text-align: left;
 	color: #333;
 }
 
+#messagepreviewheader #all-headers {
+	margin-left: 0;
+}
+
 #messagepreviewheader {
 	position: relative;
 	height: auto;
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index b66d82140..50ac84473 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -31,10 +31,9 @@
 
 </div>
 
-<div id="mailview-right">
+<div id="mailview-right" class="offset uibox">
 
-<div id="mailview-top">
-<div id="messageheader" class="uibox">
+<div id="messageheader">
 <h2 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h2>
 <roundcube:object name="messageHeaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject" />
 <roundcube:object name="messageFullHeaders" id="full-headers" />
@@ -46,9 +45,10 @@
 	<roundcube:button command="nextmessage" type="link" class="button nextpage disabled" classAct="button nextpage" classSel="button nextpage pressed" innerClass="inner" title="nextmessage" content="&amp;gt;" />
 </div>
 
+<div id="contactphoto"><roundcube:object name="contactphoto" /></div>
 </div>
 
-<div id="messagecontent" class="uibox">
+<div id="messagecontent">
 <div class="rightcol">
 <roundcube:object name="messageAttachments" id="attachment-list" class="attachmentslist" />
 </div>
@@ -58,11 +58,7 @@
 </div>
 </div>
 
-</div><!-- end mailview-top -->
-
-<div id="mailview-bottom" class="uibox">
 <roundcube:object name="message" id="message" class="statusbar" />
-</div>
 
 </div><!-- end mailview-right -->
 
diff --git a/skins/larry/templates/messageerror.html b/skins/larry/templates/messageerror.html
index 70181f174..3c3c9acdb 100644
--- a/skins/larry/templates/messageerror.html
+++ b/skins/larry/templates/messageerror.html
@@ -16,6 +16,13 @@
 
 <div id="mainscreen">
 
+<!-- toolbar -->
+<div id="messagetoolbar" class="fullwidth">
+	<div id="mailtoolbar" class="toolbar">
+		<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
+	</div>
+</div>
+
 <div id="mailview-left">
 
 <!-- folders list -->
@@ -27,20 +34,11 @@
 
 </div>
 
-<div id="mailview-right">
+<div id="mailview-right" class="offset uibox">
 
-<!-- toolbar -->
-<div id="messagetoolbar" class="fullwidth">
-	<div id="mailtoolbar" class="toolbar">
-		<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
-	</div>
-</div>
-
-<div id="mailview-top" class="uibox watermark"></div>
+<div id="messagecontent" class="watermark"></div>
 
-<div id="mailview-bottom" class="uibox">
-	<roundcube:object name="message" id="message" class="statusbar" />
-</div>
+<roundcube:object name="message" id="message" class="statusbar" />
 
 </div><!-- end mailview-right -->
 
diff --git a/skins/larry/templates/messagepreview.html b/skins/larry/templates/messagepreview.html
index fbca9715d..792c1bd63 100644
--- a/skins/larry/templates/messagepreview.html
+++ b/skins/larry/templates/messagepreview.html
@@ -10,21 +10,24 @@
 <h3 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h3>
 
 <a href="#details" id="previewheaderstoggle"><span class="iconlink"></span></a>
+<div id="contactphoto"><roundcube:object name="contactphoto" /></div>
 
 <table class="headers-table" id="preview-shortheaders"><tbody><tr>
 <roundcube:if condition="env:mailbox == config:drafts_mbox || env:mailbox == config:sent_mbox">
 	<td class="header-title"><roundcube:label name="to" /></td>
-	<td class="header from"><roundcube:object name="messageHeaders" valueOf="to" addicon="/images/addcontact.png" /></td>
+	<td class="header from"><roundcube:object name="messageHeaders" valueOf="to" max="3" addicon="/images/addcontact.png" /></td>
 <roundcube:else />
 	<td class="header-title"><roundcube:label name="from" /></td>
 	<td class="header from"><roundcube:object name="messageHeaders" valueOf="from" addicon="/images/addcontact.png" /></td>
 <roundcube:endif />
 	<td class="header-title"><roundcube:label name="date" /></td>
-	<td class="header from"><roundcube:object name="messageHeaders" valueOf="date" /></td>
+	<td class="header date"><span><roundcube:object name="messageHeaders" valueOf="date" /></span></td>
 </tr></tbody></table>
 
 <roundcube:object name="messageHeaders" id="preview-allheaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject,replyto" />
 
+<roundcube:object name="messageFullHeaders" id="full-headers" />
+
 <!-- record navigation -->
 <div id="countcontrols" class="pagenav">
 <roundcube:if condition="env:mailbox != config:drafts_mbox">