summaryrefslogtreecommitdiff
path: root/skins/larry/templates
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-10-01 21:39:30 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-10-01 21:39:30 +0200
commitdd525814ca2725e9b11692551d01a5bdf7931b04 (patch)
treecf0741b679ea8a2eb92d07fa88e77b1b59f13b04 /skins/larry/templates
parentc23aad2feb9923cbf9197f4d99f73978a61de832 (diff)
Replacement for commit af276f21e536:
- add a more discrete toggle for all headers to message preview - fix message display page issues (#1488590, #1488642)
Diffstat (limited to 'skins/larry/templates')
-rw-r--r--skins/larry/templates/message.html11
-rw-r--r--skins/larry/templates/messageerror.html22
-rw-r--r--skins/larry/templates/messagepreview.html6
3 files changed, 17 insertions, 22 deletions
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index 1becd711a..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" />
@@ -49,7 +48,7 @@
<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>
@@ -59,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 b53683ec1..792c1bd63 100644
--- a/skins/larry/templates/messagepreview.html
+++ b/skins/larry/templates/messagepreview.html
@@ -15,17 +15,19 @@
<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">