Changeset 1477

Timestamp:

10/01/09 13:46:05 (15 years ago)

Author:

eduardoalex

Message:

Ticket #611 - Adição da funcionalidade. (aqui é para completar os 40 caracteres)

Location:

trunk/expressoMail1_2/js

Files:

• TreeS.js (modified) (1 diff)
• draw_api.js (modified) (4 diffs)
• local_messages.js (modified) (2 diffs)
• messages_proxy.js (modified) (3 diffs)
• search.js (modified) (1 diff)

trunk/expressoMail1_2/js/TreeS.js

@@ -178 +178 @@
                         var local_folders = expresso_local_messages.list_local_folders();
                         for (var i in local_folders) { //Coloca as pastas locais.
+                        
+                                var node_parent = "local_root";
+                                var new_caption = local_folders[i][0];
+                                if(local_folders[i][0].indexOf("/")!="-1") {
+                                        final_pos = local_folders[i][0].lastIndexOf("/");
+                                        node_parent = "local_"+local_folders[i][0].substr(0,final_pos);
+                                        new_caption = local_folders[i][0].substr(final_pos+1);
+                                }
+                                
                                 if (local_folders[i][1] > 0) 
                                         var nodeLocal = new dNode({
                                                 id: "local_" + local_folders[i][0],
-                                                caption: lang_folder(local_folders[i][0]) + '<font style=color:red>&nbsp(</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',
-                                                plusSign: 0
+                                                caption: lang_folder(new_caption) + '<font style=color:red>&nbsp(</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',
+                                                plusSign: local_folders[i][2]
                                         });
                                 else 
                                         var nodeLocal = new dNode({
                                                 id: "local_" + local_folders[i][0],
-                                                caption: lang_folder(local_folders[i][0]),
-                                                plusSign: 0
+                                                caption: lang_folder(new_caption),
+                                                plusSign: local_folders[i][2]
                                         });
-                                folders_tree.add(nodeLocal, "local_root");
+                                folders_tree.add(nodeLocal, node_parent);
                         }
                 }

trunk/expressoMail1_2/js/draw_api.js

@@ -89 +89 @@
                         var has_changes = false;
                         for (var i in local_folders) { //Coloca as pastas locais.
+                                
+                                var new_caption = local_folders[i][0];
+                                if(local_folders[i][0].indexOf("/")!="-1") {
+                                        final_pos = local_folders[i][0].lastIndexOf("/");
+                                        new_caption = local_folders[i][0].substr(final_pos+1);
+                                }
+                                
                                 var folder_unseen = Element('dftree_local_'+local_folders[i][0]+'_unseen');
                                 
@@ -98 +105 @@
                                 else if (local_folders[i][1] > 0)
                                 {
-                                        tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(local_folders[i][0]) + '<font style=color:red>&nbsp(</font><span id="dftree_local_'+local_folders[i][0]+'_unseen" style=color:red>'+local_folders[i][1]+'</span><font style=color:red>)</font>'});
+                                        tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(new_caption) + '<font style=color:red>&nbsp(</font><span id="dftree_local_'+local_folders[i][0]+'_unseen" style=color:red>'+local_folders[i][1]+'</span><font style=color:red>)</font>'});
                                         tree_folders.getNodeById("local_"+local_folders[i][0])._refresh();
                                         has_changes = true;
@@ -104 +111 @@
                                 else if (local_folders[i][1] <= 0)
                                 {
-                                        tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(local_folders[i][0])});
+                                        tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(new_caption)});
                                         tree_folders.getNodeById("local_"+local_folders[i][0])._refresh();
                                         has_changes = true;
