Changeset 5533 for trunk/expressoMail1_2

Timestamp:

02/22/12 18:04:20 (12 years ago)

Author:

douglasz

Message:

Ticket #1875 - Commit inicial do codigo das funcionalidades de marcadores e sinalizadores

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (8 diffs)
• index.php (modified) (5 diffs)
• js/common_functions.js (modified) (1 diff)
• js/doiMenuData.js (modified) (6 diffs)
• js/drag_area.js (modified) (3 diffs)
• js/draw_api.js (modified) (37 diffs)
• js/main.js (modified) (1 diff)
• js/search.js (modified) (25 diffs)
• templates/default/expressomail.css (modified) (3 diffs)
• templates/default/images/menu/tag.png (added)
• templates/default/index.tpl (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -157 +157 @@
 
         function get_range_msgs2($params)
-        { 
+        {       
             // Free others requests
             session_write_close();
@@ -193 +193 @@
                                     $sample = true;
                                             
-                                    $return[$i] = $this->get_info_head_msg( $msg_number , $sample ) ;
+                                    $return[$i] = $this->get_info_head_msg( $msg_number , $sample );
                                     $i++;
                             }
@@ -228 +228 @@
                 return $return;
     }
-    
+        
+        
+        function getMessages($params) {
+                $result = array();
+
+                $exporteml = new ExportEml();
+                $unseen_msgs = array();
+                
+                foreach($params['messages'] as $folder => $messages) {
+                        foreach($messages as $msg_number) {
+
+                                $this->mbox = $this->open_mbox($folder);
+                        
+                                if (isset($params['details']) && $params['details'] == 'all') {
+                                        $message = $this->get_info_msg(array('msg_number' => $msg_number, 'msg_folder' =>urlencode($folder)));
+                                } else {
+                                        $message['headers'] = $this->get_info_head_msg($msg_number, true);
+                                        //$message['attachments'] = $exporteml->get_attachments_in_array(array("num_msg" => $msg_number));
+                                }
+
+                                imap_close($this->mbox);
+                                $this->mbox = false;
+
+                                if($msg_info['Unseen'] == "U" || $msg_info['Recent'] == "N") {
+                                        array_push($unseen_msgs,$msg_number);
+                                }
+                                
+                                $result[$folder][] = $message;
+                        }
+                        if($unseen_msgs){
+                                $msgs_list = implode(",",$unseen_msgs);
+                                $array_msgs = array('folder' => $folder, "msgs_to_set" => $msgs_list, "flag" => "unseen");
+                                $this->set_messages_flag($array_msgs);
+                        }
+                }
+                
+                return $result;
+        }       
+
         /**
         *  Decodifica uma string no formato mime RFC2047
@@ -731 +769 @@
                         $array_msgs = array('folder' => $new_params["msg_folder"], "msgs_to_set" => $msgs_list, "flag" => "unseen");
                         $this->set_messages_flag($array_msgs);
-                }
+                }                                       
+                                        
                 return $return;
         }
-        }
+}
 
         /**
@@ -5084 +5123 @@
         }
         
-        function parseCriteriaSearchMail($search)
-        {
-            $criteria = '';
-            $searchArray = explode(' ', $search);
-
-            foreach ($searchArray as $v)
-                if(trim($v) !== '' )
-                    $criteria .= 'TEXT "'.$v.'" ' ;
-           
-            return $criteria;
-        }
+        function parseCriteriaSearchMail($search)
+        {
+                $criteria = '';
+                $searchArray = explode(' ', $search);
+
+                foreach ($searchArray as $v)
+                        if(trim($v) !== '' )
+                                $criteria .= 'TEXT "'.$v.'" ' ;
+           
+                return $criteria;
+        }
         
         function quickSearchMail( $params )
         {
+                include '../prototype/api/controller.php';
                 $return = array();
                 $return['folder'] = $params['folder'];
@@ -5114 +5154 @@
                 $count = 0;
                 
-                $search = $this->parseCriteriaSearchMail($params['search']);
-                                
+                if (!preg_match('/KEYWORD/i', $params['search'])){
+                        $search = $this->parseCriteriaSearchMail($params['search']);
+                } else {
+                        $search = $params['search'];
+                }
+        
                 foreach ($params['folder'] as $folder) 
                 {
@@ -5139 +5183 @@
                                         $return['msgs'][$i]['subject'] .= mb_convert_encoding($tmp->text, 'UTF-8', 'UTF-8 , ISO-8859-1');
                                 
-                                
+                                $filter = array('AND', array('=', 'folderName', $folder), array('=','messageNumber', $v));
+                                $followupflagged = Controller::find(
+                                        array('concept' => 'followupflagged'),
+                                        false, 
+                                        array('filter' => $filter, 'criteria' => array('deepness' => '2'))
+                                );
+                                foreach ($followupflagged as $i => $v)
+                                        {
+                                                if(isset($v['followupflagId']))
+                                                {
+                                                        $followupflag = Controller::find( array( 'concept' => 'followupflag' ) , false, array( 'filter' => array('=', 'id'  ,  $v['followupflagId']) ));     
+                                                        $followupflagged[$i]['followupflag'] = $followupflag[0];
+                                                }
+
+                                        }
+                                        
+                                $labeleds = Controller::find(
+                                        array('concept' => 'labeled'),
+                                        false, 
+                                        array('filter' => $filter, 'criteria' => array('deepness' => '2'))
+                                );
+                                                
                                 $return['msgs'][$i]['flag'] = ' ';
                                 $return['msgs'][$i]['flag'] .= $msg->Unseen ? $msg->Unseen : '';
@@ -5154 +5219 @@
                                 $return['msgs'][$i]['boxname'] = $folder;
                                 $return['msgs'][$i]['uid'] = $v;
+                                $return['msgs'][$i]['followupflagged'] = $followupflagged[0];
+                                $return['msgs'][$i]['labels'] = $labeleds;
                                 $i++;
                         }       

trunk/expressoMail1_2/index.php

@@ -44 +44 @@
                                         <script src="../prototype/plugins/ejs/ejs.js" language="javascript"></script>
                                         <script src="../prototype/plugins/store/jquery.store.js" language="javascript"></script>
+                                        <script src="../prototype/plugins/farbtastic/farbtastic.js" language="javascript"></script>
                                         <script src="../prototype/api/datalayer.js" language="javascript"></script>                                     
                                         <script type="text/javascript" src="../prototype/plugins/scrollto/jquery.scrollTo.js"></script>
@@ -57 +58 @@
                                         <link rel="stylesheet" type="text/css" href="../prototype/plugins/zebradialog/css/zebra_dialog.css"></link>
                                         <link rel="stylesheet" type="text/css" href="../prototype/plugins/fileupload/jquery.fileupload-ui.css"></link>
+                                        <link rel="stylesheet" href="../prototype/plugins/farbtastic/farbtastic.css" type="text/css" >
                                         <script type="text/javascript" src="../prototype/plugins/zebradialog/javascript/zebra_dialog.js"></script>
                                         <script type="text/javascript" src="../prototype/plugins/datejs/date-pt-BR.js"></script>
@@ -115 +117 @@
         <script src="../prototype/plugins/countdown/jquery.countdown.min.js" type="text/javascript"></script>
         <script src="../prototype/plugins/countdown/jquery.countdown-pt-BR.js" type="text/javascript"></script>         
+        
+                
         ';
         
+        echo '<script src="../prototype/modules/mail/js/label.js" type="text/javascript"></script>';    
+        echo '<script src="../prototype/modules/mail/js/followupflag.js" type="text/javascript"></script>';
+        
+                
+        //followupflags
+        echo'<link rel="stylesheet" href="../prototype/modules/mail/css/followupflag.css" type="text/css" />';
+        
         /*
-         * TODO: implementar o controle como preferência do usuário 
+         * TODO: implementar o controle como preferência do usuário 
          *
          */
@@ -348 +359 @@
         echo '
         <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" />
+        
+                                        <script type="text/javascript" src="../prototype/plugins/jquery/i18n/jquery.ui.datepicker-pt-BR.js"></script>
+                                        <script type="text/javascript" src="../prototype/plugins/timepicker/jquery-ui-timepicker-addon.js"></script>
+                                        <script type="text/javascript" src="../prototype/plugins/timepicker/localization/jquery-ui-timepicker-pt-BR.js"></script>
         <script type="text/javascript">
                 init();
@@ -373 +388 @@
 <body scroll="no" style="overflow:hidden">
 <link rel="stylesheet" href="../prototype/modules/attach_message/attach_message.css" type="text/css" />
+<link rel="stylesheet" href="../prototype/modules/mail/css/label.css" type="text/css" />        
 <link rel='stylesheet' type='text/css' href='../prototype/modules/calendar/css/layout.css' />
 <link rel='stylesheet' type='text/css' href='../prototype/modules/calendar/css/style.css' />

trunk/expressoMail1_2/js/common_functions.js

@@ -657 +657 @@
         }
         cExecute ("$this.imap_functions.getacl", handler_imap_getacl);
