Ticket #1484008: roundcube-preview-svn361.patch

config/main.inc.php.dist

@@ -171 +171 @@
 // Leave empty for default set of Google spell check languages
 $rcmail_config['spellcheck_languages'] = NULL;
 
+// Enable preview pane
+$rcmail_config['enable_preview'] = FALSE;
+
 // path to a text file which will be added to each sent message
 // paths are relative to the RoundCube root folder
 $rcmail_config['generic_message_footer'] = '';
@@ -216 +219 @@
 // prefer displaying HTML messages
 $rcmail_config['prefer_html'] = TRUE;
 
+// display preview pane if enabled
+$rcmail_config['preview'] = FALSE;
+
 // show pretty dates as standard
 $rcmail_config['prettydate'] = TRUE;
 

program/include/main.inc

@@ -1200 +1200 @@
         'editorselector' => 'rcmail_editor_selector',
         'searchform' => 'rcmail_search_form',
         'receiptcheckbox' => 'rcmail_receipt_checkbox',
+        'preview' => 'rcmail_message_preview',
         
         // ADDRESS BOOK
         'addresslist' => 'rcmail_contacts_list',

program/localization/nl_NL/labels.inc

@@ -202 +202 @@
 $labels['pagesize']  = 'Rijen per pagina';
 $labels['signature'] = 'Onderschrift';
 $labels['dstactive']  = 'Zomertijd';
+$labels['preview'] = 'Voorbeeldvenster';
 
 $labels['folder']  = 'Map';
 $labels['folders']  = 'Mappen';

program/localization/en_US/labels.inc

@@ -207 +207 @@
 $labels['dstactive']  = 'Daylight savings';
 $labels['htmleditor'] = 'Compose HTML messages';
 $labels['htmlsignature'] = 'HTML signature';
+$labels['preview'] = 'Preview message';
 
 $labels['autosavedraft']  = 'Automatically save draft';
 $labels['everynminutes']  = 'every $n minutes';

program/js/app.js

@@ -135 +135 @@
           }
 
         // enable mail commands
-        this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', true);
+        this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', 'load-attachment', true);
         
         if (this.env.action=='show')
           {
@@ -552 +552 @@
           var input_pagesize = rcube_find_object('_pagesize');
           var input_name  = rcube_find_object('_name');
           var input_email = rcube_find_object('_email');
+          var input_preview = rcube_find_object('_preview');
 
           // user prefs
           if (input_pagesize && isNaN(input_pagesize.value))
@@ -1039 +1040 @@
       this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
       this.enable_command('delete', 'moveto', list.selection.length>0 ? true : false);
       }
+    if (selected && this.env.enable_preview && this.env.preview)
+      this.show_preview(list.selection[0]);
    };
 
 
@@ -1067 +1070 @@
   /*********************************************************/
 
 
+  this.show_preview = function(id, safe)
+    {
+    var add_url = '';
+    var target = window;
+    var contentframe = rcube_find_object('mailcontframe');
+    var previewpane = rcube_find_object('previewpane');
+
+    if (id && contentframe && previewpane)
+      {
+      rcmail.set_busy(true, 'loading');
+      if (previewpane.style.display=='none')
+        {
+        contentframe.style.height = (contentframe.offsetHeight/2) + 'px';
+        previewpane.style.top = (contentframe.offsetTop+contentframe.offsetHeight) + 'px';
+        previewpane.style.display = 'block';
+        var message = rcube_find_object('rcmrow' + id);
+        message.scrollIntoView();
+        }
+      var url = '_action=preview&_uid='+id;
+      rcmail.http_request('preview', url, true);
+      }
+    };
+
+
   // when user doble-clicks on a row
   this.show_message = function(id, safe)
     {
@@ -3115 +3142 @@
       case 'expunge':
         this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false);
         break;
+
+      case 'preview':
+        var previewpane = rcube_find_object('previewpane');
+        previewpane.innerHTML = request_obj.get_text();
+        previewpane.scrollTop = 0;
+        break;
       }
 
     request_obj.reset();

program/steps/settings/func.inc

@@ -155 +155 @@
                   rep_specialchars_output(rcube_label('htmleditor')),
                   $input_htmleditor->show($CONFIG['htmleditor']?1:0));
 
