Changeset 3124 in subversion

Timestamp:

Nov 21, 2009 1:56:23 PM (4 years ago)

Author:

alec

Message:

• make possible selecting columns in UI

Location:

branches/devel-threads

Files:

• THREADS (modified) (3 diffs)
• program/js/app.js (modified) (9 diffs)
• program/steps/mail/func.inc (modified) (7 diffs)
• program/steps/mail/list.inc (modified) (3 diffs)
• skins/default/functions.js (modified) (4 diffs)

branches/devel-threads/THREADS

@@ -14 +14 @@
     - removed 'index_sort' option, now we're using empty 'message_sort_col' for
       this purpose
-    - popup menu for list column/sorting/view selection (not finished yet)
+    - popup menu for messages list column/sorting/view selection
     - added sorting by ARRIVAL
     - added sorting by CC
@@ -31 +31 @@
       root or child message),
     - "Expand All Unread" button
-    - columns/sort/view selector (popup) with 'default sorting' support
     - thread tree icons
     - reset autoexpand feature if collapse-all/expand-all was used. Save state for next page
@@ -42 +41 @@
     - thread css: message row height, thread/status icon alignment
     - remove 'indexsort' label from localization files
+    - use jQuery.inArray instead of find_in_array() (common.js)
 
 KNOWN ISSUES:

branches/devel-threads/program/js/app.js

@@ -174 +174 @@
           document.onmouseup = function(e){ return p.doc_mouse_up(e); };
 
+          this.set_message_coltypes(this.env.coltypes);
           this.message_list.init();
           this.enable_command('toggle_status', 'toggle_flag', true);
@@ -188 +189 @@
           this.message_list.expand(null);
           }
-
-        if (this.env.coltypes)
-          this.set_message_coltypes(this.env.coltypes);
 
         // enable mail commands
@@ -1471 +1469 @@
       }
 
-    // global variable 'subject_col' may be not defined yet
-    if (this.env.subject_col == null && this.env.coltypes)
-      {
-      var found;
-      if((found = find_in_array('subject', this.env.coltypes)) >= 0)
-        this.set_env('subject_col', found);
-      }
-
     // set eventhandler to message icon
     if (this.env.subject_col != null
@@ -1487 +1477 @@
       row.icon._row = row.obj;
       row.icon.onmousedown = function(e) { p.command('toggle_status', this); };
-      }
-
-    // global variable 'flagged_col' may be not defined yet
-    if (this.env.flagged_col == null && this.env.coltypes)
-      {
-      var found;
-      if((found = find_in_array('flag', this.env.coltypes)) >= 0)
-        this.set_env('flagged_col', found);
       }
 
@@ -1597 +1579 @@
 
     // add each submitted col