@@ -181 +188 @@
                                 var local_folders = expresso_local_messages.list_local_folders();
                                 for (var i in local_folders) { //Coloca as pastas locais.
+                                        var node_root = "local_root";
+                                        var new_caption = local_folders[i][0];
+                                        if(local_folders[i][0].indexOf("/")!="-1") {
+                                                final_pos = local_folders[i][0].lastIndexOf("/");
+                                                node_root = "local_"+local_folders[i][0].substr(0,final_pos);
+                                                new_caption = local_folders[i][0].substr(final_pos+1);
+                                        }
                                         if (local_folders[i][1] > 0) 
                                                 var nodeLocal = new dNode({
                                                         id: "local_" + local_folders[i][0],
-                                                        caption: lang_folder(local_folders[i][0]) + '<font style=color:red>&nbsp(</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',
-                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + local_folders[i][0] + "')",
-                                                        plusSign: 0
+                                                        caption: lang_folder(new_caption) + '<font style=color:red>&nbsp(</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',
+                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')",
+                                                        plusSign: local_folders[i][2]
                                                 });
                                         else 
                                                 var nodeLocal = new dNode({
                                                         id: "local_" + local_folders[i][0],
-                                                        caption: lang_folder(local_folders[i][0]),
-                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + local_folders[i][0] + "')",
-                                                        plusSign: 0
+                                                        caption: lang_folder(new_caption),
+                                                        onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')",
+                                                        plusSign: local_folders[i][2]
                                                 });
-                                        tree_folders.add(nodeLocal, "local_root");
+                                        tree_folders.add(nodeLocal, node_root);
                                 }
                         }

trunk/expressoMail1_2/js/local_messages.js

@@ -477 +477 @@
                         temp[0] = rs.field(0);
                         temp[1] = rs.field(1);
+                        var rs2 = this.dbGears.execute("select * from folder where folder like ?",["%"+temp[0]+"/%"]);
+                        if(rs2.isValidRow())
+                                temp[2] = 1;
+                        else
+                                temp[2] = 0;
                         retorno.push(temp);
                         rs.next();
@@ -490 +495 @@
                         return false; //can't create folder with string local_
                 this.init_local_messages();
+                if (old_folder.indexOf("/") != "-1") {
+                        final_pos = old_folder.lastIndexOf("/");
+                        folder = old_folder.substr(0, final_pos) + "/" + folder;
+                }
                 try {
                         this.dbGears.execute("update folder set folder=? where folder=? and uid_usuario=?",[folder,old_folder,account_id]);

trunk/expressoMail1_2/js/messages_proxy.js

@@ -120 +120 @@
 
         messages_proxy.prototype.proxy_create_folder = function() {
-                if (ttree.FOLDER == 'local_root') {
+                if (this.is_local_folder(ttree.FOLDER)) {
 
                         folder = prompt(get_lang('Enter the name of the new folder:'), "");
@@ -128 +128 @@
                                 return false;
                         }
-                        var temp = expresso_local_messages.create_folder(folder);
+                        if(ttree.FOLDER=="local_root")
+                                var temp = expresso_local_messages.create_folder(folder);
+                        else
+                                var temp = expresso_local_messages.create_folder(ttree.FOLDER.substr(6)+"/"+folder);
                         if (!temp) 
                                 alert(get_lang("cannot create folder. try other folder name"));
@@ -151 +154 @@
                                 return false;
                         }
-                        var string_confirm = get_lang("Do you wish to exclude the folder ") + ttree.FOLDER.substr(6) + "?";
+                        if(ttree.FOLDER.indexOf("/")!="-1") {
+                                final_pos = ttree.FOLDER.lastIndexOf("/");
+                                new_caption = ttree.FOLDER.substr(final_pos+1);
+                        }
+                        else {
+                                new_caption = ttree.FOLDER.substr(6);
+                        }
+                        var string_confirm = get_lang("Do you wish to exclude the folder ") + new_caption + "?";
 
                         if (confirm(string_confirm)) {
                                 expresso_local_messages.remove_folder(ttree.FOLDER.substr(6));
-                                alert(get_lang("The folder %1 was successfully removed", ttree.FOLDER.substr(6)));
+                                alert(get_lang("The folder %1 was successfully removed", new_caption));
                                 ttreeBox.update_folder();
                         }

trunk/expressoMail1_2/js/search.js

@@ -664 +664 @@
                         if(this.name_box_search=='local_Inbox')
                                 name_box_def = get_lang("Inbox");
+                        else if(this.name_box_search.indexOf("/")!="-1") {
+                                final_pos = this.name_box_search.lastIndexOf("/");
+                                name_box_def = this.name_box_search.substr(final_pos+1);
+                        }
                         else
                                 name_box_def = this.name_box_search.substr(6);//Retira o 'local_'