+}
+
+function configureLabels(data){
+
+        dialogElement = $('.label-configure-win').html(DataLayer.render("../prototype/modules/mail/templates/label_configure.ejs", {}))
+        
+        dialogElement.dialog({
+                width:821,
+                height:410,
+                title:' Configuração do Marcador',
+                resizable:false,
+                modal: true,
+                closeOnEscape:true,
+                close:function(event, ui) {event.stopPropagation();},
+                autoOpen:false,
+                dialogClass: 'dialog-configure-label'
+        });
+        init_label({window:dialogElement, selectedItem:data.selectedItem});     
+        dialogElement.dialog("open");
+}
+
+function configureFollowupflag(){
+
+        var messages = new Array();
+        var selectedMessageIds = new Array();
+        var folder_name;
+        if (currentTab == 0) {
+                selectedMessageIds = get_selected_messages().split(",");
+        } else {
+                selectedMessageIds = get_selected_messages_search().split(",");
+                var id_border = currentTab.replace(/[a-zA-Z_]+/, "");
+        }
+        
+        
+        for (var i=0; i<selectedMessageIds.length; i++) {
+                if (currentTab == 0) {
+                        folder_name = current_folder;
+                }else{
+                        var tr = Element(selectedMessageIds[i]+'_s'+id_border);
+                        folder_name = tr.getAttribute('name');
+                }
+                messages.push(onceOpenedHeadersMessages[folder_name][selectedMessageIds[i]]);
+        }
+
+        if(!User.followupflags)
+                User.followupflags = DataLayer.get('followupflag',true);
+        var data = {
+                followupflags: User.followupflags,
+                messages: messages
+        };
+        dialogElement = $('.followupflag-configure-win').html(DataLayer.render("../prototype/modules/mail/templates/followupflag_configure.ejs", data))
+
+        dialogElement.dialog({
+                width:542,
+                height:420,
+                title:get_lang('Acompanhamento'),
+                resizable:false,
+                modal: true,
+                closeOnEscape:true,
+                close:function(event, ui) {
+                        $('.followupflag-configure-win').addClass('hidden');
+                        event.stopPropagation();
+                },
+                autoOpen:false
+        });     
+        init_followup({window:dialogElement, selectedMessages:selectedMessageIds});
+        $('.followupflag-configure-win').removeClass('hidden');
+        dialogElement.dialog("open");
 }
 

trunk/expressoMail1_2/js/doiMenuData.js

@@ -8 +8 @@
 }
 
-$.contextMenu({
-        selector: ".table_box tbody tr",
-        callback: function(key, options) {
-                //TODO - default actions
-                //TODO - aply labels actions
-
-        },
-        items: {
-                "flagSeen":      {"name": get_lang("Mark as") + " " + get_lang('seen'), "icon": "seen", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('seen','get_selected_messages'); }},
-                "flagUnseen":    {"name": get_lang("Mark as") + " " + get_lang('unseen'), "icon": "unseen", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('unseen','get_selected_messages'); }},
-                "flagFlagged":   {"name": get_lang("Mark as") + " " + get_lang('important'), "icon": "important", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('flagged','get_selected_messages'); }},
-                "flagUnflagged": {"name": get_lang("Mark as") + " " + get_lang('normal'), callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('unflagged','get_selected_messages'); }},
-                
-                
-                "sep2": "---------",
-                "move": {"name": get_lang("Move to")+"...", "icon": "move", callback: function(key, opt){ wfolders.makeWindow('', 'move_to'); }},
-                "remove": {"name": get_lang("Delete"),      "icon": "delete", callback: function(key, opt){ proxy_mensagens.delete_msgs('null','selected','null'); }},
-                "export": {"name": get_lang("Export"),      "icon": "export", callback: function(key, opt){ proxy_mensagens.export_all_messages(); }}
-        }
-});
-
 
 /**
- * Cria a lista de itens para o menu ferramentas
+ * Cria a lista de marcadores para o submenu "Marcadores"
  */
