Changeset 3688 in subversion

Timestamp:

May 30, 2010 3:48:15 AM (3 years ago)

Author:

alec

Message:

• 'threads' column made movable

Location:

trunk/roundcubemail

Files:

• program/js/app.js (modified) (7 diffs)
• program/steps/mail/func.inc (modified) (5 diffs)
• skins/default/functions.js (modified) (2 diffs)
• skins/default/mail.css (modified) (3 diffs)

trunk/roundcubemail/program/js/app.js

@@ -167 +167 @@
           this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
             multiselect:true, multiexpand:true, draggable:true, keyboard:true,
-            column_movable:this.env.col_movable, column_fixed:0, dblclick_time:this.dblclick_time
+            column_movable:this.env.col_movable, dblclick_time:this.dblclick_time
             });
           this.message_list.row_init = function(o){ p.init_message_row(o); };
@@ -1646 +1646 @@
     tree += icon ? '<img id="msgicn'+uid+'" src="'+icon+'" alt="" class="msgicon" />' : '';
 
-    // first col is always there
-    col.className = 'threads';
-    col.innerHTML = expando;
-    row.appendChild(col);
-
     // build subject link 
     if (!bw.ie && cols.subject) {
@@ -1672 +1667 @@
           html = '<img id="flaggedicn'+uid+'" src="'+this.env.unflaggedicon+'" class="flagicon" alt="" />';
       }
+      else if (c == 'threads')
+        html = expando;
       else if (c == 'attachment')
         html = flags.attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '&nbsp;';
@@ -1734 +1731 @@
           delete cols[idx];
         }
+        else if (name == 'threads') {
+          delete oldcols[i];
+        }
       }
       for (i=0; i<cols.length; i++)
@@ -1739 +1739 @@
           newcols[newcols.length] = cols[i];
 
-      if (newcols.join() != this.env.coltypes.join()) {
+      if (newcols.join() != oldcols.join()) {
         update = 1;
         add_url += '&_cols=' + newcols.join(',');
@@ -4590 +4590 @@
     for (n=0; thead && n<this.env.coltypes.length; n++) {
       col = this.env.coltypes[n];
-      if ((cell = thead.rows[0].cells[n+1]) && (col=='from' || col=='to')) {
+      if ((cell = thead.rows[0].cells[n]) && (col=='from' || col=='to')) {
         // if we have links for sorting, it's a bit more complicated...
         if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a') {
@@ -4615 +4615 @@
       this.set_env('subject_col', found);
       if (this.message_list)
-        this.message_list.subject_col = found+1;
+        this.message_list.subject_col = found;
     }
     if ((found = $.inArray('flag', this.env.coltypes)) >= 0)

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

@@ -171 +171 @@
       && (($f = array_search('from', $a_show_cols)) !== false) && array_search('to', $a_show_cols) === false)
     $a_show_cols[$f] = 'to';
+
+  // make sure 'threads' column is present 
+  if (!in_array('threads', $a_show_cols))
+    array_unshift($a_show_cols, 'threads');
 
   $skin_path = $_SESSION['skin_path'] = $CONFIG['skin_path'];
@@ -239 +243 @@
     $a_show_cols[$f] = 'to';
 
+  // make sure 'threads' column is present 
+  if (!in_array('threads', $a_show_cols))
+    array_unshift($a_show_cols, 'threads');
+
   $thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;
 
@@ -246 +254 @@
     return;
 
-  // remove 'attachment' and 'flag' columns, we don't need them here
-  if(($key = array_search('attachment', $a_show_cols)) !== FALSE)
+  // remove 'threads', 'attachment', 'flag' columns, we don't need them here
+  if (($key = array_search('attachment', $a_show_cols)) !== FALSE)
     unset($a_show_cols[$key]);
-  if(($key = array_search('flag', $a_show_cols)) !== FALSE)
+  if (($key = array_search('flag', $a_show_cols)) !== FALSE)
+    unset($a_show_cols[$key]);
+  if (($key = array_search('threads', $a_show_cols)) !== FALSE)
     unset($a_show_cols[$key]);
 
@@ -346 +356 @@
     $list_menu = '';
 
-  $cells = array(array('className' => 'threads', 'html' => $list_menu));
+  $cells = array();
 
   foreach ($a_show_cols as $col) {
@@ -356 +366 @@
       case 'attachment':
         $col_name = sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '');
+        break;
+      case 'threads':
+        $col_name = $list_menu;
         break;
       default:

trunk/roundcubemail/skins/default/functions.js

@@ -149 +149 @@
   if (typeof show == 'undefined')
     show = obj.is(':visible') ? false : true;
-  
+
   var ref = rcube_find_object(refname);
   if (show && ref) {
@@ -215 +215 @@
   var ref = rcube_find_object('listmenulink');
   if (show && ref) {
-    var pos = $(ref).offset();
+    var pos = $(ref).offset(),
+      menuwidth = this.listmenu.width(),
+      pagewidth = $(document).width();
+
+    if (pagewidth - pos.left < menuwidth && pos.left > menuwidth)
+      pos.left = pos.left - menuwidth;
+
     this.listmenu.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)});
     // set form values

trunk/roundcubemail/skins/default/mail.css

@@ -744 +744 @@
 #messagelist tr td.flag
 {
-  width: 20px;
-  padding: 0px 1px 1px 1px;
+  width: 18px;
+  padding: 0px 1px 1px 3px;
 }
 
@@ -757 +757 @@
 #messagelist tbody td img.msgicon
 {
-  margin-right: 2px;
+  margin: 0 2px;
 }
 
@@ -771 +771 @@
 #messagelist tr td div.collapsed
 {
-  background: url(images/messageactions.png) 1px -91px no-repeat;
+  background: url(images/messageactions.png) -1px -91px no-repeat;
 }
 
 #messagelist tr td div.expanded
 {
-  background: url(images/messageactions.png) 1px -109px no-repeat;
+  background: url(images/messageactions.png) -1px -109px no-repeat;
 }