Changeset 3435 in subversion

Timestamp:

Mar 28, 2010 1:52:34 PM (3 years ago)

Author:

alec

Message:

• Re-organize editor buttons, add blockquote and search buttons
• Make possible to write inside or after a quoted html message (#1485476)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/editor.js (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (1 diff)
• program/steps/mail/sendmail.inc (modified) (1 diff)
• skins/default/editor_content.css (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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

trunk/roundcubemail/program/js/editor.js

@@ -44 +44 @@
       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',

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -614 +614 @@
       $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')) {

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -367 +367 @@
 
 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'])) {

trunk/roundcubemail/skins/default/editor_content.css

@@ -23 +23 @@
         word-wrap: break-word; /* IE (and Safari) */
 }
+blockquote
+{
+        padding-left:5px;
+        border-left:#1010ff 2px solid;
+        margin-left:5px;
+        width:100%;
+}