From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
skins/classic/templates/message.html | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html
index 9b7cb9f..007bfd3 100644
--- a/skins/classic/templates/message.html
+++ b/skins/classic/templates/message.html
@@ -14,6 +14,7 @@
</head>
<roundcube:if condition="env:extwin" />
<body class="extwin" onload="rcube_init_mail_ui()">
+<roundcube:object name="message" id="message" />
<roundcube:else />
<body onload="rcube_init_mail_ui()">
@@ -29,7 +30,7 @@
<div id="mailboxlist-container">
<div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
<div class="boxlistcontent">
- <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
+ <roundcube:object name="mailboxlist" id="mailboxlist" class="treelist" maxlength="25" />
</div>
<div class="boxfooter"></div>
</div>
@@ -40,7 +41,7 @@
<div class="boxlistcontent" style="top:0; overflow-x:auto">
<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
<roundcube:object name="messageFullHeaders" id="full-headers" />
-<roundcube:object name="messageAttachments" id="attachment-list" />
+<roundcube:object name="messageAttachments" id="attachment-list" maxlength="50" />
<roundcube:object name="messageObjects" id="message-objects" />
<roundcube:object name="messageBody" id="messagebody" />
</div>
@@ -57,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>
--
Gitblit v1.9.1