diff options
| -rw-r--r-- | program/js/app.js | 3 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 5 | ||||
| -rw-r--r-- | skins/default/templates/message.html | 14 | ||||
| -rw-r--r-- | skins/default/templates/messageerror.html | 14 |
4 files changed, 33 insertions, 3 deletions
diff --git a/program/js/app.js b/program/js/app.js index df512d06d..3067794e8 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -5022,7 +5022,8 @@ function rcube_webmail() this.enable_command(this.env.message_commands, 'purge', 'expunge', 'select-all', 'select-none', 'sort', 'expand-all', 'expand-unread', 'collapse-all', false); } - this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount }); + if (this.message_list) + this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount }); } break; diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index e130ecb76..71cbf7086 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -64,7 +64,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { if (!$OUTPUT->ajax_call) $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage'); - + // check for unset disposition notification if ($MESSAGE->headers->mdn_to && !$MESSAGE->headers->mdn_sent && !$MESSAGE->headers->seen && @@ -128,6 +128,9 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { $OUTPUT->set_env('next_uid', $next); if ($last > 0) $OUTPUT->set_env('last_uid', $last); + + // Don't need a real messages count value + $OUTPUT->set_env('messagecount', 1); } if (!$MESSAGE->headers->seen && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0))) diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html index bd3291b9f..0bafc3e08 100644 --- a/skins/default/templates/message.html +++ b/skins/default/templates/message.html @@ -35,9 +35,12 @@ <div id="mailleftcontainer"> <div id="mailboxlist-container"> <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div> -<div id="directorylistwarp" style="bottom:0px"> +<div class="boxlistcontent"> <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" /> </div> +<div class="boxfooter"> + <roundcube:button name="mboxactions" id="mboxactionslink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_mailboxmenu();return false" content=" " /> +</div> </div> </div> @@ -65,5 +68,14 @@ rcmail.add_onload('mailviewsplitv.init()'); </script> +<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> + </body> </html> diff --git a/skins/default/templates/messageerror.html b/skins/default/templates/messageerror.html index 0bd591a2a..3712217a3 100644 --- a/skins/default/templates/messageerror.html +++ b/skins/default/templates/messageerror.html @@ -41,8 +41,13 @@ <div id="mailleftcontainer"> <div id="mailboxlist-container"> <div class="boxtitle"><roundcube:label name="mailboxlist" /></div> +<div class="boxlistcontent"> <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" /> </div> +<div class="boxfooter"> + <roundcube:button name="mboxactions" id="mboxactionslink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_mailboxmenu();return false" content=" " /> +</div> +</div> </div> <div id="messageframe" style="background-color:#F2F2F2;"> @@ -58,6 +63,15 @@ rcmail.add_onload('mailviewsplitv.init()'); </script> +<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> + </body> <roundcube:endif /> |