summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/mail/func.inc9
-rw-r--r--skins/default/mail.css5
3 files changed, 14 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fa7e9dbd7..204c97db7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Colorized signatures in plain text messages
- Reviewed/fixed skip_deleted/read_when_deleted/flag_for_deletion options handling in UI
- Fix displaying of big maximum upload filesize (#1485889)
- Added possibility to invert messages selection
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 213b67e8e..661913810 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -819,7 +819,14 @@ function rcmail_print_body($part, $p = array())
// quote plain text
$body = Q(join("\n", $a_lines), 'replace', false);
- // ... colorize quoted lines
+ // colorize signature
+ if (($sp = strrpos($body, '-- ')) !== false)
+ if (($sp == 0 || $body[$sp-1] == "\n") && $body[$sp+3] == "\n") {
+ $body = substr($body, 0, max(0, $sp))
+ .'<span class="sig">'.substr($body, $sp).'</span>';
+ }
+
+ // colorize quoted lines
$a_lines = preg_split('/\n/', $body);
foreach ($q_lines as $i => $q)
if ($q['quote'])
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 8030313e4..f6087ebfe 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -884,6 +884,11 @@ div.message-part div.pre
white-space: pre;
}
+div.message-part span.sig
+{
+ color: #666666;
+}
+
div.message-part blockquote
{
color: blue;