From e9b5a6c2d55f1fc31715ad7ff05aed631cc12699 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 08 Jun 2010 16:50:15 -0400
Subject: [PATCH] Unify directory/mailbox list actions
---
skins/default/templates/mail.html | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index b28dcff..504d07e 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -26,8 +26,14 @@
<div id="mainscreen">
<div id="mailleftcontainer">
<div id="mailboxlist-container">
-<div class="boxtitle"><roundcube:label name="mailboxlist" /></div>
+<div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
+<div id="directorylistwarp">
<roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
+</div>
+<div id="directorylistbuttons">
+ <!--><roundcube:button name="togglequota" type="link" title="showquota" class="buttonPas showinfo" classAct="button showinfo" onclick="rcmail_ui.toggle_quotadisplay();return false" content=" " />-->
+ <roundcube:button name="mboxactions" id="mboxactionslink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_mailboxmenu();return false" content=" " />
+</div>
</div>
<script type="text/javascript">
@@ -35,12 +41,6 @@
rcmail.add_onload('mailviewsplitv.init()');
</script>
-<div id="mailboxcontrols">
- <span><roundcube:label name="folder" />: </span>
- <roundcube:button command="expunge" type="link" title="compact" class="buttonPas expunge" classAct="button expunge" classSel="button expungesel" content=" " />
- <roundcube:button command="purge" type="link" title="empty" class="buttonPas purge" classAct="button purge" classSel="button purgesel" content=" " />
- <roundcube:container name="mailboxcontrols" id="mailboxcontrols" />
-</div>
</div>
<div id="mailrightcontainer">
@@ -161,6 +161,15 @@
</ul>
</div>
+<div id="mailboxoptionsmenu" class="popupmenu">
+ <ul>
+ <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
+ <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+ <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+ <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
+ </ul>
+</div>
+
<div id="listmenu" class="popupmenu">
<roundcube:if condition="env:threads" />
<fieldset class="thinbordered"><legend><roundcube:label name="listmode" /></legend>
--
Gitblit v1.9.1