Changeset 5474

Timestamp:

02/06/12 09:16:47 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #673 - Novas dialogs com Jquery para o novo visual do expresso.

File:

• trunk/expressoMail1_2/js/filter.js (modified) (1 diff)

trunk/expressoMail1_2/js/filter.js

@@ -412 +412 @@
         }
 
-cfilter.prototype.new_rule = function(email){
-
-        var createFilter = function (param){ 
-                if (filter.criticalError){ 
-                        alert(get_lang('The filters service is out of service, try again later...'));
-                        return false; 
-                } 
-                if(filter.rulest.length > 0){ 
-                        var blockedReg = new RegExp('#rule&&[0-9]+&&ENABLED&&'+param+'&&&&&&discard&&&&0&&&&&&0'); 
-                        for(var i=0 ; i < filter.rulest.length; i++){ 
-                                if(blockedReg.test(filter.rulest[i])){ 
-                                        alert(get_lang("Sender blocked")+"!"); 
-                                        return false; 
+        cfilter.prototype.new_rule = function(email){
+        
+                var createFilter = function (param)
+                { 
+                        if (filter.criticalError){ 
+                                alert(get_lang('The filters service is out of service, try again later...'));
+                                return false; 
+                        } 
+                        if(filter.rulest.length > 0){ 
+                                var blockedReg = new RegExp('#rule&&[0-9]+&&ENABLED&&'+param+'&&&&&&discard&&&&0&&&&&&0'); 
+                                for(var i=0 ; i < filter.rulest.length; i++){ 
+                                        if(blockedReg.test(filter.rulest[i])){ 
+                                                alert(get_lang("Sender blocked")+"!"); 
+                                                return false; 
+                                        } 
                                 } 
-                        } 
-                }                        
-                if(confirm(get_lang("Do you want to block this e-mail?"))){ 
-                        new_r = "&&ENABLED&&" + param + "&&&&&&discard&&&&0&&&&&&0"; 
-                        //setTimeout("filter.e_newrule('" + new_r + "')",2000);          
-                        if (filter.e_newrule(new_r)){ 
-                                filter.email_deny.push(new_r); 
-                                write_msg(get_lang("The sender was blocked"));                                                   
-                        }else 
-                                write_msg(get_lang("You have reached the maximum number of rules")); 
-                } 
-        }; 
-        if ( filter.rulest.length > 0 ) 
-                createFilter(email); 
-        else 
-                this.load_rules( createFilter, email ); 
-}
+                        }                        
+                
+                        
+                        var div = document.createElement("div");
+                                div.innerHTML = '<p style="margin:10px 5px 5px 5px;">' +
+                                                                '<span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>'+
+                                                                        get_lang("Do you want to block this e-mail?")+
+                                                                '</p>';
+        
+                        $(div).dialog(
+                        {
+                                resizable: false,
+                                title: get_lang('Block Sender'),
+                                position: 'center',
+                                width: 350,
+                                height:140,
+                                modal: true,
+                                buttons: [
+                                                        {
+                                                                text: get_lang("Yes"),
+                                                                click: function()
+                                                                {
+                                                                        new_r = "&&ENABLED&&" + param + "&&&&&&discard&&&&0&&&&&&0"; 
+                                                                  
+                                                                        if (filter.e_newrule(new_r))
+                                                                        { 
+                                                                                filter.email_deny.push(new_r); 
+                                                                                write_msg(get_lang("The sender was blocked"));                                                   
+                                                                        }
+                                                                        else
+                                                                        {
+                                                                                write_msg(get_lang("You have reached the maximum number of rules"));
+                                                                        }
+                                                                        
+                                                                        $( this ).dialog( "close" );
+                                                                },
+                                                                style: "margin-top: -2.1em" 
+                                                        },
+                                                        {
+                                                                text: get_lang("No"),
+                                                                click: function()
+                                                                {
+                                                                        $( this ).dialog( "close" );
+                                                                },
+                                                                style: "margin-top: -2.1em" 
+                                                        },
+                                                ]
+                        });
+                }; 
+                
+                if ( filter.rulest.length > 0 ) 
+                        createFilter(email); 
+                else 
+                        this.load_rules( createFilter, email ); 
+        }
 
         cfilter.prototype.e_newrule = function(nw_rule)