-    for (var n = 0; n < this.coltypes.length; n++) {
-      var c = this.coltypes[n];
+    for (var n = 0; n < this.env.coltypes.length; n++) {
+      var c = this.env.coltypes[n];
       col = document.createElement('td');
       col.className = String(c).toLowerCase();
@@ -1652 +1634 @@
   this.set_list_options = function(cols, sort_col, sort_order, threads)
     {
-    var update, add_url;
+    var update, add_url = '';
 
     if (this.env.sort_col != sort_col || this.env.sort_order != sort_order) {
@@ -1661 +1643 @@
     if (this.env.threading != threads) {
       update = 1;
-      add_url = '&_threads=' + threads;     
+      add_url += '&_threads=' + threads;     
+      }
+
+    if (cols.join() != this.env.coltypes.join()) {
+      update = 1;
+      add_url += '&_cols=' + cols.join(',');
       }
 
@@ -4084 +4071 @@
   };
 
-  // for reordering column array, Konqueror workaround
-  this.set_message_coltypes = function(coltypes) 
+  // for reordering column array (Konqueror workaround)
+  // and for setting some message list global variables
+  this.set_message_coltypes = function(coltypes, replace) 
   { 
-    this.coltypes = coltypes;
+    this.env.coltypes = coltypes;
     
     // set correct list titles
-    var cell, col;
+    var cell, col, found, n;
     var thead = this.gui_objects.messagelist ? this.gui_objects.messagelist.tHead : null;
-    for (var n=0; thead && n<this.coltypes.length; n++) 
-      {
-      col = this.coltypes[n];
+
+    // replace old column headers
+    if (thead && replace)
+      this.gui_objects.messagelist.tHead.innerHTML = replace;
+
+    for (n=0; thead && n<this.env.coltypes.length; n++)
+      {
+      col = this.env.coltypes[n];
       if ((cell = thead.rows[0].cells[n]) && (col=='from' || col=='to'))
         {
@@ -4100 +4093 @@
         if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a')
           {
-          cell.firstChild.innerHTML = this.get_label(this.coltypes[n]);
+          cell.firstChild.innerHTML = this.get_label(this.env.coltypes[n]);
           cell.firstChild.onclick = function(){ return rcmail.command('sort', this.__col, this); };
           cell.firstChild.__col = col;
           }
         else
-          cell.innerHTML = this.get_label(this.coltypes[n]);
+          cell.innerHTML = this.get_label(this.env.coltypes[n]);
 
         cell.id = 'rcm'+col;
         }
-      else if (col == 'subject' && this.message_list)
-        this.message_list.subject_col = n;
-      }
+      }
+
+    // remove excessive columns
+    for (var i=n; thead && n<thead.rows[0].cells.length; i++)
+      thead.rows[0].removeChild(thead.rows[0].cells[i]);
+
+    this.env.subject_col = null;
+    this.env.flagged_col = null;
+
+    if((found = find_in_array('subject', this.env.coltypes)) >= 0) {
+      this.set_env('subject_col', found);
+      if (this.message_list)
+        this.message_list.subject_col = found;
+      }
+    if((found = find_in_array('flag', this.env.coltypes)) >= 0)
+      this.set_env('flagged_col', found);
   };
 

branches/devel-threads/program/steps/mail/func.inc

@@ -132 +132 @@
   $skin_path = $CONFIG['skin_path'];
   $image_tag = '<img src="%s%s" alt="%s" />';
-  // 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
@@ -157 +154 @@
       $a_show_cols = preg_split('/[\s,;]+/', strip_quotes($attrib['columns']));
 
-  // store column list in a session-variable
+  // save some variables for use in ajax list
   $_SESSION['list_columns'] = $a_show_cols;
-  
-  // define sortable columns
-  $a_sort_cols = array('subject', 'date', 'from', 'to', 'size', 'cc');
-
+  $_SESSION['list_attrib'] = $attrib;
+  $_SESSION['skin_path'] = $skin_path;
+  
   $mbox = $IMAP->get_mailbox_name();
   $delim = $IMAP->get_hierarchy_delimiter();
@@ -170 +166 @@
       && ($f = array_search('from', $a_show_cols)) && !array_search('to', $a_show_cols))
     $a_show_cols[$f] = 'to';
-  
-  // add col definition
-  $out .= '<colgroup>';
-
-  foreach ($a_show_cols as $col)
-    $out .= ($col!='attachment') ? sprintf('<col class="%s" />', $col) : '<col class="icon" />';
-
-  $out .= "</colgroup>\n";
-
-  // add table title
-  $out .= "<thead><tr>\n";
-
-  $javascript = '';
-  foreach ($a_show_cols as $col)
-    {
-    // get column name
-    switch ($col)
-      {
-      case 'flag':
-        $col_name = sprintf($image_tag, $skin_path, $attrib['unflaggedicon'], '');
-        break;
-      case 'attachment':
-        $col_name = sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '');
-        break;
-      default:
-        $col_name = Q(rcube_label($col));
-    }
-
-    // make sort links
-    $sort = '';
-    if (in_array($col, $a_sort_cols))
-      {
-      // have buttons configured
-      if (!empty($attrib['sortdescbutton']) || !empty($attrib['sortascbutton']))
-        {
-        $sort = '&nbsp;&nbsp;';
-
-        // asc link
-        if (!empty($attrib['sortascbutton']))
-          {
-          $sort .= $OUTPUT->button(array(
-            'command' => 'sort',
-            'prop' => $col.'_ASC',
-            'image' => $attrib['sortascbutton'],
-            'align' => 'absmiddle',
-            'title' => 'sortasc'));
-          }       
-        
-        // desc link
-        if (!empty($attrib['sortdescbutton']))
-          {
-          $sort .= $OUTPUT->button(array(
-            'command' => 'sort',
-            'prop' => $col.'_DESC',
-            'image' => $attrib['sortdescbutton'],
-            'align' => 'absmiddle',
-            'title' => 'sortdesc'));
-          }
-        }
-      // just add a link tag to the header
-      else
-        {
-        $col_name = sprintf(
-          '<a href="./#sort" onclick="return %s.command(\'sort\',\'%s\',this)" title="%s">%s</a>',
-          JS_OBJECT_NAME,
-          $col,
-          rcube_label('sortby'),
-          $col_name);
-        }
-      }
-      
-    $sort_class = $col==$sort_col ? " sorted$sort_order" : '';
-
-    // put it all together
-    if ($col != 'attachment') {
-      // list options menu link
-      if ($col == 'subject' && !empty($attrib['optionsmenuicon'])) {
-          $list_menu = $OUTPUT->button(array(
-            'name' => 'listmenulink',
-            'id' => 'listmenulink',
-//            'command' => '',
-//            'prop' => '',
-            'image' => $attrib['optionsmenuicon'],
-            'align' => 'absmiddle',
-            'style' => 'float: left; padding-right: 5px',
-            'title' => 'listoptions'));
-        } else
-          $list_menu = '';
-
-      $out .= '<td class="'.$col.$sort_class.'" id="rcm'.$col.'">' . "$list_menu$col_name$sort</td>\n";
-      }
-    else    
-      $out .= '<td class="icon" id="rcm'.$col.'">' . "$col_name$sort</td>\n";
-    }
-
-  $out .= "</tr></thead>\n<tbody>\n";
+
+  $out .= '<thead>'.rcmail_message_list_head($attrib, $a_show_cols).'</thead>';
+  $out .= "\n<tbody>\n";
 
   // no messages in this mailbox
@@ -406 +309 @@
   $OUTPUT->set_env('current_page', $IMAP->list_page);
   $OUTPUT->set_env('pagecount', ceil($message_count/$IMAP->page_size));
-  $OUTPUT->set_env('sort_col', $sort_col);
-  $OUTPUT->set_env('sort_order', $sort_order);
+  $OUTPUT->set_env('sort_col', $_SESSION['sort_col']);
+  $OUTPUT->set_env('sort_order', $_SESSION['sort_order']);
   
   if ($attrib['messageicon'])
@@ -443 +346 @@
  * or to replace the whole list (IE only)
  */
-function rcmail_js_message_list($a_headers, $insert_top=FALSE, $replace=TRUE)
+function rcmail_js_message_list($a_headers, $insert_top=FALSE, $replace=TRUE, $head_replace=FALSE)
   {
   global $CONFIG, $IMAP, $OUTPUT;
@@ -461 +364 @@
 
   $browser = new rcube_browser;
-
-  $OUTPUT->command('set_message_coltypes', $a_show_cols);
+  
+  $thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;
+  
+  $OUTPUT->command('set_message_coltypes', $a_show_cols, $thead);
 
   // remove 'attachment' and 'flag' columns, we don't need them here
@@ -548 +453 @@
 
 
+/*
+ * Creates <THEAD> for message list table
+ */
+function rcmail_message_list_head($attrib, $a_show_cols)
+  {
+  global $CONFIG;
+
+  $skin_path = $_SESSION['skin_path'];
+  $image_tag = '<img src="%s%s" alt="%s" />';
+
+  // check to see if we have some settings for sorting
+  $sort_col   = $_SESSION['sort_col'];
+  $sort_order = $_SESSION['sort_order'];
+
+  // define sortable columns
+  $a_sort_cols = array('subject', 'date', 'from', 'to', 'size', 'cc');
+  
+  $out = '<tr>';
+
+  foreach ($a_show_cols as $col)
+    {
+    // get column name
+    switch ($col)
+      {
+      case 'flag':
+        $col_name = sprintf($image_tag, $skin_path, $attrib['unflaggedicon'], '');
+        break;
+      case 'attachment':
+        $col_name = sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '');
+        break;
+      default:
+        $col_name = Q(rcube_label($col));
+    }
+
+    // make sort links
+    $sort = '';
+    if (in_array($col, $a_sort_cols))
+      {
+        $col_name = sprintf(
+          '<a href="./#sort" onclick="return %s.command(\'sort\',\'%s\',this)" title="%s">%s</a>',
+          JS_OBJECT_NAME,
+          $col,
+          rcube_label('sortby'),
+          $col_name);
+      }
+      
+    $sort_class = $col==$sort_col ? " sorted$sort_order" : '';
+
+    // put it all together
+    if ($col != 'attachment') {
+      // list options menu link
+      if ($col == 'subject' && !empty($attrib['optionsmenuicon'])) {
+          $list_menu = sprintf('<a href="#"><img src="%s%s" id="%s" align="absmiddle" style="%s" title="%s" alt="" /></a>',
+            $skin_path,
+            $attrib['optionsmenuicon'],
+            'listmenulink',
+            'float: left; padding-right: 5px',
+            rcube_label('listoptions')
+            );
+        } else
+          $list_menu = '';
+
+      $out .= '<td class="'.$col.$sort_class.'" id="rcm'.$col.'">' . "$list_menu$col_name$sort</td>\n";
+      }
+    else    
+      $out .= '<td class="icon" id="rcm'.$col.'">' . "$col_name$sort</td>\n";
+    }
+
+  $out .= '</tr>';
+
+  return $out;
+  }
+
+
 /**
  * return an HTML iframe for loading mail content

branches/devel-threads/program/steps/mail/list.inc

@@ -34 +34 @@
   $_SESSION['sort_col'] = $save_arr['message_sort_col'] = $sort_col;
   $_SESSION['sort_order'] = $save_arr['message_sort_order'] = $sort_order;
-  
-  $RCMAIL->user->save_prefs($save_arr);
 }
 else
@@ -43 +41 @@
   $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
 }
+
+// is there a set of columns for this request?
+if ($cols = get_input_value('_cols', RCUBE_INPUT_GET))
+{
+  $save_arr = array();
+  $_SESSION['list_columns'] = $save_arr['list_cols'] = explode(',', $cols);
+}
+
+if ($save_arr)  
+  $RCMAIL->user->save_prefs($save_arr);
 
 $mbox_name = $IMAP->get_mailbox_name();
@@ -73 +81 @@
 if (isset($a_headers) && count($a_headers))
 {
-  rcmail_js_message_list($a_headers);
+  rcmail_js_message_list($a_headers, FALSE, TRUE, (bool) $cols);
   if ($search_request)
     $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));

branches/devel-threads/skins/default/functions.js

@@ -126 +126 @@
   this.messagemenu = $('#messagemenu');
   this.listmenu = $('#listmenu');
+  this.add_listmenulink();
+}
+
+rcube_mail_ui.prototype = {
+
+add_listmenulink: function()
+{
   var ref = rcube_find_object('listmenulink');
-  
   if (ref)
     ref.onclick = function () { rcmail_ui.show_listmenu() };
-}
-
-rcube_mail_ui.prototype = {
+},
 
 show_markmenu: function(show)
@@ -204 +208 @@
     $('input[name="view"][value="thread"]').attr('checked', rcmail.env.threading ? 1 : 0);
     $('input[name="view"][value="list"]').attr('checked', rcmail.env.threading ? 0 : 1);
+    // list columns
+    var cols = $('input[name="list_col[]"]');
+    for (var i=0; i<cols.length; i++) {
+      var found = 0;
+      if (cols[i].value != 'from')
+        found = jQuery.inArray(cols[i].value, rcmail.env.coltypes) != -1;
+      else
+        found = (jQuery.inArray('from', rcmail.env.coltypes) != -1
+            || jQuery.inArray('to', rcmail.env.coltypes) != -1);
+      $(cols[i]).attr('checked',found ? 1 : 0);
+    }
   }
   this.listmenu[show?'show':'hide']();
@@ -216 +231 @@
   var thread = $('input[name="view"]:checked').val();
   var cols = $('input[name="list_col[]"]:checked')
-    .map(function(){ return $(this).val(); }).get();
+    .map(function(){ return this.value; }).get();
 
   rcmail.set_list_options(cols, sort, ord, thread == 'thread' ? 1 : 0);
@@ -272 +287 @@
   rcube_event.add_listener({ object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
   rcube_event.add_listener({ object:rcmail_ui, method:'body_keypress', event:'keypress' });
-}
+  rcube_event.add_listener({ object:rcmail_ui, method:'add_listmenulink', event:'listupdate' });
+}