From 7a48e5539f2d2f1346d9f87a3c06c281a3078aa1 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 28 Mar 2010 13:52:34 -0400
Subject: [PATCH] - Re-organize editor buttons, add blockquote and search buttons - Make possible to write inside or after a quoted html message (#1485476)
---
CHANGELOG | 2 ++
program/steps/mail/compose.inc | 2 +-
program/js/editor.js | 4 ++--
program/steps/mail/sendmail.inc | 9 +++++++--
skins/default/editor_content.css | 7 +++++++
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 6cd656b..11ce596 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG RoundCube Webmail
===========================
+- Re-organize editor buttons, add blockquote and search buttons
+- Make possible to write inside or after a quoted html message (#1485476)
- Fix bugs on unexpected IMAP connection close (#1486190, #1486270)
- Iloha's imap.inc rewritten into rcube_imap_generic class
- Added contact groups in address book (not finished yet)
diff --git a/program/js/editor.js b/program/js/editor.js
index 10511a0..b1ef31b 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -43,8 +43,8 @@
theme : 'advanced',
language : editor_lang,
plugins : 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality' + (spellcheck ? ',spellchecker' : ''),
- theme_advanced_buttons1 : 'bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator' + (spellcheck ? ',spellchecker' : '') + ',undo,redo,image,media,ltr,rtl',
- theme_advanced_buttons2 : '',
+ theme_advanced_buttons1 : 'bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,outdent,indent,ltr,rtl,blockquote,|,forecolor,backcolor,fontselect,fontsizeselect',
+ theme_advanced_buttons2 : 'link,unlink,code,|,emotions,charmap,image,media,|,search' + (spellcheck ? ',spellchecker' : '') + ',undo,redo',
theme_advanced_buttons3 : '',
theme_advanced_toolbar_location : 'top',
theme_advanced_toolbar_align : 'left',
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 0765930..bf24503 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -613,7 +613,7 @@
$prefix = sprintf("<p>On %s, %s wrote:</p>\n",
$MESSAGE->headers->date,
htmlspecialchars(Q($MESSAGE->get_header('from'), 'replace'), ENT_COMPAT, $RCMAIL->output->get_charset()));
- $prefix .= '<blockquote type="cite" style="padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%">';
+ $prefix .= '<blockquote>';
if ($RCMAIL->config->get('top_posting')) {
$prefix = '<br>' . $prefix;
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 13210be..d6ef159 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -366,10 +366,15 @@
$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
if (!$savedraft) {
- // remove signature's div ID
- if ($isHtml)
+ if ($isHtml) {
+ // remove signature's div ID
$message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body);
+ // add inline css for blockquotes
+ $bstyle = 'padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%';
+ $message_body = preg_replace('/<blockquote>/',
+ '<blockquote type="cite" style="'.$bstyle.'">', $message_body);
+ }
// generic footer for all messages
if (!empty($CONFIG['generic_message_footer'])) {
$footer = file_get_contents(realpath($CONFIG['generic_message_footer']));
diff --git a/skins/default/editor_content.css b/skins/default/editor_content.css
index 946c7bf..8569b2f 100644
--- a/skins/default/editor_content.css
+++ b/skins/default/editor_content.css
@@ -22,3 +22,10 @@
white-space: pre;
word-wrap: break-word; /* IE (and Safari) */
}
+blockquote
+{
+ padding-left:5px;
+ border-left:#1010ff 2px solid;
+ margin-left:5px;
+ width:100%;
+}
--
Gitblit v1.9.1