From 9e55503dadb2af1437590bed8b8e1ee0911a5518 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 9 Jul 2010 19:18:06 +0000
Subject: - Unified rcmail_ui popups handling

---
 skins/default/templates/mail.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'skins/default/templates/mail.html')

diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 9b725751e..55fbc73a1 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -31,8 +31,7 @@
 <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
 </div>
 <div class="boxfooter">
-  <!--<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=" " />
+  <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " />
 
 <roundcube:if condition="env:quota" />
 <img id="quotaimg" src="/images/quota.gif" alt="" />
@@ -125,8 +124,8 @@
 <roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " />
 <roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " />
 <roundcube:container name="toolbar" id="messagetoolbar" />
-<roundcube:button name="markreadbutton" id="markreadbutton" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_markmenu();return false" content=" " />
-<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="messageactions" onclick="rcmail_ui.show_messagemenu();return false" content=" " />
+<roundcube:button name="markmenulink" id="markmenulink" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_popup('markmenu');return false" content=" " />
+<roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="messageactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " />
 </div>
 
 <div id="markmessagemenu" class="popupmenu">
@@ -157,7 +156,7 @@
   <label for="rcmlistfilter"><roundcube:label name="filter" /></label>:
   <roundcube:object name="searchfilter" class="searchfilter" />
 </div>
-<roundcube:button name="searchmod" id="searchmod" image="/images/icons/glass_roll.png" onclick="rcmail_ui.show_searchmenu();return false" title="searchmod" />
+<roundcube:button name="searchmenulink" id="searchmenulink" image="/images/icons/glass_roll.png" onclick="rcmail_ui.show_popup('searchmenu');return false" title="searchmod" />
 <roundcube:object name="searchform" id="quicksearchbox" />
 <roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
 </div>
-- 
cgit v1.2.3