Changeset 6753


Ignore:
Timestamp:
07/11/12 10:08:55 (7 years ago)
Author:
thiago
Message:

Ticket #2951 - Agora existe uma preferencia para o usuario.

Location:
sandbox/2.4.2-expresso1/expressoMail1_2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sandbox/2.4.2-expresso1/expressoMail1_2/inc/hook_settings.inc.php

    r6055 r6753  
    345345create_check_box('Show previous message, after delete actual message?','delete_and_show_previous_message','Enable this option if you want to read the next message everytime you delete a message'); 
    346346create_check_box('Do you wanna receive an alert for new messages?','alert_new_msg','Everytime you receive new messages you will be informed'); 
     347 
     348// here 
     349//create_check_box('Exibir notificações de: "Nova mensagem", "Criterio atendido", "Alerta de evento"?','notifications','Everytime you receive new messages you will be informed'); 
     350create_check_box('Wish you receive notifications for: "New messages", "Filter criteria", "Event alerts"?','notifications','Everytime you receive new messages you will be informed'); 
     351 
     352 
     353 
    347354create_check_box('Show default view on main screen?','mainscreen_showmail','Show unread messages in your home page'); 
    348355create_check_box('Do you want to use remove attachments function?','remove_attachments_function','It allow you to remove attachments from messages'); 
  • sandbox/2.4.2-expresso1/expressoMail1_2/js/main.js

    r6749 r6753  
    552552 
    553553function auto_refresh(){ 
    554         refresh(preferences.alert_new_msg); 
     554        refresh(preferences.alert_new_msg, preferences.notifications); 
    555555        setTimeout('auto_refresh()', time_refresh); 
    556556} 
     
    594594    $(function() { 
    595595                var notifier = new Notifier(); 
     596                /*if(notifier.HasSupport){ 
     597                        alert("Seu navegador não dá suporte!"); 
     598                        //firefox/downloads/latest/221523/addon-221523-latest.xpi?src=dp-btn-primary 
     599                }*/ 
     600                 
    596601                if (window.webkitNotifications.checkPermission() != 0){ 
    597602                        notifier.RequestPermission(); 
     
    608613var auxNotification; 
    609614 
    610 function refresh(alert_new_msg){ 
     615function refresh(alert_new_msg, notification){ 
     616 
    611617        getFromAlertRules(); 
    612618        var handler_refresh = function(data){ 
     
    759765                        if(parseInt(preferences.use_shortcuts)) 
    760766                                select_msg("null","reload_msg","null"); 
    761  
    762                         if(parseInt(alert_new_msg) && (data.new_msgs > 0 || notifyNewMessage.length > 0) ){ 
     767                 
     768                        if(parseInt(alert_new_msg) && data.new_msgs > 0) 
     769                                alert(data['new_msgs'] > 1 ? get_lang("You have %1 new messages", data['new_msgs']) + "!" : get_lang("You have 1 new message") +"!"); 
     770                         
     771                         
     772                        if(parseInt(notification)  && (data.new_msgs > 0 || notifyNewMessage.length > 0) ){ 
    763773                         
    764774                        for(var i=0; i<data.length; i++){ 
  • sandbox/2.4.2-expresso1/expressoMail1_2/setup/phpgw_pt-br.lang

    r6698 r6753  
    132132Do you really want to empty your trash folder?  expressoMail1_2 pt-br   Você tem certeza que deseja limpar sua lixeira? 
    133133Do you wanna receive an alert for new messages? expressoMail1_2 pt-br   Você quer receber um alerta para mensagens novas? 
     134 
     135Wish you receive notifications for: "New messages", "Filter criteria", "Event alerts"?  expressoMail1_2 pt-br   Exibir notificações de: "Nova mensagem", "Criterio atendido", "Alerta de evento"? 
     136 
     137 
     138 
    134139Do you want to automatically display the message header?        expressoMail1_2 pt-br   Você deseja exibir automaticamente o cabecalho da mensagem? 
    135140Do you want to block this e-mail?       expressoMail1_2 pt-br   Você gostaria de bloquear este e-mail? 
Note: See TracChangeset for help on using the changeset viewer.