Changeset 5808

Timestamp:

03/23/12 17:43:57 (12 years ago)

Author:

gustavo

Message:

Ticket #2134 - Adiciona preferência de exibir e-mails apenas no formato data numérico.

Location:

trunk/expressoMail1_2

Files:

• inc/hook_settings.inc.php (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -309 +309 @@
         'Do you want to show common name instead of UID?');
 create_check_box('Do you want to automatically display the message header?','show_head_msg_full',$default,'');
+create_check_box('Do you want to display date in format numerical?','show_date_numerical',$default,''); 
 $default = array(
         '25'    => '25',

trunk/expressoMail1_2/js/draw_api.js

@@ -1789 +1789 @@
                     }
 
-                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');
+                if (preferences.show_date_numerical == 0 || typeof(preferences.show_date_numerical) == 'undefined') {   
+                        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() < 259200000)
+                                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;
-
+                                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;
+                                }
+                }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 = createTDElement(0,11,"td_msg td_resizable","center");
                 td_element6.onclick = _onclick;

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -860 +860 @@
 Add rule out of office  expressoMail1_2 pt-br   Adicionar regra Fora do escritorio
 Out of office   expressoMail1_2 pt-br   Fora do escritorio
+Do you want to display date in format numerical?        expressoMail1_2 pt-br   Você deseja exibir a data no formato numérico?