Changeset 3057 for branches/2.2

Timestamp:

07/15/10 16:48:51 (14 years ago)

Author:

amuller

Message:

Ticket #974 - Colocando no alt e title do td a data completa

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -151 +151 @@
                 $head_array['msg_number'] = $msg_number;
                 //$head_array['msg_folder'] = $folder;
-
-                $date_msg = gmdate("d/m/Y",$header->udate);
-                if ( date("d/m/Y") == $date_msg)
-                        $head_array['udate'] = gmdate("H:i",$header->udate);
-                else
-                {
-                        $head_array['udate'] = $date_msg;
-                        if ( date("d/m/Y", time() - 86400) == gmdate("d/m/Y",$header->udate) )
-                                $head_array['udate'] = $this -> functions -> getLang( 'Yesterday' );
-                        if ( date("d/m/Y", time() - 172800) == gmdate("d/m/Y",$header->udate) )
-                                $head_array['udate'] = $this -> functions -> getLang( gmdate("l",$header->udate) );
-                        if ( date("d/m/Y", time() - 259200) == gmdate("d/m/Y",$header->udate) )
-                                $head_array['udate'] = $this -> functions -> getLang( gmdate("l",$header->udate) );
-                }
-
+                
+                $head_array['udate'] = $header->udate;
                 $head_array['aux_date'] = $date_msg; //Auxiliar apenas para mensagens locais.
 

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -1008 +1008 @@
                 td_element5.onclick = _onclick;
                 td_element5.setAttribute("align", "center");
-                td_element5.innerHTML = headers_msgs.udate;
+                var norm = function (arg) {return (arg < 10 ? '0'+arg : arg);};
+                var weekDays = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
+                var date_msg = new Date(headers_msgs.udate*1000);
+                var today = new Date();
+                if (today.getTime() - date_msg.getTime() < 86400000)
+                        td_element5.innerHTML = norm(date_msg.getHours()) + ':' + norm(date_msg.getMinutes());
+                else
+                        if (today.getTime() - date_msg.getTime() < 172800000)
+                                td_element5.innerHTML = get_lang('Yesterday');
+                        else
+                                if (today.getTime() - date_msg.getTime() < 259200000)
+                                        td_element5.innerHTML = get_lang(weekDays[date_msg.getDay()]);
+                                else
+                                        td_element5.innerHTML = norm(date_msg.getDate()) + '/' + norm(date_msg.getMonth()+1) + '/' +date_msg.getFullYear();
+                td_element5.title = norm(date_msg.getDate()) + '/' + norm(date_msg.getMonth()+1) + '/' +date_msg.getFullYear();
+                td_element5.alt = td_element5.title;
+
+
 
                 td_element6 = document.createElement("TD");