Ticket #1295420: roundcubemail.patch

program/include/main.inc

@@ -1322 +1322 @@
         'mailboxlist' => 'rcmail_mailbox_list',
         'message' => 'rcmail_message_container',
+        'messagesheaders' => 'rcmail_message_list_headers',
         'messages' => 'rcmail_message_list',
         'messagecountdisplay' => 'rcmail_messagecount_display',

program/js/app.js

@@ -2991 +2991 @@
     // set correct list titles
     var cell, col;
-    var thead = this.gui_objects.messagelist ? this.gui_objects.messagelist.tHead : null;
+    var thead = this.gui_objects.messagelistheaders ? this.gui_objects.messagelistheaders.tHead : null;
     for (var n=0; thead && n<this.coltypes.length; n++) 
       {

program/steps/mail/func.inc

@@ -290 +290 @@
 
 
-// return the message list as HTML table
-function rcmail_message_list($attrib)
+// return the message list headers as HTML table
+function rcmail_message_list_headers($attrib)
   {
   global $IMAP, $CONFIG, $COMM_PATH, $OUTPUT, $JS_OBJECT_NAME;
@@ -305 +305 @@
   rcube_add_label('from', 'to');
 
-  // get message headers
-  $a_headers = $IMAP->list_headers('', '', $sort_col, $sort_order);
-
   // add id to message list table if not specified
   if (!strlen($attrib['id']))
-    $attrib['id'] = 'rcubemessagelist';
+    $attrib['id'] = 'rcubemessagelistheaders';
 
   // allow the following attributes to be added to the <table> tag
@@ -327 +324 @@
     $a_show_cols[$f] = 'to';
   
-  // add col definition
-  $out .= '<colgroup>';
-  $out .= '<col class="icon" />';
-
-  foreach ($a_show_cols as $col)
-    $out .= sprintf('<col class="%s" />', $col);
-
-  $out .= '<col class="icon" />';
-  $out .= "</colgroup>\n";
-
   // add table title
   $out .= "<thead><tr>\n<td class=\"icon\">&nbsp;</td>\n";
 
-  $javascript = '';
   foreach ($a_show_cols as $col)
     {
@@ -350 +336 @@
     if ($IMAP->get_capability('sort') && in_array($col, $a_sort_cols))
       {
+      write_log('list_messages', 'Sort capabilities');
+      
       // have buttons configured
       if (!empty($attrib['sortdescbutton']) || !empty($attrib['sortascbutton']))
@@ -393 +381 @@
 
   $out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n";
-  $out .= "</tr></thead>\n<tbody>\n";
+  $out .= "</tr></thead>\n</table>\n";
 
+  // set client env
+  $javascript  = '';
+  $javascript .= sprintf("%s.gui_object('mailheaders', '%s');\n", $JS_OBJECT_NAME, 'mailheaders');
+  $javascript .= sprintf("%s.gui_object('messagelistheaders', '%s');\n", $JS_OBJECT_NAME, $attrib['id']);
+  $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);
+  
+  $OUTPUT->add_script($javascript);  
+  
+  return $out;
+  }
+
+
+
+// return the message list as HTML table
+function rcmail_message_list($attrib)
+  {
+  global $IMAP, $CONFIG, $COMM_PATH, $OUTPUT, $JS_OBJECT_NAME;
+
+  $skin_path = $CONFIG['skin_path'];
+  $image_tag = '<img src="%s%s" alt="%s" border="0" />';
+
+  // check to see if we have some settings for sorting
+  $sort_col   = $_SESSION['sort_col'];
+  $sort_order = $_SESSION['sort_order'];
+  
+  // add some labels to client
+  rcube_add_label('from', 'to');
+
+  // get message headers
+  $a_headers = $IMAP->list_headers('', '', $sort_col, $sort_order);
+  
+  write_log('list_messages', $a_headers);
+        
+  // add id to message list table if not specified
+  if (!strlen($attrib['id']))
+    $attrib['id'] = 'rcubemessagelist';
+
+  // allow the following attributes to be added to the <table> tag
+  $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
+
+  $out = '<table ' . $attrib_str . ">\n";
+
+  // define list of cols to be displayed
+  $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
+  $a_sort_cols = array('subject', 'date', 'from', 'to', 'size');
+  
+  // show 'to' instead of from in sent messages
+  if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox']) && ($f = array_search('from', $a_show_cols))
+      && !array_search('to', $a_show_cols))
+    $a_show_cols[$f] = 'to';
+  
+  // add col definition
+  $out .= '<colgroup>';
+  $out .= '<col class="icon" />';
+
+  foreach ($a_show_cols as $col)
+    $out .= sprintf('<col class="%s" />', $col);
+
+  $out .= '<col class="icon" />';
+  $out .= "</colgroup>\n";
+  
+  // add table title
+  $out .= "<thead><tr>\n<td class=\"icon\"></td>\n";
+
+  foreach ($a_show_cols as $col)
+    {
+    // put it all together
+    $out .= '<td class="'.$col.'" id="rcmHead'.$col.'">' . "</td>\n";    
+    }
+
+  $out .= '<td class="icon">'."</td>\n";
+  $out .= "</tr></thead>\n";
+  
+  $out .= "<tbody>\n";
   // no messages in this mailbox
   if (!sizeof($a_headers))
@@ -446 +509 @@
       {
       if ($col=='from' || $col=='to')
+        {
         $cont = Q(rcmail_address_string($header->$col, 3, $attrib['addicon']), 'show');
+        if (!$cont) $cont = '&nbsp;';
+        }
       else if ($col=='subject')
         {
@@ -457 +523 @@
         $cont = show_bytes($header->$col);
       else if ($col=='date')
+        {
         $cont = format_date($header->date); //date('m.d.Y G:i:s', strtotime($header->date));
+        if (!$cont) $cont = '&nbsp;';
+        }
       else
         $cont = Q($header->$col);
@@ -464 +533 @@
       }
 
-    $out .= sprintf("<td class=\"icon\">%s</td>\n", $attach_icon ? sprintf($image_tag, $skin_path, $attach_icon, '') : '');
+    $out .= sprintf("<td class=\"icon\">%s</td>\n", $attach_icon ? sprintf($image_tag, $skin_path, $attach_icon, '') : '&nbsp;');
     $out .= "</tr>\n";
     
@@ -478 +547 @@
   
   // set client env
+  $javascript  = '';
   $javascript .= sprintf("%s.gui_object('mailcontframe', '%s');\n", $JS_OBJECT_NAME, 'mailcontframe');
   $javascript .= sprintf("%s.gui_object('messagelist', '%s');\n", $JS_OBJECT_NAME, $attrib['id']);
@@ -483 +553 @@
   $javascript .= sprintf("%s.set_env('current_page', %d);\n", $JS_OBJECT_NAME, $IMAP->list_page);
   $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 ($attrib['messageicon'])
@@ -1445 +1513 @@
   $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'cellspacing', 'cellpadding', 'border', 'summary'));
   $out = '<table '. $attrib_str . ">\n";
+  
+  $filename = $part->d_parameters['filename'] ? $part->d_parameters['filename'] : $part->ctype_parameters['name'];
+  $filesize = $part->size;
   
   if ($filename)

skins/default/mail.css

@@ -106 +106 @@
 }
 
