summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/mail/func.inc8
-rw-r--r--skins/classic/print.css1
-rw-r--r--skins/larry/mail.css1
-rw-r--r--skins/larry/print.css1
5 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e2bb3e974..09cb29065 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix absolute positioning in HTML messages (#1488819)
- Fix cache (in)validation after setting \Deleted flag
- Fix keybord events on messages list in opera browser (#1488823)
- Fix selection of collapsed thread rows (#1488772)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 9864ca7a0..33ac1a206 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1061,10 +1061,10 @@ function rcmail_localized_priority($value)
'4' => 'low',
'5' => 'lowest',
);
-
+
if ($value && $labels_map[$value])
return rcube_label($labels_map[$value]);
-
+
return '';
}
@@ -1488,7 +1488,9 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
$mailto = rcube_idn_to_utf8($mailto);
if ($PRINT_MODE) {
- $out .= sprintf('%s <%s>', Q($name), $mailto);
+ $out .= ($out ? ', ' : '') . sprintf('%s <%s>', Q($name), $mailto);
+ // for printing we display all addresses
+ continue;
}
else if (check_email($part['mailto'], false)) {
if ($linked) {
diff --git a/skins/classic/print.css b/skins/classic/print.css
index 129770d25..34125b0d3 100644
--- a/skins/classic/print.css
+++ b/skins/classic/print.css
@@ -82,6 +82,7 @@ table.headers-table tr td.subject
#messagebody
{
+ position: relative;
margin-top: 5mm;
border-top: none;
}
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 462d608b2..71b33571c 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -972,6 +972,7 @@ div.hide-headers {
}
#messagebody {
+ position: relative;
margin: 8px;
}
diff --git a/skins/larry/print.css b/skins/larry/print.css
index 484905d4f..fa256746b 100644
--- a/skins/larry/print.css
+++ b/skins/larry/print.css
@@ -77,6 +77,7 @@ table.headers-table tr td.subject {
}
#messagebody {
+ position: relative;
margin-top: 5mm;
border-top: none;
}