+function getLabels(){
+        var labels = DataLayer.get('label',{criteria:{order: 'name'}});
+        var menuLabelItems = {};
+        for(var i=0; i<labels.length; i++) {
+                menuLabelItems["label"+labels[i].id] = {
+                        "name" : labels[i].name,
+                }
+        }
+        return menuLabelItems;
+}
+
+/**
+ *      Carrega o menu de opção de uma mensagem
+ */
+function loadMenu(){
+        var labelItems = getLabels();
+        $.contextMenu({
+                selector: ".table_box tbody tr",
+                callback: function(key, options) {
+                        //TODO - default actions
+                        
+                        /** 
+                         * Aply labels to selected messages
+                         */
+                        var isLabel = key.match(/label(.*)/);
+                        if (isLabel && isLabel.length > 1) {
+                                var label = {
+                                        id: isLabel[1]
+                                }       
+                                var lableleds = new Array();
+                                
+                                if(currentTab == 0){
+                                        var messages = get_selected_messages().split(',');
+                                }else{
+                                        var messages = get_selected_messages_search().split(',');
+                                }
+
+                                for (var i=0; i < messages.length; i++) {
+                                        var hasLabel = DataLayer.get('labeled', [
+                                                        'AND',
+                                                        ['=', 'labelId', label.id], 
+                                                        ['=', 'folderName', current_folder], 
+                                                        ['=', 'messageNumber', messages[i]]
+                                        ]);
+                                        if (!hasLabel) {
+                                                lableleds.push(
+                                                        DataLayer.put('labeled', {
+                                                                labelId:label.id, 
+                                                                folderName:current_folder, 
+                                                                messageNumber:messages[i]
+                                                        })
+                                                );
+                                                
+                                        }
+                                }
+                                DataLayer.commit();
+                                for (var i=0; i < messages.length; i++) {
+                                        updateLabelsColumn({msg_number:messages[i], labels:false});
+                                }
+                        }
+                },
+                items: {
+                        "flagSeen":      {"name": get_lang("Mark as") + " " + get_lang('seen'), "icon": "seen", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('seen','get_selected_messages'); }},
+                        "flagUnseen":    {"name": get_lang("Mark as") + " " + get_lang('unseen'), "icon": "unseen", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('unseen','get_selected_messages'); }},
+                        "flagFlagged":   {"name": get_lang("Mark as") + " " + get_lang('important'), "icon": "important", callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('flagged','get_selected_messages'); }},
+                        "flagUnflagged": {"name": get_lang("Mark as") + " " + get_lang('normal'), callback: function(key, opt){ proxy_mensagens.proxy_set_messages_flag('unflagged','get_selected_messages'); }},
+                        
+                        "sep1": "---------",
+                        "label": { "name": get_lang("Labels"), "items": labelItems},
+                        "follouwpflag":{"name": get_lang("Follow up"), callback: function(key, opt){ configureFollowupflag(); } },
+                        
+                        "sep2": "---------",
+                        "move": {"name": get_lang("Move to")+"...", "icon": "move", callback: function(key, opt){ wfolders.makeWindow('', 'move_to'); }},
+                        "remove": {"name": get_lang("Delete"),      "icon": "delete", callback: function(key, opt){ proxy_mensagens.delete_msgs('null','selected','null'); }},
+                        "export": {"name": get_lang("Export"),      "icon": "export", callback: function(key, opt){ proxy_mensagens.export_all_messages(); }}
+                }
+        });
+}
+/*FIM*/
+loadMenu();
+
 if (!expresso_offline) {
         var menuToolsItems = {
@@ -40 +100 @@
                 "i04": {"name": get_lang("Edit folders"), "icon": "edit-folder", callback: folderbox },
                 "i05": {"name": get_lang("Share mailbox"), "icon": "share-mailbox", callback: sharebox },
-
-                "i08": {"name": get_lang("Empty trash"), "icon": "empty-trash", callback: function(key, opt){ empty_trash_imap() } }
+                "i06": {"name": get_lang("Labels"), "icon": "tag", callback: configureLabels }, 
+                "i08": {"name": get_lang("Empty trash"), "icon": "empty-trash", callback: function(key, opt){ empty_trash_imap }}
         };
                 
@@ -56 +116 @@
 }
 
-/**
- * Aplica o menu ferramentas
- */
 $.contextMenu({
         selector: "#link_tools",
@@ -70 +127 @@
         events: {
                 show: function(opt) {
-                        /**
-                         * Modifica cor do elemento de trigger para o menu
-                         */
                         var $trigger = $(opt.selector).css({'background-color': '#EEEEEE', 'border': '1px solid #CCCCCC'});
                         $('.context-menu-list.context-menu-root').css({'width': $trigger.css('width') });
@@ -78 +132 @@
                 },
                 hide: function(opt) {
-                        /**
-                         * Modifica cor do elemento de trigger para o menu
-                         */
                         $(opt.selector).css({'background-color': '', 'border': 'none'});
                         return true;
@@ -86 +137 @@
         },
         callback: function(key, options) {
-                //TODO - default actions                
+                
         },
         items: menuToolsItems
 });
 
+
+function updateLabelsColumn(messageInfo) {
+        $('#td_message_labels_' + messageInfo.msg_number +', #td_message_labels_search_' + messageInfo.msg_number)
+        .html('<img src="../prototype/modules/mail/img/tag.png">');
+
+        var menuItems = {};
+        if (messageInfo.labels) {
+                menuItems = messageInfo.labels;
+        } else {
+                var labeleds = DataLayer.get('labeled', {
+                        filter: [
+                                'AND',
+                                ['=', 'folderName', current_folder], 
+                                ['=', 'messageNumber', messageInfo.msg_number]
+                        ],
+                        criteria: {deepness: 2}
+                });
+                if (labeleds) {
+                        for (var i=0; i < labeleds.length; i++)
+                                menuItems[labeleds[i].label.id] = labeleds[i].label;
+                } else {
+                        //não tem labels
+                        return false;
+                }
+        }
+
+        $.contextMenu( 'destroy', '#td_message_labels_' + messageInfo.msg_number +', #td_message_labels_search_' + messageInfo.msg_number);
+
+        $.contextMenu({
+                selector: '#td_message_labels_' + messageInfo.msg_number +', #td_message_labels_search_' + messageInfo.msg_number,
+                trigger: 'hover',
+                delay:100,
+                autoHide:true,
+                callback: function(key, options) {
+                        //alert($(this).attr('id'));
+                },
+                items: menuItems
+        });
+}
+
+/**
+ * TODO
+ * * ao clicar com o botao direito em cima da mensagem, selecionar a mensagem
+ * * clarear a cor do menu ferramentas
+ * * pintar o botao ferramentas, quando clicado, da cor do menu
+ * 
+ */

trunk/expressoMail1_2/js/drag_area.js

@@ -27 +27 @@
         
 }
-
+/*
 DragArea.prototype.makeMenuBox = function(element){
 
@@ -52 +52 @@
         
 }
+*/
 
 DragArea.prototype.makeDragged = function(element, msg_number, subject, from_list, folder){
@@ -72 +73 @@
                                         changeBgColor(is_ie ? window.event : e, msg_number);
                                 }
-                                ConstructRightMenu(is_ie ? window.event : e);
+                                //ConstructRightMenu(is_ie ? window.event : e);
                         }                       
                         return false;

trunk/expressoMail1_2/js/draw_api.js

@@ -1 @@
- var openTab = {
+/**
+ * Estrutura que guarda em cache as mensagens abertas, a exemplo da estrutura utilizada
+ * na funcionalidade de anexar mensagens.
+ * Isto reduz a necessidade de acessar estruturas da tela para obter informações sobre 
+ * as mensagens, como tem sido para encaminhar, responder, etc.
+ * Manter os dados 'limpos' em uma estrutura 'somente-leitura' permite maior flexibilidade
+ * para mudar a tela e menos processamento de limpeza de dados (por exemplo retirar tags de 
+ * formatação, etc.) 
+ */
+onceOpenedHeadersMessages = {};
+
+var openTab = {
         'type' : [], // 8 types of tabs, further info. see expressolivre.org/dev/wiki/mail/Documentacao
         'content_id' : [],
@@ -153 +164 @@
                         var noden=document.getElementById('lnews_roottree_folders');
                         noden.style.backgroundImage="url(templates/"+template+"/images/menu/rss.png)";
+                        
+                        
+                        
                 }
 //              cExecute('$this.rss.getChannels',handlerChannel);
@@ -206 +220 @@
                         }
 
