Changeset 1477 for trunk/expressoMail1_2
- Timestamp:
- 10/01/09 13:46:05 (15 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/TreeS.js
r1121 r1477 178 178 var local_folders = expresso_local_messages.list_local_folders(); 179 179 for (var i in local_folders) { //Coloca as pastas locais. 180 181 var node_parent = "local_root"; 182 var new_caption = local_folders[i][0]; 183 if(local_folders[i][0].indexOf("/")!="-1") { 184 final_pos = local_folders[i][0].lastIndexOf("/"); 185 node_parent = "local_"+local_folders[i][0].substr(0,final_pos); 186 new_caption = local_folders[i][0].substr(final_pos+1); 187 } 188 180 189 if (local_folders[i][1] > 0) 181 190 var nodeLocal = new dNode({ 182 191 id: "local_" + local_folders[i][0], 183 caption: lang_folder( local_folders[i][0]) + '<font style=color:red> (</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',184 plusSign: 0192 caption: lang_folder(new_caption) + '<font style=color:red> (</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>', 193 plusSign: local_folders[i][2] 185 194 }); 186 195 else 187 196 var nodeLocal = new dNode({ 188 197 id: "local_" + local_folders[i][0], 189 caption: lang_folder( local_folders[i][0]),190 plusSign: 0198 caption: lang_folder(new_caption), 199 plusSign: local_folders[i][2] 191 200 }); 192 folders_tree.add(nodeLocal, "local_root");201 folders_tree.add(nodeLocal, node_parent); 193 202 } 194 203 } -
trunk/expressoMail1_2/js/draw_api.js
r1466 r1477 89 89 var has_changes = false; 90 90 for (var i in local_folders) { //Coloca as pastas locais. 91 92 var new_caption = local_folders[i][0]; 93 if(local_folders[i][0].indexOf("/")!="-1") { 94 final_pos = local_folders[i][0].lastIndexOf("/"); 95 new_caption = local_folders[i][0].substr(final_pos+1); 96 } 97 91 98 var folder_unseen = Element('dftree_local_'+local_folders[i][0]+'_unseen'); 92 99 … … 98 105 else if (local_folders[i][1] > 0) 99 106 { 100 tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder( local_folders[i][0]) + '<font style=color:red> (</font><span id="dftree_local_'+local_folders[i][0]+'_unseen" style=color:red>'+local_folders[i][1]+'</span><font style=color:red>)</font>'});107 tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(new_caption) + '<font style=color:red> (</font><span id="dftree_local_'+local_folders[i][0]+'_unseen" style=color:red>'+local_folders[i][1]+'</span><font style=color:red>)</font>'}); 101 108 tree_folders.getNodeById("local_"+local_folders[i][0])._refresh(); 102 109 has_changes = true; … … 104 111 else if (local_folders[i][1] <= 0) 105 112 { 106 tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder( local_folders[i][0])});113 tree_folders.getNodeById("local_"+local_folders[i][0]).alter({caption:lang_folder(new_caption)}); 107 114 tree_folders.getNodeById("local_"+local_folders[i][0])._refresh(); 108 115 has_changes = true; … … 181 188 var local_folders = expresso_local_messages.list_local_folders(); 182 189 for (var i in local_folders) { //Coloca as pastas locais. 190 var node_root = "local_root"; 191 var new_caption = local_folders[i][0]; 192 if(local_folders[i][0].indexOf("/")!="-1") { 193 final_pos = local_folders[i][0].lastIndexOf("/"); 194 node_root = "local_"+local_folders[i][0].substr(0,final_pos); 195 new_caption = local_folders[i][0].substr(final_pos+1); 196 } 183 197 if (local_folders[i][1] > 0) 184 198 var nodeLocal = new dNode({ 185 199 id: "local_" + local_folders[i][0], 186 caption: lang_folder( local_folders[i][0]) + '<font style=color:red> (</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>',187 onClick: "change_folder('local_" + local_folders[i][0] + "','" + local_folders[i][0]+ "')",188 plusSign: 0200 caption: lang_folder(new_caption) + '<font style=color:red> (</font><span id="local_unseen" style=color:red>' + local_folders[i][1] + '</span><font style=color:red>)</font>', 201 onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')", 202 plusSign: local_folders[i][2] 189 203 }); 190 204 else 191 205 var nodeLocal = new dNode({ 192 206 id: "local_" + local_folders[i][0], 193 caption: lang_folder( local_folders[i][0]),194 onClick: "change_folder('local_" + local_folders[i][0] + "','" + local_folders[i][0]+ "')",195 plusSign: 0207 caption: lang_folder(new_caption), 208 onClick: "change_folder('local_" + local_folders[i][0] + "','" + new_caption + "')", 209 plusSign: local_folders[i][2] 196 210 }); 197 tree_folders.add(nodeLocal, "local_root");211 tree_folders.add(nodeLocal, node_root); 198 212 } 199 213 } -
trunk/expressoMail1_2/js/local_messages.js
r1466 r1477 477 477 temp[0] = rs.field(0); 478 478 temp[1] = rs.field(1); 479 var rs2 = this.dbGears.execute("select * from folder where folder like ?",["%"+temp[0]+"/%"]); 480 if(rs2.isValidRow()) 481 temp[2] = 1; 482 else 483 temp[2] = 0; 479 484 retorno.push(temp); 480 485 rs.next(); … … 490 495 return false; //can't create folder with string local_ 491 496 this.init_local_messages(); 497 if (old_folder.indexOf("/") != "-1") { 498 final_pos = old_folder.lastIndexOf("/"); 499 folder = old_folder.substr(0, final_pos) + "/" + folder; 500 } 492 501 try { 493 502 this.dbGears.execute("update folder set folder=? where folder=? and uid_usuario=?",[folder,old_folder,account_id]); -
trunk/expressoMail1_2/js/messages_proxy.js
r1121 r1477 120 120 121 121 messages_proxy.prototype.proxy_create_folder = function() { 122 if (t tree.FOLDER == 'local_root') {122 if (this.is_local_folder(ttree.FOLDER)) { 123 123 124 124 folder = prompt(get_lang('Enter the name of the new folder:'), ""); … … 128 128 return false; 129 129 } 130 var temp = expresso_local_messages.create_folder(folder); 130 if(ttree.FOLDER=="local_root") 131 var temp = expresso_local_messages.create_folder(folder); 132 else 133 var temp = expresso_local_messages.create_folder(ttree.FOLDER.substr(6)+"/"+folder); 131 134 if (!temp) 132 135 alert(get_lang("cannot create folder. try other folder name")); … … 151 154 return false; 152 155 } 153 var string_confirm = get_lang("Do you wish to exclude the folder ") + ttree.FOLDER.substr(6) + "?"; 156 if(ttree.FOLDER.indexOf("/")!="-1") { 157 final_pos = ttree.FOLDER.lastIndexOf("/"); 158 new_caption = ttree.FOLDER.substr(final_pos+1); 159 } 160 else { 161 new_caption = ttree.FOLDER.substr(6); 162 } 163 var string_confirm = get_lang("Do you wish to exclude the folder ") + new_caption + "?"; 154 164 155 165 if (confirm(string_confirm)) { 156 166 expresso_local_messages.remove_folder(ttree.FOLDER.substr(6)); 157 alert(get_lang("The folder %1 was successfully removed", ttree.FOLDER.substr(6)));167 alert(get_lang("The folder %1 was successfully removed", new_caption)); 158 168 ttreeBox.update_folder(); 159 169 } -
trunk/expressoMail1_2/js/search.js
r1415 r1477 664 664 if(this.name_box_search=='local_Inbox') 665 665 name_box_def = get_lang("Inbox"); 666 else if(this.name_box_search.indexOf("/")!="-1") { 667 final_pos = this.name_box_search.lastIndexOf("/"); 668 name_box_def = this.name_box_search.substr(final_pos+1); 669 } 666 670 else 667 671 name_box_def = this.name_box_search.substr(6);//Retira o 'local_'
Note: See TracChangeset
for help on using the changeset viewer.