Display connection errors in UI. Stack error messages in popup (Larry skin)

pull/36/merge
Thomas Bruederli 12 years ago
parent 699cb1fda3
commit 464a0fba9d

@ -68,6 +68,9 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'])
// set main env variables, labels and page title
if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
// connect to storage server and trigger error on failure
$RCMAIL->storage_connect();
$mbox_name = $RCMAIL->storage->get_folder();
if (empty($RCMAIL->action)) {

@ -288,14 +288,21 @@ function rcube_mail_ui()
{
// show a popup dialog on errors
if (p.type == 'error' && rcmail.env.task != 'login') {
if (me.message_timer) {
window.clearTimeout(me.message_timer);
}
if (!me.messagedialog) {
me.messagedialog = $('<div>').addClass('popupdialog');
me.messagedialog = $('<div>').addClass('popupdialog').hide();
}
var pos = $(p.object).offset();
var msg = p.message,
pos = $(p.object).offset();
pos.top -= (rcmail.env.task == 'login' ? 20 : 160);
me.messagedialog.dialog('close');
me.messagedialog.html(p.message)
if (me.messagedialog.is(':visible'))
msg = me.messagedialog.html() + '<p>' + p.message + '</p>';
me.messagedialog.html(msg)
.dialog({
resizable: false,
closeOnEscape: true,
@ -310,7 +317,7 @@ function rcube_mail_ui()
minHeight: 90
}).show();
window.setTimeout(function(){ me.messagedialog.dialog('close'); }, Math.max(2000, p.timeout / 2));
me.message_timer = window.setTimeout(function(){ me.messagedialog.dialog('close'); }, Math.max(2000, p.timeout / 2));
}
}

Loading…
Cancel
Save