- Timestamp:
- 08/02/10 09:56:24 (14 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r3058 r3111 1573 1573 $return[$i]['Flagged'] = $header->Flagged; 1574 1574 1575 $date_msg = gmdate("d/m/Y",$header->udate); 1576 if (gmdate("d/m/Y") == $date_msg) 1577 $return[$i]['udate'] = gmdate("H:i",$header->udate); 1578 else 1579 $return[$i]['udate'] = $date_msg; 1575 $return[$i]['udate'] = $header->udate; 1580 1576 1581 1577 $from = $header->from; -
trunk/expressoMail1_2/js/base/common_functions.js
r3077 r3111 369 369 forward_body += body; 370 370 return forward_body; 371 } 372 373 function norm(arg) {return (arg < 10 ? '0'+arg : arg);} 374 375 function strDateShow(timestamp){ 376 var retStr = ''; 377 var weekDays = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday']; 378 var date_msg = new Date(timestamp*1000); 379 var today = new Date(); 380 today.setHours = 0; 381 today.setMinutes = 0; 382 383 if (today.getTime() - date_msg.getTime() < 86400000) 384 retStr = norm(date_msg.getHours()) + ':' + norm(date_msg.getMinutes()); 385 else 386 if (today.getTime() - date_msg.getTime() < 172800000) 387 retStr = get_lang('Yesterday'); 388 else 389 if (today.getTime() - date_msg.getTime() < 259200000) 390 retStr = get_lang(weekDays[date_msg.getDay()]); 391 else 392 retStr = norm(date_msg.getDate()) + '/' + norm(date_msg.getMonth()+1) + '/' +date_msg.getFullYear(); 393 return retStr; 371 394 } 372 395 -
trunk/expressoMail1_2/js/base/draw_api_folders.js
r3095 r3111 1109 1109 td_element5.onclick = _onclick; 1110 1110 td_element5.setAttribute("align", "center"); 1111 var norm = function (arg) {return (arg < 10 ? '0'+arg : arg);};1112 var weekDays = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];1113 1111 var date_msg = new Date(headers_msgs.udate*1000); 1114 var today = new Date(); 1115 if (today.getTime() - date_msg.getTime() < 86400000) 1116 td_element5.innerHTML = norm(date_msg.getHours()) + ':' + norm(date_msg.getMinutes()); 1117 else 1118 if (today.getTime() - date_msg.getTime() < 172800000) 1119 td_element5.innerHTML = get_lang('Yesterday'); 1120 else 1121 if (today.getTime() - date_msg.getTime() < 259200000) 1122 td_element5.innerHTML = get_lang(weekDays[date_msg.getDay()]); 1123 else 1124 td_element5.innerHTML = norm(date_msg.getDate()) + '/' + norm(date_msg.getMonth()+1) + '/' +date_msg.getFullYear(); 1112 td_element5.innerHTML = strDateShow(headers_msgs.udate); 1125 1113 td_element5.title = norm(date_msg.getDate()) + '/' + norm(date_msg.getMonth()+1) + '/' +date_msg.getFullYear(); 1126 1114 td_element5.alt = td_element5.title; -
trunk/expressoMail1_2/js/jscode/draw_messages.js
r3081 r3111 337 337 _name = info_msg.from.email.length > _maxChar ? info_msg.from.email.substring(0,_maxChar) + "..." : info_msg.from.email; 338 338 var id = this.id; 339 td.innerHTML = _name.bold() + ', ' + info_msg.udate;339 td.innerHTML = _name.bold() + ', ' +strDateShow(info_msg.udate)+' '; 340 340 if (info_msg.attachment.names.length > 0) 341 341 td.innerHTML += " <img style='cursor:pointer' onclick='javascript:Element(\"option_hide_more_"+id+"\").onclick()' src ='" + URL_SERVER + "expressoMail1_2/templates/"+template+"/images/clip.png' title='"+info_msg.attachment.names+"'>";
Note: See TracChangeset
for help on using the changeset viewer.