summaryrefslogtreecommitdiff
path: root/skins/default/templates
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-05-13 17:22:35 +0000
committeralecpl <alec@alec.pl>2011-05-13 17:22:35 +0000
commit8e99ffbcaccf83602a47b2be230eb4dd2f106399 (patch)
tree50390a0c5594568db2ba536c369d219734a6f99f /skins/default/templates
parenta208a4fa68d3c26c34ca3dae250267fec761675c (diff)
- Use less included files in mail and message templates for better performance
- Add access to template name in template expressions
Diffstat (limited to 'skins/default/templates')
-rw-r--r--skins/default/templates/mail.html33
-rw-r--r--skins/default/templates/message.html23
2 files changed, 2 insertions, 54 deletions
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 7ea93145d..ea6a2f71c 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -102,41 +102,10 @@
</div>
</div>
-
-</div>
-</div>
-
-<div id="messagetoolbar">
-<roundcube:button command="checkmail" type="link" class="button checkmail" classAct="button checkmail" classSel="button checkmailSel" title="checkmail" content=" " />
-<roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
-<roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " />
-<span class="dropbutton">
-<roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " />
-<span id="replyallmenulink" onclick="rcmail_ui.show_popup('replyallmenu');return false"></span>
-</span>
-<span class="dropbutton">
-<roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " />
-<span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span>
-</span>
-<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="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">
- <ul class="toolbarmenu">
- <li><roundcube:button command="mark" prop="read" label="markread" classAct="readlink active" class="readlink" /></li>
- <li><roundcube:button command="mark" prop="unread" label="markunread" classAct="unreadlink active" class="unreadlink" /></li>
- <li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="flaggedlink active" class="flaggedlink" /></li>
- <li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="unflaggedlink active" class="unflaggedlink" /></li>
- <roundcube:container name="markmenu" id="markmessagemenu" />
- </ul>
</div>
-<roundcube:include file="/includes/replyallmenu.html" />
-<roundcube:include file="/includes/forwardmenu.html" />
-<roundcube:include file="/includes/messagemenu.html" />
+<roundcube:include file="/includes/messagetoolbar.html" />
<div id="searchmenu" class="popupmenu">
<ul class="toolbarmenu">
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 3fd14e4b6..8e2bb2cb3 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -16,28 +16,7 @@
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
-
-<div id="messagetoolbar">
-<roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
-<roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
-<roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " />
-<span class="dropbutton">
-<roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " />
-<span id="replyallmenulink" onclick="rcmail_ui.show_popup('replyallmenu');return false"></span>
-</span>
-<span class="dropbutton">
-<roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " />
-<span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span>
-</span>
-<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="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="messageactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " />
-<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" folder_filter="mail" />
-</div>
-
-<roundcube:include file="/includes/replyallmenu.html" />
-<roundcube:include file="/includes/forwardmenu.html" />
-<roundcube:include file="/includes/messagemenu.html" />
+<roundcube:include file="/includes/messagetoolbar.html" />
<div id="mainscreen">
<div id="mailleftcontainer">