-#mailcontframe
+#mailheaders
 {
   position: absolute;
@@ -112 +112 @@
   left: 200px;
   right: 40px;
+  border: 1px solid #999999;
+  background-color: #F9F9F9;
+  overflow: visible;
+  /* css hack for IE */
+  width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
+  min-width:540px;
+  height: 22px;
+}
+
+#mailcontframe
+{
+  position: absolute;
+  top: 105px;
+  left: 200px;
+  right: 40px;
   bottom: 40px;
   border: 1px solid #999999;
@@ -118 +133 @@
   /* css hack for IE */
   width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
-  height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-145)+'px');
+  min-width:540px;
 }
 
@@ -369 +385 @@
 }
 
+#messagelistheaders
+{
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+  /* css hack for IE */
+  width: expression(document.getElementById('mailheaders').clientWidth);
+}
+
 #messagelist
 {
@@ -378 +403 @@
 }
 
-#messagelist thead tr td
+#messagelistheaders thead tr td
 {
   height: 20px;
@@ -392 +417 @@
   font-size: 11px;
   font-weight: bold;
+  white-space: nowrap;
 }
 
-#messagelist thead tr td.sortedASC,
-#messagelist thead tr td.sortedDESC
+#messagelist thead, #messagelist thead tr, #messagelist thead tr td
+{
+        height:1px;
+        visible:hidden;
+}
+
+#messagelistheaders thead tr td.sortedASC,
+#messagelistheaders thead tr td.sortedDESC
 {
   background-image: url(images/listheader_dark.gif); 
 }
 
-#messagelist thead tr td.sortedASC a
+#messagelistheaders thead tr td.sortedASC a
 {
   background: url(images/sort_asc.gif) top right no-repeat;
 }
 
-#messagelist thead tr td.sortedDESC a
+#messagelistheaders thead tr td.sortedDESC a
 {
   background: url(images/sort_desc.gif) top right no-repeat;
 }
 
-#messagelist thead tr td a,
-#messagelist thead tr td a:hover
+#messagelistheaders thead tr td a,
+#messagelistheaders thead tr td a:hover
 {
   display: block;
@@ -418 +450 @@
   color: #333333;
   text-decoration: none;
+  white-space: nowrap;
+}
+
+#messagelist tbody tr td a,
+#messagelist tbody tr td a:hover
+{
+  white-space: nowrap;
 }
 
@@ -423 +462 @@
 {
   height: 16px;
-  padding: 2px;
-  padding-right: 4px;
+  padding: 2px 4px 2px 2px;
   font-size: 11px;
   overflow: hidden;
@@ -440 +478 @@
 }
 
-#messagelist tr td.icon
+#messagelist tr td.icon, #messagelistheaders tr td.icon
 {
   width: 16px;
@@ -446 +484 @@
 }
 
-#messagelist tr td.subject
+#messagelist tr td.subject, #messagelistheaders tr td.subject
 {
   overflow: hidden;
   vertical-align: middle;
+  width: 60%;
 }
 
-#messagelist tr td.size
+#messagelist tr td.size, #messagelistheaders tr td.size
 {
-  width: 60px;
+  width: 80px;
   text-align: right;
   vertical-align: middle;
@@ -462 +501 @@
 #messagelist tr td.to
 {
-  width: 180px;
+  width: 40%;
+  vertical-align: middle;
+}
+
+#messagelistheaders tr td.from,
+#messagelistheaders tr td.to
+{
+  width: 40%;
   vertical-align: middle;
 }
 
-#messagelist tr td.date
+#messagelist tr td.date, #messagelistheaders tr td.date
 {
   width: 118px;

skins/default/templates/mail.html

@@ -43 +43 @@
 </div>
 
-
+<div id="mailheaders">
+<roundcube:object name="messagesheaders"
+  id="messagelistheaders"
+  cellspacing="0"
+  summary="Message list headers"
+  attachmentIcon="/images/icons/attachment.png" />
+</div>
 <div id="mailcontframe">
 <roundcube:object name="messages"