+  // Show option for preview pane
+  if ($CONFIG['enable_preview'])
+    {
+    $field_id = 'rcmfd_preview';
+    $input_preview = new checkbox(array('name' => '_preview', 'id' => $field_id, 'value' => 1));
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    rep_specialchars_output(rcube_label('preview')),
+                    $input_preview->show($CONFIG['preview']?1:0));
+    }
+
   if (!empty($CONFIG['drafts_mbox']))
     {
     $field_id = 'rcmfd_autosave';
@@ -242 +253 @@
   }
 
 
-?>
- No newline at end of file
+?>

program/steps/settings/save_prefs.inc

@@ -29 +29 @@
 $a_user_prefs['pagesize'] = is_numeric($_POST['_pagesize']) ? (int)$_POST['_pagesize'] : $CONFIG['pagesize'];
 $a_user_prefs['prefer_html'] = isset($_POST['_prefer_html']) ? TRUE : FALSE;
 $a_user_prefs['htmleditor'] = isset($_POST['_htmleditor']) ? TRUE : FALSE;
+if ($CONFIG['enable_preview'])
+  $a_user_prefs['preview'] = isset($_POST['_preview']) ? TRUE : FALSE;
 $a_user_prefs['draft_autosave'] = isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0;
 
+
 // MM: Date format toggle (Pretty / Standard)
 $a_user_prefs['prettydate'] = isset($_POST['_pretty_date']) ? TRUE : FALSE;
 

program/steps/mail/show.inc

@@ -171 +171 @@
 
 if ($_action=='print')
   parse_template('printmessage');
+else if ($_action=='preview')
+  parse_template('previewmessage');
 else
   parse_template('message');
-?>
- No newline at end of file
+?>

program/steps/mail/func.inc

@@ -480 +480 @@
   $javascript .= sprintf("%s.set_env('pagecount', %d);\n", $JS_OBJECT_NAME, ceil($message_count/$IMAP->page_size));
   $javascript .= sprintf("%s.set_env('sort_col', '%s');\n", $JS_OBJECT_NAME, $sort_col);
   $javascript .= sprintf("%s.set_env('sort_order', '%s');\n", $JS_OBJECT_NAME, $sort_order);
+  if ($CONFIG['enable_preview'])
+    $javascript .= sprintf("%s.set_env('preview', '%s');\n", $JS_OBJECT_NAME, $CONFIG['preview']);
   
   if ($attrib['messageicon'])
     $javascript .= sprintf("%s.set_env('messageicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['messageicon']);

skins/default/templates/mail.html

@@ -52 +52 @@
   attachmentIcon="/images/icons/attachment.png" />
 </div>
 
+<div id="previewpane" style="display: none;"></div>
+
 <div id="listcontrols">
 <roundcube:label name="select" />:&nbsp;
 <roundcube:button command="select-all" label="all" classAct="active" />&nbsp;

skins/default/templates/previewmessage.html

@@ +1 @@
+<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" />
+<roundcube:object name="messageAttachments" id="attachment-list" />
+<roundcube:object name="blockedObjects" id="remote-objects-message" />
+<pre><roundcube:object name="messageBody" id="messagebody" showImages="true" /></pre>

skins/default/mail.css

@@ -120 +120 @@
   height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
 }
 
+#previewpane
+{
+  position: absolute;
+  display: none;
+  top: 85px;
+  left: 200px;
+  right: 40px;
+  bottom: 40px;
+  border: 1px solid #999999;
+  border-top: none;
+  background-color: #F9F9F9;
+  overflow: auto;
+  /* css hack for IE */
+  width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
+  height: expression((
+    parseInt(document.documentElement.clientHeight) -
+    parseInt(document.getElementById('mailcontframe').clientHeight) - 125)+'px');
+}
 
+body > div#previewpane
+{
+  height: auto;
+}
+
 #messagepartframe
 {
   border: 1px solid #999999;

index.php

@@ -262 +262 @@
   {
   include_once('program/steps/mail/func.inc');
   
-  if ($_action=='show' || $_action=='print')
+  if ($_action=='show' || $_action=='print' || $_action=='preview')
     include('program/steps/mail/show.inc');
 
   if ($_action=='get')