diff options
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | program/js/app.js | 7 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 22 | ||||
| -rw-r--r-- | program/steps/mail/list.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 1 |
5 files changed, 37 insertions, 0 deletions
@@ -1,6 +1,11 @@ CHANGELOG RoundCube Webmail --------------------------- +2008/08/14 (thomasb) +---------- +- Use current mailbox name in template (#1485256) +- Better fix for skipping untagged responses (#1485261) + 2008/08/09 (alec) ---------- - Case insensitive contacts searching using PostgreSQL (#1485259) diff --git a/program/js/app.js b/program/js/app.js index 58d117591..998efd7a2 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -3409,6 +3409,13 @@ function rcube_webmail() }; + // replace content of mailboxname display + this.set_mailboxname = function(content) + { + if (this.gui_objects.mailboxname && content) + this.gui_objects.mailboxname.innerHTML = content; + }; + // replace content of quota display this.set_quota = function(content) { diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 7a986c16b..a40811155 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -529,6 +529,27 @@ function rcmail_get_messagecount_text($count=NULL, $page=NULL) return Q($out); } +/** + * + */ +function rcmail_mailbox_name_display($attrib) +{ + global $RCMAIL; + + if (!$attrib['id']) + $attrib['id'] = 'rcmmailboxname'; + + $RCMAIL->output->add_gui_object('mailboxname', $attrib['id']); + + return html::span($attrib, rcmail_get_mailbox_name_text()); +} + +function rcmail_get_mailbox_name_text() +{ + global $RCMAIL; + return rcmail_localize_foldername($RCMAIL->imap->get_mailbox_name()); +} + /** * Convert the given message part to proper HTML @@ -1179,6 +1200,7 @@ $OUTPUT->add_handlers(array( 'messages' => 'rcmail_message_list', 'messagecountdisplay' => 'rcmail_messagecount_display', 'quotadisplay' => 'rcmail_quota_display', + 'mailboxname' => 'rcmail_mailbox_name_display', 'messageheaders' => 'rcmail_message_headers', 'messagebody' => 'rcmail_message_body', 'messagecontentframe' => 'rcmail_messagecontent_frame', diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index e2fafc2fc..e09919cb2 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.inc @@ -51,6 +51,8 @@ $pages = ceil($count/$IMAP->page_size); $OUTPUT->set_env('messagecount', $count); $OUTPUT->set_env('pagecount', $pages); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count)); +$OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text()); + // add message rows diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index ef88c7baf..4256458d3 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -194,6 +194,7 @@ function rcmail_remote_objects_msg($attrib) $OUTPUT->add_handlers(array( 'messageattachments' => 'rcmail_message_attachments', + 'mailboxname' => 'rcmail_mailbox_name_display', 'blockedobjects' => 'rcmail_remote_objects_msg')); |