-                /*tree_folders.draw(Element('content_folders'));
+                tree_folders.draw(Element('content_folders'));
                 if (!expresso_offline) {
                         n_root.changeState();
@@ -214 +228 @@
                         root_local.changeState();
                         tree_folders.getNodeById('local_Inbox')._select();
-                }*/
-
+                }
+                
                 var trash_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Trash"]])  + 'tree_folders'); 
-                var draft_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Drafts"]]) + 'tree_folders'); 
-                var sent_span  = document.getElementById(mount_url_folder(["lINBOX",special_folders["Sent"]]) + 'tree_folders'); 
-                var spam_span  = document.getElementById(mount_url_folder(["lINBOX",special_folders["Spam"]]) + 'tree_folders');
+                var draft_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Drafts"]]) + 'tree_folders'); 
+                var sent_span  = document.getElementById(mount_url_folder(["lINBOX",special_folders["Sent"]]) + 'tree_folders'); 
+                var spam_span  = document.getElementById(mount_url_folder(["lINBOX",special_folders["Spam"]]) + 'tree_folders');
                 //local folders
                 var sent_local_conf = this.preferences.save_in_folder.replace(mount_url_folder(["INBOX",""]),"local_");
@@ -321 +335 @@
                 }
         }
-
+}
+
+function draw_tree_labels(){
+        labels = DataLayer.get('label',{criteria:{order: 'name'}});
+
+        $('#content_folders').append("<div id='MyMarckersList' class='acc-list list-label' ></div>").find("#MyMarckersList")
+        .append("<div class='my-labels'>" +
+                                "<img src='../prototype/modules/mail/img/tag.png'/>" +
+                                "<a class='title-my-labels' tabindex='0' role='button' aria-expanded='false' title='Meus marcadores'>Meus marcadores</a>" +
+                                
+                                "<span class='status-list-labels ui-icon ui-icon-triangle-1-s'></span>" +
+                        "</div>"
+        )
+        .append(DataLayer.render("../prototype/modules/mail/templates/label_list.ejs", {labels: labels} ))
+        .find("li.label-item").css({"background-color":"#ffffff", "border-color":"#CCCCCC", "color":"#444444"}).click(function(){
+                var labelId = $(this).attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1];
+                search_emails("UNDELETED KEYWORD \"$Label"+labelId+"\"");
+        })
+        .find(".square-color").css("display","").click(function(){
+                $(this).parent(".label-item").each(function(){
+                        configureLabels({selectedItem: $(this).attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1]});
+                        var id_label_item = $(this).attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1];
+                        $(".label-list-container .label-list").find(".label-item-"+id_label_item).trigger("click");
+                });
+        });
+        
+        $("#MyMarckersList a.title-my-labels").click(function() {
+                $("#MyMarckersList ul.label-list").toggleClass("hidden")
+                $('#MyMarckersList .status-list-labels').toggleClass("ui-icon-triangle-1-s");
+                $('#MyMarckersList .status-list-labels').toggleClass("ui-icon-triangle-1-n");
+         });
+         
+        if (!labels){
+                $(".my-labels").addClass("hidden");
+        }
 }
 
@@ -436 +484 @@
                 }
                 draw_new_tree_folder(); 
+                draw_tree_labels();
 }
 
@@ -601 +650 @@
 // stores the percentages of the cells
 //var colSizes = [ ["24","24","12","12","12","16","16","20%","58%","11%","11%"], ["16","16","12","12","12","20%","20%","*","10%","10%"] ];
-var colSizes = [ ["2%","2%","1%","1%","1%","1%","2%","20%","48%","11%","11%"], ["16","16","12","12","12","20%","20%","*","10%","10%"] ];
+//var colSizes = [ ["2%","2%","1%","1%","1%","1%","2%","2%","20%","46%","11%","11%"], ["16","16","12","12","12","20%","20%","*","10%","10%"] ];
+var colSizes = [ ["2%","2%","1%","1%","1%","1%","2%","2%","2%","20%","46%","11%","11%"], ["2%","1%","1%","1%","1%","1%","1%","20%","20%","*","10%","9%"] ];
 // stores the alignments of the cells
 var colAligns = [ ['','','','','','','','left','left','center','center'], ['','','','','','left','left','left','center','center'] ];
