From 47c9ccbf6f2ffc344a5e85eefe4a9b9ba2c1b1ba Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 25 Sep 2008 10:09:56 -0400
Subject: [PATCH] Also allow appending messages to inbox (if not listed)
---
skins/default/templates/mail.html | 77 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index a0f38fb..24f851a 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -28,7 +28,7 @@
body_mouseup: function(evt, p)
{
- if (this.markmenu && this.markmenu.visible)
+ if (this.markmenu && this.markmenu.visible && evt.target != rcube_find_object('markreadbutton'))
this.show_markmenu(false);
},
@@ -41,23 +41,41 @@
};
</script>
+<style type="text/css">
+<roundcube:if condition="config:preview_pane == true" />
+#mailcontframe { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-5 : 195" />px; }
+#mailpreviewframe {
+ top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px;
+ /* css hack for IE */
+ height: expression((parseInt(this.parentNode.offsetHeight)-<roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />)+'px');
+}
+<roundcube:endif />
+#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; }
+#mailrightcontainer {
+ left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
+ /* css hack for IE */
+ width: expression((parseInt(this.parentNode.offsetWidth)-<roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />)+'px');
+}
+</style>
</head>
<body>
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
+<div id="mainscreen">
+
<div id="mailboxlist-container">
<h3 id="mailboxlist-header"><roundcube:label name="mailboxlist" /></h3>
<roundcube:object name="mailboxlist" id="mailboxlist" maxlength="16" />
</div>
-<div id="mailboxcontrols">
-<roundcube:label name="folder" />:
-<roundcube:button command="expunge" label="compact" classAct="active" />
-<roundcube:button command="purge" label="empty" classAct="active" />
-</div>
+<script type="text/javascript">
+ var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'mailrightcontainer', orientation: 'v', relative: true, start: 165});
+ rcmail.add_onload('mailviewsplitv.init()');
+</script>
+<div id="mailrightcontainer">
<div id="mailcontframe">
<roundcube:object name="messages"
@@ -68,25 +86,36 @@
unreadIcon="/images/icons/unread.png"
deletedIcon="/images/icons/deleted.png"
repliedIcon="/images/icons/replied.png"
- attachmentIcon="/images/icons/attachment.png" />
+ forwardedIcon="/images/icons/forwarded.png"
+ forwardedrepliedIcon="/images/icons/forwarded_replied.png"
+ attachmentIcon="/images/icons/attachment.png"
+ flaggedIcon="/images/icons/flagged.png"
+ unflaggedIcon="/images/icons/unflagged.png" />
</div>
<roundcube:if condition="config:preview_pane == true" />
+
<script type="text/javascript">
- var mailviewsplit = new rcube_splitter({id:'mailviewsplitter', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h'});
+ var mailviewsplit = new rcube_splitter({id:'mailviewsplitter', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 200});
rcmail.add_onload('mailviewsplit.init()');
</script>
+
<div id="mailpreviewframe">
<roundcube:object name="messagecontentframe" id="messagecontframe" width="100%" height="100%" frameborder="0" src="/watermark.html" />
</div>
-<style type="text/css">
-#mailcontframe {
- bottom: auto;
- height: 208px;
-}
-</style>
<roundcube:endif />
+
+</div>
+
+</div>
+
+<div id="mailboxcontrols">
+<roundcube:label name="folder" />:
+<roundcube:button command="expunge" label="compact" classAct="active" />
+<roundcube:button command="purge" label="empty" classAct="active" />
+</div>
+
<div id="listcontrols">
<roundcube:label name="select" />:
@@ -94,8 +123,16 @@
<roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />
<roundcube:button command="select-none" label="none" classAct="active" />
<roundcube:if condition="env:quota" />
-<roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="120" id="quotadisplay" />
+<roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" />
<roundcube:endif />
+</div>
+
+<div id="messagecountbar">
+<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" />
+<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
+ <roundcube:object name="messageCountDisplay" />
+<roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
+<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" />
</div>
<div id="messagetoolbar">
@@ -112,20 +149,14 @@
<ul class="toolbarmenu">
<li><roundcube:button command="mark" prop="read" label="markread" classAct="active" /></li>
<li><roundcube:button command="mark" prop="unread" label="markunread" classAct="active" /></li>
+ <li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="active" /></li>
+ <li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="active" /></li>
</ul>
</div>
</div>
<div id="quicksearchbar">
<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
-</div>
-
-<div id="messagecountbar">
-<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" />
-<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
- <roundcube:object name="messageCountDisplay" />
-<roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
-<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" />
</div>
<script type="text/javascript">
--
Gitblit v1.9.1