diff options
| -rw-r--r-- | program/js/app.js | 2 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 2 | ||||
| -rw-r--r-- | skins/classic/includes/messagetoolbar.html | 4 | ||||
| -rw-r--r-- | skins/larry/includes/mailtoolbar.html | 4 |
4 files changed, 2 insertions, 10 deletions
diff --git a/program/js/app.js b/program/js/app.js index cf942e291..4d784e532 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -2447,7 +2447,7 @@ function rcube_webmail() // set message row status, class and icon this.set_message = function(uid, flag, status) { - var row = this.message_list.rows[uid]; + var row = this.message_list && this.message_list.rows[uid]; if (!row) return false; diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 82c826108..029bc5f8d 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -104,7 +104,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { if (!$OUTPUT->ajax_call) $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', - 'movingmessage', 'deletingmessage'); + 'movingmessage', 'deletingmessage', 'markingmessage'); // check for unset disposition notification if ($MESSAGE->headers->mdn_to diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html index ecaf8f79b..8e0958f96 100644 --- a/skins/classic/includes/messagetoolbar.html +++ b/skins/classic/includes/messagetoolbar.html @@ -16,9 +16,7 @@ </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:if condition="template:name == 'mail'" /> <roundcube:button name="markmenulink" id="markmenulink" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_popup('markmenu');return false" content=" " /> -<roundcube:endif /> <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="moreactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " /> <roundcube:if condition="template:name == 'message'" /> <roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" folder_filter="mail" /> @@ -52,7 +50,6 @@ </ul> </div> -<roundcube:if condition="template:name == 'mail'" /> <div id="markmessagemenu" class="popupmenu"> <ul class="toolbarmenu"> <li><roundcube:button command="mark" prop="read" label="markread" classAct="readlink active" class="readlink" /></li> @@ -62,4 +59,3 @@ <roundcube:container name="markmenu" id="markmessagemenu" /> </ul> </div> -<roundcube:endif /> diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html index 60cebe01b..31472cbb3 100644 --- a/skins/larry/includes/mailtoolbar.html +++ b/skins/larry/includes/mailtoolbar.html @@ -12,9 +12,7 @@ <roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="printmessage" /> <roundcube:endif /> <roundcube:container name="toolbar" id="mailtoolbar" /> -<roundcube:if condition="template:name == 'mail'" /> <roundcube:button name="markmenulink" id="markmessagemenulink" type="link" class="button markmessage" label="mark" title="markmessages" onclick="UI.show_popup('markmessagemenu');return false" /> -<roundcube:endif /> <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button more" label="more" title="moreactions" onclick="UI.show_popup('messagemenu');return false" /> <div id="forwardmenu" class="popupmenu"> @@ -44,7 +42,6 @@ </ul> </div> -<roundcube:if condition="template:name == 'mail'" /> <div id="markmessagemenu" class="popupmenu"> <ul class="toolbarmenu iconized"> <li><roundcube:button command="mark" prop="read" label="markread" classAct="icon active" class="icon" innerclass="icon read" /></li> @@ -54,4 +51,3 @@ <roundcube:container name="markmenu" id="markmessagemenu" /> </ul> </div> -<roundcube:endif /> |