@@ -942 +992 @@
 // Draw the inbox and another folders
 function draw_box(headers_msgs, msg_folder, alternate){
-        /*
+        /*
          * When the paging response is not in the correct folder you need to change folder
          * This occurs when the Ajax response is not fast enough and the user click in outher
@@ -968 +1018 @@
         }
         /* --- */
+         
+        /**
+         * Get the labels aplyed to the messages and saves the information 
+         * into message array 
+         */
+        var messageNumbers = new Array();
+        for (var i=0; i<headers_msgs.length; i++) {
+                messageNumbers.push(headers_msgs[i].msg_number);
+        }
+        var labeleds = DataLayer.get('labeled', {
+                        filter: ['AND', ['IN', 'messageNumber', messageNumbers], ['=', 'folderName', msg_folder]],
+                        criteria: {deepness: 2}
+                });
+
+        if(labeleds) {
+                for (var i=0; i<headers_msgs.length; i++) {
+                        for (var j=0; j<labeleds.length; j++) {
+                                if (labeleds[j].messageNumber == headers_msgs[i].msg_number) {
+                                        if (!headers_msgs[i].labels)
+                                                headers_msgs[i].labels = {};
+                                        headers_msgs[i].labels[labeleds[j].label.id] = labeleds[j].label;
+                                }
+                        }
+                }
+        }
+        
+        /**
+         * Get the followupflags aplyed to the messages and saves the information 
+         * into message array 
+         */
+        var followupflaggeds = DataLayer.get('followupflagged', {
+                        filter: ['AND', ['IN', 'messageNumber', messageNumbers], ['=', 'folderName', msg_folder]],
+                        criteria: {deepness: 1}
+                });
+
+        if(followupflaggeds) {
+                for (var i=0; i<headers_msgs.length; i++) {
+                        for (var j=0; j<followupflaggeds.length; j++) {
+                                if (followupflaggeds[j].messageNumber == headers_msgs[i].msg_number) {
+                                        if (!headers_msgs[i].followupflagged)
+                                                headers_msgs[i].followupflagged = {};
+                                        headers_msgs[i].followupflagged = followupflaggeds[j];
+                                }
+                        }
+                }
+        }
+        
+        /**
+         * Preenche a estrutura de cache de mensagens para posterior consulta de 
+         * informações sobre as mensagens no escopo global.
+         */
+        for (var i=0; i<headers_msgs.length; i++) { 
+                if (!onceOpenedHeadersMessages[current_folder])
+                        onceOpenedHeadersMessages[current_folder] = {};
+                onceOpenedHeadersMessages[current_folder][headers_msgs[i].msg_number] = headers_msgs[i];
+        }
 
         if (alternate)
@@ -1030 +1136 @@
 
                 td_element2 = createTDElement(0,1);
-                td_element3 = createTDElement(0,7,"th_resizable","left","message_header_SORTFROM_"+numBox);
+                td_element3 = createTDElement(0,8,"th_resizable","left","message_header_SORTFROM_"+numBox);
                 td_element3.onclick = function () {sort_box(search_box_type,'SORTFROM');};
                 td_element3.innerHTML = get_lang("From");
 
-                td_element4 = createTDElement(0,8,"th_resizable","left","message_header_SORTSUBJECT_"+numBox);
+                td_element4 = createTDElement(0,9,"th_resizable","left","message_header_SORTSUBJECT_"+numBox);
                 td_element4.onclick = function () {sort_box(search_box_type,'SORTSUBJECT');};
                 td_element4.innerHTML = get_lang("Subject");
 
-                td_element5 = createTDElement(0,9,"th_resizable","center","message_header_SORTARRIVAL_"+numBox);
+                td_element5 = createTDElement(0,10,"th_resizable","center","message_header_SORTARRIVAL_"+numBox);
                 td_element5.onclick = function () {sort_box(search_box_type,'SORTARRIVAL');};
                 td_element5.innerHTML = get_lang("Date");
 
-                td_element6 = createTDElement(0,10,"th_resizable","left","message_header_SORTSIZE_"+numBox);
+                td_element6 = createTDElement(0,11,"th_resizable","left","message_header_SORTSIZE_"+numBox);
                 td_element6.onclick = function () {sort_box(search_box_type,'SORTSIZE');}
                 td_element6.innerHTML = get_lang("Size");
@@ -1060 +1166 @@
                 var td_element24 = createTDElement(0,5);
                 td_element24.innerHTML = "&nbsp;";
-
-                var td_element25 = createTDElement(0,6);
+                        
+                
+                var td_element25 = createTDElement(0,7);
                 td_element25.innerHTML = "&nbsp;";
+                
+                var td_element27 = createTDElement(0,8);
+                td_element25.innerHTML = "&nbsp;";
+                
+                var td_element26 = createTDElement(0,6);
+                td_element26.innerHTML = "&nbsp;";
+                
 
                 tr_element.appendChild(td_element21);
@@ -1068 +1182 @@
                 tr_element.appendChild(td_element23);
                 tr_element.appendChild(td_element24);
+                tr_element.appendChild(td_element26);
+                tr_element.appendChild(td_element27);
                 tr_element.appendChild(td_element25);
+                
                 tr_element.appendChild(td_element3);
                 tr_element.appendChild(td_element4);
@@ -1211 +1328 @@
                                 },
                                 helper: function(event){
-                                        if($(this).find("input:checkbox").attr("checked") != "checked"){
-                                                $(this).find("input:checkbox").trigger('click');
-                                                $(this).addClass("selected_msg");
-                                        }
+                                        $(this).find("input:checkbox").attr("checked", true);
                                         if($("#table_box").find("tr input:checked").length > 1)
                                                 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"}));
@@ -1228 +1342 @@
                                 scrollSpeed: 100,
                                 containment: "#divAppbox"
-                        }).bind("contextmenu", function(){
-                                if($(this).find("input:checkbox").attr("checked") != "checked"){
-                                        $(this).find("input:checkbox").trigger('click');
-                                        $(this).addClass("selected_msg");
+                        }).bind("mouseup", function(event){
+                                if(event.button == 2)
+                                        if($(this).find("input:checkbox").attr("checked") != "checked"){
+                                                $(this).find("input:checkbox").trigger('click');
+                                                $(this).addClass("selected_msg");
                                 }
                         });
@@ -1255 +1370 @@
                 alert("Carregou em "+(_eTime - _bTime)+" ms");
         }
+        
         var msg_folder = Element('msg_folder').value;
         var msg_number = Element('msg_number').value;
@@ -1271 +1387 @@
         if(Element("table_quota"))
                 connector.loadScript("InfoQuota");
-
+        
         // creates the dotted ruler which helps user to visualize resizing of columns
         var ruler_element = document.getElementById("table_message_ruler");
@@ -1281 +1397 @@
                 document.getElementById("exmail_main_body").appendChild(ruler_element);
     }
-
+                                
 }
 
@@ -1303 +1419 @@
 // Passar o parâmetro offset para esta função
 function make_tr_message(headers_msgs, msg_folder, offsetToGMT){
-                if (typeof offsetToGMT == 'undefined')
-                {
-                    // In older local messages headers_msgs.offsetToGMT is undefined.
-                    offsetToGMT = typeof headers_msgs.offsetToGMT != 'undefined'?headers_msgs.offsetToGMT:0;
-                }
+
+                if (typeof offsetToGMT == 'undefined')
+                {
+                        // In older local messages headers_msgs.offsetToGMT is undefined.
+                        offsetToGMT = typeof headers_msgs.offsetToGMT != 'undefined'?headers_msgs.offsetToGMT:0;
+                }
                 var tr_element = document.createElement('tr');
                 if(typeof(preferences.line_height) != 'undefined')
@@ -1350 +1467 @@
                 chk_box_element.className = "checkbox";
                 chk_box_element.setAttribute("id", "check_box_message_"+headers_msgs.msg_number);
-                chk_box_element.onclick = function(e){
-                        if (is_ie)
-                                changeBgColor(window.event,headers_msgs.msg_number);
-                        else
+                chk_box_element.onchange = function(e){
+                        //if (is_ie)
                                 changeBgColor(e,headers_msgs.msg_number);
                 };
@@ -1415 +1530 @@
 
 
-                td_element25 = createTDElement(0,6,"td_msg",null,"td_message_unseen_"+headers_msgs.msg_number);
+                td_element25 = createTDElement(0,7,"td_msg",null,"td_message_unseen_"+headers_msgs.msg_number);
                 if ((headers_msgs.Unseen == 'U') || (headers_msgs.Recent == 'N'))
                         td_element25.innerHTML = "<img src ='templates/"+template+"/images/unseen.gif' title='"+get_lang('Unseen')+"'>";
@@ -1422 +1537 @@
 
 
-                td_element3 = createTDElement(0,7,"td_msg td_resizable","left","td_from_"+ headers_msgs.msg_number);
+                td_element3 = createTDElement(0,8,"td_msg td_resizable","left","td_from_"+ headers_msgs.msg_number);
                 var _onclick = function(){InfoContact.hide();proxy_mensagens.get_msg(headers_msgs.msg_number, msg_folder,true, show_msg);};
                 td_element3.onclick = _onclick;
@@ -1483 +1598 @@
                 }
 
-                td_element4 = createTDElement(0,8,"td_msg td_resizable","left");
+                td_element4 = createTDElement(0,9,"td_msg td_resizable","left");
                 td_element4.className += " td_msg_subject";
                 td_element4.onclick = _onclick;
@@ -1511 +1626 @@
                         td_element4.innerHTML += "</a>";
                 }
