- Timestamp:
- 08/07/12 17:22:57 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.3/expressoMail1_2/js/draw_api.js
r6518 r6957 438 438 // Action on change folders. 439 439 function change_folder(folder, folder_name){ 440 441 if(sort_box_type == 'SORTFROM' && preferences.from_to_sent == "1" && folder.indexOf(preferences.save_in_folder) !=-1 ) 442 sort_box_type = 'SORTTO'; 443 444 if(sort_box_type == 'SORTTO' && folder.indexOf(preferences.save_in_folder) == -1) 445 sort_box_type = 'SORTFROM'; 446 440 447 if (openTab.imapBox[0] != folder) 441 448 { … … 997 1004 998 1005 td_element1.appendChild(chk_box_element); 999 1000 td_element2 = createTDElement(0,1); 1001 td_element3 = createTDElement(0,7,"th_resizable","left","message_header_SORTFROM_"+numBox); 1002 td_element3.onclick = function () {sort_box(search_box_type,'SORTFROM');}; 1003 td_element3.innerHTML = get_lang("Who"); 1004 1006 if(preferences.from_to_sent == "1" && msg_folder.indexOf(preferences.save_in_folder) !=-1 ){ 1007 td_element2 = createTDElement(0,1); 1008 td_element3 = createTDElement(0,7,"th_resizable","left","message_header_SORTTO_"+numBox); 1009 td_element3.onclick = function () {sort_box(search_box_type,'SORTTO');}; 1010 td_element3.innerHTML = get_lang("Who"); 1011 }else{ 1012 td_element2 = createTDElement(0,1); 1013 td_element3 = createTDElement(0,7,"th_resizable","left","message_header_SORTFROM_"+numBox); 1014 td_element3.onclick = function () {sort_box(search_box_type,'SORTFROM');}; 1015 td_element3.innerHTML = get_lang("Who"); 1016 } 1005 1017 td_element4 = createTDElement(0,8,"th_resizable","left","message_header_SORTSUBJECT_"+numBox); 1006 1018 td_element4.onclick = function () {sort_box(search_box_type,'SORTSUBJECT');}; … … 1346 1358 td_element3.innerHTML = ' '; 1347 1359 1348 test = true;1349 1350 test = false;1351 1352 if( headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && !(preferences.from_to_sent == "1" && test) && !(msg_folder.substr(0,5) == "user/"))1360 var isSentFolder = false; 1361 if(msg_folder.indexOf(sentfolder) !=-1 ||msg_folder.indexOf(preferences.save_in_folder) !=-1 || msg_folder.replace("local_","INBOX/").indexOf(preferences.save_in_folder) !=-1) 1362 isSentFolder = true; 1363 1364 if((preferences.from_to_sent == "1" && isSentFolder) || (preferences.from_to_sent == "0" && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && !(msg_folder.substr(0,5) == "user/"))) 1353 1365 { 1354 1366 td_element3.onmouseover = function () {this.title=headers_msgs.to.email;}; … … 1356 1368 td_element3.innerHTML += "<span style=\"color:red\">("+get_lang("Draft")+") </span>"; 1357 1369 else{ 1358 if(headers_msgs.to.email != null && headers_msgs.to.email.toLowerCase() != Element("user_email").value)1370 if(headers_msgs.to.email != null && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase()) 1359 1371 td_element24.innerHTML = "<img valign='center' src ='templates/"+template+"/images/sent.gif' title='"+get_lang('Sent')+"'>"; 1360 1372 … … 1499 1511 } 1500 1512 else if(sort_box_type != sort){ 1501 if ( (sort == 'SORTFROM') || (sort == 'SORTSUBJECT') )1513 if ( (sort == 'SORTFROM') || (sort == 'SORTSUBJECT') || (sort == 'SORTTO')) 1502 1514 sort_box_reverse = 0; 1503 1515 else … … 1517 1529 switch(sort_box_type){ 1518 1530 case 'SORTFROM': 1531 type_name = get_lang("Who"); 1532 break; 1533 case 'SORTTO': 1519 1534 type_name = get_lang("Who"); 1520 1535 break; … … 1532 1547 break; 1533 1548 } 1534 document.getElementById("message_header_SORTFROM_"+numBox).innerHTML = get_lang("Who"); 1549 if(document.getElementById("message_header_SORTFROM_"+numBox)) 1550 document.getElementById("message_header_SORTFROM_"+numBox).innerHTML = get_lang("Who"); 1551 else 1552 document.getElementById("message_header_SORTTO_"+numBox).innerHTML = get_lang("Who"); 1535 1553 document.getElementById("message_header_SORTSUBJECT_"+numBox).innerHTML = get_lang("Subject"); 1536 1554 document.getElementById("message_header_SORTARRIVAL_"+numBox).innerHTML = get_lang("Date");
Note: See TracChangeset
for help on using the changeset viewer.