Index: /sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php =================================================================== --- /sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php (revision 6533) +++ /sandbox/2.4.2-expresso1/prototype/modules/calendar/interceptors/DBMapping.php (revision 6788) @@ -66,4 +66,19 @@ if (isset($params['type'])) $params['type'] = self::codeAlarmType($params['type']); + else{ + $alarm = Controller::read( array('concept' => 'alarm' , 'id' => $params['id'] )); + + $params['unit'] = $alarm['unit']; + } + $params['offset'] = $params['time'] * 1000; + + + switch( strtolower($params['unit']) ) + { + case 'd': $params['offset'] *= 24; + case 'h': $params['offset'] *= 60; + case 'm': $params['offset'] *= 60; + } + } Index: /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.alarms.js =================================================================== --- /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.alarms.js (revision 6782) +++ /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.alarms.js (revision 6788) @@ -27,4 +27,5 @@ */ desktopNotification.showNotification(false, function(){ + console.log('nice'); window.focus(); this.cancel(); Index: /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/desktop.notification.js =================================================================== --- /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/desktop.notification.js (revision 6774) +++ /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/desktop.notification.js (revision 6788) @@ -9,7 +9,20 @@ this.installDektopNotificationAddon(); - if(window.webkitNotifications && window.webkitNotifications.checkPermission()) - window.webkitNotifications.requestPermission(); + if(window.webkitNotifications && window.webkitNotifications.checkPermission()){ + if($.browser.safari){ + $.Zebra_Dialog('Deseja instalar o plugin de notificação desktop?', { + 'custom_class': 'request-notification-permission', + 'type': 'question', + 'overlay_opacity': '0.5', + 'buttons': ['Não', 'Sim'] + }); + $('div.ZebraDialog.request-notification-permission a').click(function() { + if($(this).html() == 'Sim') + window.webkitNotifications.requestPermission(); + }); + }else + window.webkitNotifications.requestPermission(); + } } }, @@ -17,18 +30,18 @@ installDektopNotificationAddon: function(){ - var params = { - "Foo": { - URL: '../prototype/plugins/desktop.notification/html_desktop_notifications-1.0.7-fx.xpi' , - IconURL:'../prototype/plugins/desktop.notification/desktop-notification.png', - //Hash:'sha1:28857e60d043447c5f4550853f2d40770b326a13', - toString: function () { - return this.URL; - } - } - }; + var params = { + "Foo": { + URL: '../prototype/plugins/desktop.notification/html_desktop_notifications-1.0.7-fx.xpi' , + IconURL:'../prototype/plugins/desktop.notification/desktop-notification.png', + //Hash:'sha1:28857e60d043447c5f4550853f2d40770b326a13', + toString: function () { + return this.URL; + } + } + }; - InstallTrigger.install(params); + InstallTrigger.install(params); - return false; + return false; }, @@ -73,5 +86,5 @@ .focus(function() { activePage = true; - if(!desktopNotification.verifyComplement()){ + if(desktopNotification.verifyComplement()){ setTimeout(function(){ Index: /sandbox/2.4.2-expresso1/expressoMail1_2/setup/phpgw_pt-br.lang =================================================================== --- /sandbox/2.4.2-expresso1/expressoMail1_2/setup/phpgw_pt-br.lang (revision 6777) +++ /sandbox/2.4.2-expresso1/expressoMail1_2/setup/phpgw_pt-br.lang (revision 6788) @@ -132,9 +132,5 @@ Do you really want to empty your trash folder? expressoMail1_2 pt-br Você tem certeza que deseja limpar sua lixeira? Do you wanna receive an alert for new messages? expressoMail1_2 pt-br Você quer receber um alerta para mensagens novas? - Wish 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"? - - - Do you want to automatically display the message header? expressoMail1_2 pt-br Você deseja exibir automaticamente o cabecalho da mensagem? Do you want to block this e-mail? expressoMail1_2 pt-br Você gostaria de bloquear este e-mail? Index: /sandbox/2.4.2-expresso1/expressoMail1_2/js/main.js =================================================================== --- /sandbox/2.4.2-expresso1/expressoMail1_2/js/main.js (revision 6777) +++ /sandbox/2.4.2-expresso1/expressoMail1_2/js/main.js (revision 6788) @@ -7,6 +7,4 @@ var results_search_messages = ""; var cabecalho = '