-
-
-                td_element5 = createTDElement(0,9,"td_msg td_resizable","center");
+                
+                td_element5 = createTDElement(0,10,"td_msg td_resizable","center");
                 td_element5.onclick = _onclick;
-
+                
+                td_element27 = createTDElement(0,7,"td_msg",null,"td_message_labels_"+headers_msgs.msg_number);
+                $(td_element27).addClass("td-label");
+
+                if (headers_msgs.labels) {
+                        td_element27.innerHTML = '<img src="../prototype/modules/mail/img/tag.png">';
+                        updateLabelsColumn(headers_msgs)                
+                }
+                
+                td_element26 = createTDElement(0,6,"td_msg",null,"td_message_followup_"+headers_msgs.msg_number);
+                $(td_element26).addClass("td-followup-flag");
+                td_element26.innerHTML = '<div class="flag-edited" style="width:9px;height:6px;"><img src="../prototype/modules/mail/img/flagEditor.png"></div>';
+        
+                if (headers_msgs.followupflagged) {
+                        $(td_element26).attr('title', headers_msgs.followupflagged.followupflag.name)
+                        .find(".flag-edited").css("background",headers_msgs.followupflagged.backgroundColor);
+                        if(headers_msgs.followupflagged.isDone == "1"){
+                                $(td_element26).find(".flag-edited").find("img")
+                                .attr("src", "../prototype/modules/mail/img/flagChecked.png")
+                                .css("margin-left","-3px");
+                        }
+                } else {
+                        $(td_element26).find(".flag-edited").css("background","#cccccc");
+                }
+                
+                /**
+                 * Clique para aplicar sinalizador
+                 */
+                $(td_element26).click(function() {      
+                        
+                        var messageClickedId = $(this).attr('id').match(/td_message_followup_([\d]+)/)[1];
+                         /**
+                                * Hack:
+                                * headers_msgs.followupflagged.id não vai funcionar porque já foi feito DataLayer.commit()
+                                * por isso o id deve ser obtido do banco
+                                * também para verificar se há ou não sinalizador nesta mensagem
+                        */
+                        var flagged = DataLayer.get('followupflagged', {filter: [
+                                'AND', 
+                                ['=', 'messageNumber', messageClickedId], 
+                                ['=', 'folderName', msg_folder]
+                        ]});
+                        if (flagged == '' || flagged == [] || flagged == 'undefined') {
+                                /**
+                                 * Aplica followupflag de Acompanhamento
+                                 */
+
+                                headers_msgs.followupflagged = {
+                                        uid : User.me.id,
+                                        folderName : msg_folder, 
+                                        messageNumber : messageClickedId, 
+                                        alarmTime : false, 
+                                        backgroundColor : '#FF2016',
+                                        followupflagId: '1',
+                                        followupflag: DataLayer.get('followupflag', '1')
+                                };
+                                $(this).find(".flag-edited").css("background", headers_msgs.followupflagged.backgroundColor);
+                                headers_msgs.followupflagged.id = DataLayer.put('followupflagged', headers_msgs.followupflagged);
+                                
+                        } else if (headers_msgs.followupflagged.followupflag.name == 'Follow up') {
+                                /**
+                                 * Remover followupflag de Acompanhamento (DFD0078:RI25)
+                                 */
+                                 $(this).find(".flag-edited").css("background", "#cccccc");
+
+
+                                DataLayer.remove('followupflagged', flagged[0].id);
+                                $('#td_message_followup_' + messageClickedId + ', ' + 
+                                '#td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
+                        } else {
+                                $(tr_element).addClass('selected_msg').find(':checkbox').trigger('click');
+                                configureFollowupflag();
+                        }
+                        
+                });     
+                
                 var norm = function (arg) {return (arg < 10 ? '0'+arg : arg);};
                 var weekDays = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
@@ -1557 +1747 @@
                 td_element5.alt = td_element5.title;
 
-                td_element6 = createTDElement(0,10,"td_msg td_resizable","center");
+                td_element6 = createTDElement(0,11,"td_msg td_resizable","center");
                 td_element6.onclick = _onclick;
                 td_element6.setAttribute("noWrap","true");
@@ -1567 +1757 @@
                 tr_element.appendChild(td_element22);
                 tr_element.appendChild(td_element23);
-                        tr_element.appendChild(td_element24);
+                tr_element.appendChild(td_element24);
+                tr_element.appendChild(td_element26);
+                tr_element.appendChild(td_element27);
                 tr_element.appendChild(td_element25);
+
                 tr_element.appendChild(td_element3);
                 tr_element.appendChild(td_element4);
@@ -3386 +3579 @@
             if ((e.keyCode) == 120) //F9
                         {
-                emQuickSearch(input_replyto.value, 'replyto', ID, undefined,true);
+                emQuickSearch(input_replyto.value, 'replyto', ID);
                         }
                         else
@@ -3412 +3605 @@
                         if ((window.event.keyCode) == 120) //F9
                         {
-                                        emQuickSearch(input_replyto.value, 'replyto', ID, undefined,true);
+                                        emQuickSearch(input_replyto.value, 'replyto', ID);
                         }
                         else
@@ -3453 +3646 @@
                         if ((e.keyCode) == 120) //F9
                         {
-                                emQuickSearch(input_to.value, 'to', ID, undefined,true);
+                                emQuickSearch(input_to.value, 'to', ID);
                         }
                         else
@@ -3479 +3672 @@
                         if ((window.event.keyCode) == 120) //F9
                         {
-                                emQuickSearch(input_to.value, 'to', ID, undefined,true);
+                                emQuickSearch(input_to.value, 'to', ID);
                         }
                         else
@@ -3536 +3729 @@
                         if ((e.keyCode) == 120) //F9
                         {
-                                emQuickSearch(input_cc.value, 'cc', ID, undefined,true);
+                                emQuickSearch(input_cc.value, 'cc', ID);
                         }
                         else
@@ -3562 +3755 @@
                         if ((window.event.keyCode) == 120) //F9
                         {
-                                emQuickSearch(input_cc.value, 'cc', ID, undefined,true);
+                                emQuickSearch(input_cc.value, 'cc', ID);
                         }
                         else
@@ -3608 +3801 @@
                                 if ((e.keyCode) == 120) //F9
                                 {
-                                        emQuickSearch(input_cco.value, 'cco', ID, undefined,true);
+                                        emQuickSearch(input_cco.value, 'cco', ID);
                                 }
                                 else
@@ -3633 +3826 @@
                                 if ((window.event.keyCode) == 120) //F9
                                 {
-                                        emQuickSearch(input_cco.value, 'cco', ID, undefined,true);
+                                        emQuickSearch(input_cco.value, 'cco', ID);
                                 }
                                 else
@@ -3656 +3849 @@
         var cc_load = "";
         a_cc_link.onclick = function () {
-                var rm = false;
                 var remove = function(){
                         document.getElementById('tr_cc_'+ID).style.display = 'none';
@@ -3662 +3854 @@
                         $("#cc_"+ID).val("");
                         $("#a_cc_link_"+ID).toggleClass("expressomail-button-icon-ative");
-                        rm = true;
                 }
                 if(!($("#cc_"+ID).parent().find("div")[0])){
@@ -3682 +3873 @@
                         }
                 }
-                if (rm)
-                        input_to.focus();
-                else    
-                        input_cc.focus();               
+                input_cc.focus();
+                
                 return false;
         };
