Changeset 8e99ffb in github


Ignore:
Timestamp:
May 13, 2011 1:22:35 PM (2 years ago)
Author:
alecpl <alec@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
445a4ca
Parents:
a208a4f
Message:
  • Use less included files in mail and message templates for better performance
  • Add access to template name in template expressions
Files:
1 added
3 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • program/include/rcube_template.php

    r79275b4 r8e99ffb  
    3939    private $object_handlers = array(); 
    4040    private $plugin_skin_path; 
     41    private $template_name; 
    4142 
    4243    public $browser; 
    … …  
    366367        $realname  = $name; 
    367368        $temp      = explode('.', $name, 2); 
     369 
    368370        $this->plugin_skin_path = null; 
     371        $this->template_name    = $realname; 
    369372 
    370373        if (count($temp) > 1) { 
    … …  
    601604                '/request:([a-z0-9_]+)/i', 
    602605                '/cookie:([a-z0-9_]+)/i', 
    603                 '/browser:([a-z0-9_]+)/i' 
     606                '/browser:([a-z0-9_]+)/i', 
     607                '/template:name/i', 
    604608            ), 
    605609            array( 
    … …  
    609613                "get_input_value('\\1', RCUBE_INPUT_GPC)", 
    610614                "\$_COOKIE['\\1']", 
    611                 "\$this->browser->{'\\1'}" 
     615                "\$this->browser->{'\\1'}", 
     616                $this->template_name, 
    612617            ), 
    613618            $expression); 

  • skins/default/templates/mail.html

    ra208a4f r8e99ffb  
    103103</div> 
    104104 
    105  
    106 </div> 
    107 </div> 
    108  
    109 <div id="messagetoolbar"> 
    110 <roundcube:button command="checkmail" type="link" class="button checkmail" classAct="button checkmail" classSel="button checkmailSel" title="checkmail" content=" " /> 
    111 <roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " /> 
    112 <roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " /> 
    113 <span class="dropbutton"> 
    114 <roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " /> 
    115 <span id="replyallmenulink" onclick="rcmail_ui.show_popup('replyallmenu');return false"></span> 
    116 </span> 
    117 <span class="dropbutton"> 
    118 <roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " /> 
    119 <span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span> 
    120 </span> 
    121 <roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " /> 
    122 <roundcube:container name="toolbar" id="messagetoolbar" /> 
    123 <roundcube:button name="markmenulink" id="markmenulink" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_popup('markmenu');return false" content=" " /> 
    124 <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="messageactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " /> 
    125 </div> 
    126  
    127 <div id="markmessagemenu" class="popupmenu"> 
    128   <ul class="toolbarmenu"> 
    129     <li><roundcube:button command="mark" prop="read" label="markread" classAct="readlink active" class="readlink" /></li> 
    130     <li><roundcube:button command="mark" prop="unread" label="markunread" classAct="unreadlink active" class="unreadlink" /></li> 
    131     <li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="flaggedlink active" class="flaggedlink" /></li> 
    132     <li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="unflaggedlink active" class="unflaggedlink" /></li> 
    133     <roundcube:container name="markmenu" id="markmessagemenu" /> 
    134   </ul> 
    135 </div> 
    136  
    137 <roundcube:include file="/includes/replyallmenu.html" /> 
    138 <roundcube:include file="/includes/forwardmenu.html" /> 
    139 <roundcube:include file="/includes/messagemenu.html" /> 
     105</div> 
     106</div> 
     107 
     108<roundcube:include file="/includes/messagetoolbar.html" /> 
    140109 
    141110<div id="searchmenu" class="popupmenu"> 

  • skins/default/templates/message.html

    ra208a4f r8e99ffb  
    1717<roundcube:include file="/includes/taskbar.html" /> 
    1818<roundcube:include file="/includes/header.html" /> 
    19  
    20 <div id="messagetoolbar"> 
    21 <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " /> 
    22 <roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " /> 
    23 <roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " /> 
    24 <span class="dropbutton"> 
    25 <roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " /> 
    26 <span id="replyallmenulink" onclick="rcmail_ui.show_popup('replyallmenu');return false"></span> 
    27 </span> 
    28 <span class="dropbutton"> 
    29 <roundcube:button command="forward" type="link" class="buttonPas forward" classAct="button forward" classSel="button forwardSel" title="forwardmessage" content=" " /> 
    30 <span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span> 
    31 </span> 
    32 <roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " /> 
    33 <roundcube:container name="toolbar" id="messagetoolbar" /> 
    34 <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="messageactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " /> 
    35 <roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" folder_filter="mail" /> 
    36 </div> 
    37  
    38 <roundcube:include file="/includes/replyallmenu.html" /> 
    39 <roundcube:include file="/includes/forwardmenu.html" /> 
    40 <roundcube:include file="/includes/messagemenu.html" /> 
     19<roundcube:include file="/includes/messagetoolbar.html" /> 
    4120 
    4221<div id="mainscreen"> 
Note: See TracChangeset for help on using the changeset viewer.