diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-07 17:49:52 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-07-07 17:49:52 +0000 |
| commit | 05dd257c5d512e5e755963d21a4a58f9e5abf6dd (patch) | |
| tree | 90b56e5f69271f6acf3c1445672b45d4e234e44b | |
| parent | bd574bcf3ca5bd8872d972bf80d47fe762c44052 (diff) | |
- if message wasn't found in preview mode display separate template
git-svn-id: https://svn.roundcube.net/trunk@2723 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/steps/mail/show.inc | 10 | ||||
| -rw-r--r-- | roundcubemail/skins/default/templates/messageerror.html | 14 |
2 files changed, 21 insertions, 3 deletions
diff --git a/roundcubemail/program/steps/mail/show.inc b/roundcubemail/program/steps/mail/show.inc index 2395ac604..423b9332c 100644 --- a/roundcubemail/program/steps/mail/show.inc +++ b/roundcubemail/program/steps/mail/show.inc @@ -29,11 +29,15 @@ if ($_GET['_uid']) { if (!empty($MESSAGE->headers->charset)) $IMAP->set_charset($MESSAGE->headers->charset); - // go back to list if message not found (wrong UID) + // if message not found (wrong UID)... if (empty($MESSAGE->headers)) { $OUTPUT->show_message('messageopenerror', 'error'); - if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview')) - $OUTPUT->send('messagepreview'); + // ... display error or preview page + if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messageerror')) + $OUTPUT->send('messageerror'); + else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview')) + $OUTPUT->send('messagepreview'); + // ... go back to the list else { rcmail_overwrite_action(''); return; diff --git a/roundcubemail/skins/default/templates/messageerror.html b/roundcubemail/skins/default/templates/messageerror.html new file mode 100644 index 000000000..d180e7435 --- /dev/null +++ b/roundcubemail/skins/default/templates/messageerror.html @@ -0,0 +1,14 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title></title> +<roundcube:include file="/includes/links.html" /> +</head> +<body class="iframe" style="background-color:#F2F2F2;"> + +<div style="margin:20px auto; text-align:center"> +<img src="/images/watermark.gif" width="260" height="228" alt="" /> +</div> + +</body> +</html> |