@@ -4014 +4203 @@
                 $("#"+$(this).attr("name")).attr("checked", (!check ? true : false));
                 //$(this).button({ disabled: false });
-                if (RichTextEditor.plain[id] != true)
-                        setTimeout("RichTextEditor.focus("+ID+")",100);                 
-                else 
-                        $('#body_'+ID).focus();
         });
         

trunk/expressoMail1_2/js/main.js

@@ -322 +322 @@
 
 function show_msg_img(msg_number,folder){
+alert(msg_number+folder);
         var call_back = function(data){
            data.showImg = true;

trunk/expressoMail1_2/js/search.js

@@ -16 +16 @@
                 this.elementChecked = false;
         }
-
+        
         //Monta os forms dentro da janela;
         searchE.prototype.showForms = function(value)
@@ -442 +442 @@
         
         searchE.prototype.make_tr_message = function(aux,border_id,i) {
+        console.log(aux);
+        /**
+         * Preenche a estrutura de cache de mensagens para posterior consulta de 
+         * informações sobre as mensagens no escopo global.
+         */
+                if (!onceOpenedHeadersMessages[aux.boxname])
+                        onceOpenedHeadersMessages[aux.boxname] = {};
+                onceOpenedHeadersMessages[aux.boxname][aux.uid] = aux;  
+        
                 var tr = document.createElement("TR");
                 if(typeof(preferences.line_height) != 'undefined')
                         tr.style.height = preferences.line_height;
-
+                        
+                var msg_folder = get_current_folder(); 
+                                
                 var mailbox = aux.boxname;
                 var uid_msg = aux.uid;
@@ -455 +466 @@
                 tr.setAttribute('name',mailbox);
                 tr.name = mailbox;
-
+                
                 if ( aux.flag.match("U") )
                         add_className(tr,'tr_msg_unread');
@@ -466 +477 @@
                 };
 
-                for(var j=0 ; j <= 10 ; j++)
+                for(var j=0 ; j <= 11 ; j++)
                 {
                         var td = document.createElement("TD");
@@ -519 +530 @@
                         {
                                 td.setAttribute("width", colSizes[1][4]);
+                                td.id = "td_message_followup_search_"+uid_msg;
+                                td.setAttribute("class","search-result-item");
+                                //td1 = "<img src ='../prototype/modules/mail/img/flagDefault.png' title='"+get_lang('Followup')+"'>";
+                                td1 = '<div class="flag-edited" style="width:9px;height:6px;"><img src="../prototype/modules/mail/img/flagEditor.png"></div>';
+                                                
+                                $(td).click(function(event, ui){        
+                                        var messageClickedId = $(this).attr('id').match(/td_message_followup_search_([\d]+)/)[1];
+                                        var flagged = DataLayer.get('followupflagged', {filter: [
+                                                'AND', 
+                                                ['=', 'messageNumber', messageClickedId], 
+                                                ['=', 'folderName', mailbox]
+                                        ]});
+                                        if(flagged == '' || flagged == [] || flagged == 'undefined'){
+                                                /**
+                                                * Aplica followupflag de Acompanhamento
+                                                */
+                                                aux.followupflagged = {
+                                                        uid : User.me.id,
+                                                        folderName : mailbox, 
+                                                        messageNumber : messageClickedId, 
+                                                        alarmTime : false, 
+                                                        backgroundColor : '#FF2016',
+                                                        followupflagId: '1',
+                                                        followupflag: DataLayer.get('followupflag', '1')
+                                                };
+                                                $(this).find(".flag-edited").css("background", aux.followupflagged.backgroundColor);
+                                                aux.followupflagged.id = DataLayer.put('followupflagged', aux.followupflagged);
+                                                
+                                        }else if(aux.followupflagged.id){
+                                                /**
+                                                * Remover followupflag de Acompanhamento (DFD0078:RI25)
+                                                */
+                                                $(this).find(".flag-edited").css("background", "#cccccc");
+
+
+                                                DataLayer.remove('followupflagged', flagged[0].id);
+                                                $('#td_message_followup_' + messageClickedId + ', ' + 
+                                                '#td_message_followup_search_' + messageClickedId).find(".flag-edited")
+                                                .find("img").attr("src", "../prototype/modules/mail/img/flagEditor.png").css("margin-left","0");
+                                        } else {
+                                                //TODO - open dialog
+                                        }
+                                        if(!DataLayer.commit()){}
+
+                                });                             
+                        }
+                        if (j == 5)
+                        {
+                                td.setAttribute("width", colSizes[1][5]);
+                                td.id = "td_message_labels_search_"+uid_msg;
+                                td.setAttribute("class","td-label-search");                             
+                                
+                                if (aux.labels) {
+                                        td1 = '<img src="../prototype/modules/mail/img/tag.png">';
+                                        updateLabelsColumn(aux)         
+                                } else {
+                                        td1 = '';
+                                }
+                        }
+                        if (j == 6)
+                        {
+                                td.setAttribute("width", colSizes[1][6]);
                                 td.id = "td_message_sent_"+uid_msg;
                                 td1 = '';
                         }
 
-                        if ( j == 5 )
-                        {
-                                td.setAttribute("width", colSizes[1][5]);
+                        if ( j == 7 )
+                        {
+                                td.setAttribute("width", colSizes[1][7]);
                                 td.className = "td_resizable";
                                 td.onclick = _onclick;
@@ -536 +609 @@
 
                                 var td1  = get_lang(td1).substr(get_lang(td1).length-1) == "*"?td1:get_lang(td1);
-
-                                                                        td1 = translateFolder(td1);
-
-
-                                if( proxy_mensagens.is_local_folder(td1))
-                                {
+                                td1 = translateFolder(td1);
+
+                                if (proxy_mensagens.is_local_folder(td1)) {
                                         var td1 = this.aux_local_folder_display(td1);
                                 }
                         }
 
-                        if( j == 6 )
+                        if( j == 8 )
                         {
                                 var name;
@@ -557 +627 @@
                                         name = name.substr(0,29) + "...";
 
-                                td.setAttribute("width", colSizes[1][6]);
+                                td.setAttribute("width", colSizes[1][8]);
                                 td.className = "td_resizable";
                                 td.onclick = _onclick;
@@ -566 +636 @@
                         }
 
-                        if( j == 7 )
+                        if( j == 9 )
                         {
                                 var subject_encode = url_encode(subject);
@@ -575 +645 @@
                                         aux.subject = aux.subject.substr(0,70) + "...";
 
-                                td.setAttribute("width", colSizes[1][7]);
+                                td.setAttribute("width", colSizes[1][9]);
                                 td.className = "td_resizable td_msg_search_subject";
                                 td.onclick = _onclick;
@@ -584 +654 @@
                         }
 
-                        if( j == 8 )
-                        {
-                                td.setAttribute("width", colSizes[1][8]);
+                        if( j == 10 )
+                        {
+                                td.setAttribute("width", colSizes[1][10]);
                                 td.className = "td_resizable";
                                 td.align                = "center";
@@ -609 +679 @@
                         }
 
-                        if( j == 9 )
+                        if( j == 11 )
                         {
                                 td.setAttribute("width", "9.4%");//alinhamento dos campos data e tamanho
@@ -623 +693 @@
                         }
 
-                        if( j == 10 )
+                        if( j == 12 )
                         {
                                 if (aux.flag.match("U"))
@@ -631 +701 @@
                                 var td1 = '';
                         }
-                        if (j<10) {
+                        if (j<12) {
                                 td.innerHTML = td1;
+                                
+                                //Carregar os followupflag nos resultados.
+                                if (aux.followupflagged) {
+                                        $(td).attr('title', aux.followupflagged.followupflag.name)
+                                        .find(".flag-edited").css("background",aux.followupflagged.backgroundColor);
+                                        if(aux.followupflagged.isDone == "1"){
+                                                $(td).find(".flag-edited").find("img")
+                                                .attr("src", "../prototype/modules/mail/img/flagChecked.png")
+                                                .css("margin-left","-3px");
+                                        }
+                                } else {
+                                        $(td).find(".flag-edited").css("background","#cccccc");
+                                }
+                                
                                 tr.appendChild(td);
                         }
@@ -692 +776 @@
                         scrollSpeed: 100,
                         containment: "#divAppbox"
-                }).bind("contextmenu", function(){
-                        if($(this).find("input:checkbox").attr("checked") != "checked"){
-                                $(this).find("input:checkbox").trigger('click');
-                                $(this).addClass("selected_msg");
+                }).bind("mouseup", function(event){
+                        if(event.button == 2)
+                                if($(this).find("input:checkbox").attr("checked") != "checked"){
+                                        $(this).find("input:checkbox").trigger('click');
+                                        $(this).addClass("selected_msg");
                         }
                 });
@@ -705 +790 @@
         {
                 var data = ( Data['data'] ) ? Data['data'] : Data['data_gears'];
-                
                 if ( data == undefined )
                         return;
-                
+        
                 var cont = parseInt(0);
 
@@ -859 +943 @@
                 td_element03 = createTDElement(1,3);
                 td_element04 = createTDElement(1,4);
-                td_element1 = createTDElement(1,5,"th_resizable","left");
+                td_element05 = createTDElement(1,5);
+                td_element06 = createTDElement(1,6);
+                td_element1 = createTDElement(1,7,"th_resizable","left");
                 
                 var arrow_ascendant = function(Text)
@@ -865 +951 @@
                         return "<b>" + Text + "</b><img src='templates/"+template+"/images/arrow_ascendant.gif'>";
                 }
-                
+
                 // Ordernar Pasta
                 if ( sort_type == 'SORTBOX' /*|| sort_type == 'SORTBOX_REVERSE'*/ )
@@ -894 +980 @@
                 
                 // Ordernar Quem
-                td_element2 = createTDElement(1,6,"th_resizable","left");
+                td_element2 = createTDElement(1,8,"th_resizable","left");
 
                 if (sort_type == 'SORTFROM' || sort_type == 'SORTWHO' /*|| sort_type == 'SORTWHO_REVERSE' || sort_type == 'SORTFROM_REVERSE'*/ )
@@ -923 +1009 @@
                 
                 // Ordernar Subject
-                td_element3 = createTDElement(1,7,"th_resizable","left");
+                td_element3 = createTDElement(1,9,"th_resizable","left");
                 
                 if (sort_type == 'SORTSUBJECT' /*|| sort_type == 'SORTSUBJECT_REVERSE'*/)
@@ -952 +1038 @@
                 
                 // Ordernar Data
-                td_element4 = createTDElement(1,8,"th_resizable","center");
+                td_element4 = createTDElement(1,10,"th_resizable","center");
                 
                 if ( sort_type == 'SORTDATE' /*|| sort_type == 'SORTDATE_REVERSE'*/ )
@@ -981 +1067 @@
 
                 // Ordernar Tamanho
-                td_element5 = createTDElement(1,9,"th_resizable","center");
+                td_element5 = createTDElement(1,11,"th_resizable","center");
                 
                 if ( sort_type == 'SORTSIZE' /*|| sort_type == 'SORTSIZE_REVERSE'*/ )
@@ -1008 +1094 @@
                         td_element5.innerHTML   = ( sort_type == 'SORTSIZE_REVERSE' ) ? arrow_ascendant(get_lang("size")) : get_lang("size");
                 }
+                
+                //Abrir a Tela de de Configuracao de Acompanhamento
+                
                 
                 tr_element.appendChild(td_element0);
@@ -1014 +1103 @@
                 tr_element.appendChild(td_element03);
                 tr_element.appendChild(td_element04);
+                tr_element.appendChild(td_element05);
+                tr_element.appendChild(td_element06);
                 tr_element.appendChild(td_element1);
                 tr_element.appendChild(td_element2);
@@ -1022 +1113 @@
                 table_element.appendChild(tbody_element);
 
+                
                 var colgr_element = buildColGroup(1);
                 colgr_element.setAttribute("id","colgroup_head_"+numBox);
@@ -1624 +1716 @@
 // Cria o objeto
 var EsearchE = new searchE();
+var EsearchE = new searchE();

trunk/expressoMail1_2/templates/default/expressomail.css

@@ -119 +119 @@
 }
 
-
-
-
 .context-menu-item.icon-important { background-image: url(images/important.gif); background-position: 6px 5px !important}
 .context-menu-item.icon-export { background-image: url(images/export.png); }
@@ -131 +128 @@
 
 
-
 .context-menu-item.icon-search-mail { background-image: url(images/menu/search.png); }
 .context-menu-item.icon-filter { background-image: url(images/menu/filters.png); }
@@ -137 +133 @@
 .context-menu-item.icon-share-mailbox { background-image: url(images/menu/usersfolders.png); }
 .context-menu-item.icon-label { background-image: url(images/menu/usersfolders.png); }
+.context-menu-item.icon-tag { background-image: url(images/menu/tag.png); margin: 3px; }
 .context-menu-item.icon-empty-trash { background-image: url(images/menu/trash.png); }
 .context-menu-item.icon-queue { background-image: url(images/menu/queue.png); }
-

trunk/expressoMail1_2/templates/default/index.tpl

@@ -207 +207 @@
 <div id="sandbox" class="expresso-calendar-container hidden">
 </div>
+<div id="windowLabels" class="label-configure-win"></div>
+<div id="followupFlag" class="followupflag-configure-win hidden"></div>
 <!-- END list -->