From 5e71bb664b6c2b43c68402cd3d5a9f7623674e22 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <nkinkade@nkinka.de>
Date: Sun, 22 Mar 2009 01:59:47 +0000
Subject: Make main message interface buttons use configured Archives and
 Ham-not-spam folders.

---
 roundcubemail/skins/npk/templates/mail.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/roundcubemail/skins/npk/templates/mail.html b/roundcubemail/skins/npk/templates/mail.html
index e87e7912f..2326e98ec 100644
--- a/roundcubemail/skins/npk/templates/mail.html
+++ b/roundcubemail/skins/npk/templates/mail.html
@@ -93,7 +93,7 @@
 
 <div id="messagetoolbar">
 <ul id="actionmenu">
-<li><roundcube:button name="archivemessage" id="archivemessage" type="link" label="buttonbararchive" image="NONE" title="archivemessage" onclick="rcmail.command('moveto', 'archives')" title="archivemessages" /></li>
+<li><a href="#" name="archivemessages" id="archivemessages" title="<roundcube:label name='archivemessages'/>" onclick="rcmail.command('moveto','<roundcube:var name=\'env:archive_mailbox\' />',this);"><roundcube:label name="buttonbararchive" /></a></li>
 &nbsp;
 <li id="markmessagebutton"><roundcube:button name="markmessagearrow" id="markmessagearrow" title="markmessages" onclick="rcmail_ui.show_markmenu();return false" label="buttonbarmark" image="/images/arrow_down.png" /></li>
 <li id="movemessagebutton"><roundcube:button name="movemessagearrow" id="movemessagearrow" title="movemessages" onclick="rcmail_ui.show_movemenu();return false" label="buttonbarmove" image="/images/arrow_down.png" /></li>
@@ -103,7 +103,10 @@
 <li><roundcube:button command="forward" type="link" label="buttonbarforward" title="forwardmessage" /></li>
 &nbsp;
 <li><roundcube:button command="compose" type="link" label="buttonbarcompose" title="writenewmessage" /></li>
-<li id="notjunkbutton" style="display: none"><roundcube:button name="notjunk" id="notjunk" type="link" label="buttonbarnotjunk" title="notjunkmessages" onclick="rcmail.command('copyto','INBOX',this);rcmail.command('moveto','HamNotSpam',this)" /></li>
+
+<li id="notjunkbutton" style="display: none">
+<a href="#" name="notjunk" id="notjunk" title="<roundcube:label name='notjunkmessages' />" onclick="rcmail.command('copyto','INBOX',this);rcmail.command('moveto','<roundcube:var name=\'env:hamnotspam_mailbox\' />',this)"><roundcube:label name="buttonbarnotjunk" /></a></li>
+
 <li id="shredbutton" style="display: none"><roundcube:button name="shred" id="shred" type="link" label="buttonbarshred" title="shredmessages" onclick="rcmail.command('delete', this)" /></li>
 &nbsp;&nbsp;<a href="#" onclick="return rcmail.command('checkmail','',this)">Refresh</a>
 </ul>
-- 
cgit v1.2.3