Changeset 7609

Timestamp:

12/05/12 09:44:10 (11 years ago)

Author:

marcieli

Message:

Ticket #3219 - Corrigido problema com 'manter uma mensagem na caixa de entrada' que fica marcada apos desmarca-la

Location:

trunk/prototype/modules/filters

Files:

• filters.css (modified) (1 diff)
• filters.js (modified) (14 diffs)

trunk/prototype/modules/filters/filters.css

@@ -124 +124 @@
 .filter-manager-window .ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
 
+/*Custom zebraDialog - INICIO*/
+.custom-zebra-filter{
+    z-index: 9999 !important;
+}
+div.ZebraDialogOverlay {
+    z-index: 9998 !important;
+}
+/*Custom zebraDialog - FIM*/

trunk/prototype/modules/filters/filters.js

@@ -48 +48 @@
                 if($.trim(list_container.find('[name="name"]').val()) == ""){
                         $.Zebra_Dialog(get_lang("No name filled"),{
+                'overlay_opacity': '0.5',
+                'custom_class': 'custom-zebra-filter',
                                 'onClose':  function(caption) {
                                         list_container.find('[name="name"]').focus();
@@ -56 +58 @@
                 }else if($.trim(list_container.find('[name="name"]').val()) == "vacation"){
                         $.Zebra_Dialog(get_lang("Invalid name, 'vacation' is a reserved word"),{
+                'overlay_opacity': '0.5',
+                'custom_class': 'custom-zebra-filter',
                                 'onClose':  function(caption) {
                                         list_container.find('[name="name"]').val("").focus();
@@ -68 +72 @@
                                 if(filter_list[index].name == list_container.find('[name="name"]').val()){
                                         $.Zebra_Dialog(get_lang("There is already a filter with this name"),{
+                        'overlay_opacity': '0.5',
+                        'custom_class': 'custom-zebra-filter',
                                                 'onClose':  function(caption) {
                                                         list_container.find('[name="name"]').val("").focus();
@@ -88 +94 @@
         if($(".sizeRule").val() != "" && er_num.test($(".sizeRule").val()) == false) {
                 $.Zebra_Dialog(get_lang("Size rule must be a number"),{
+            'overlay_opacity': '0.5',
+            'custom_class': 'custom-zebra-filter',
                         'onClose':  function(caption) {
                                 list_container.find('[name="actionType[]"]:checked').parent().find("input:text, textarea").focus();
@@ -102 +110 @@
         if(criteria == ""){
                 $.Zebra_Dialog(get_lang("No criteria filled"),{
+            'overlay_opacity': '0.5',
+            'custom_class': 'custom-zebra-filter',
                         'onClose':  function(caption) {
                                 list_container.find('[name="criteriaValue[]"]:first').focus();
@@ -112 +122 @@
                 if($.trim(list_container.find('[name="actionType[]"]:checked').parent().find("input:text, textarea").val()) == ""){
                         $.Zebra_Dialog(get_lang("Fill the action value"),{
+                'overlay_opacity': '0.5',
+                'custom_class': 'custom-zebra-filter',
                                 'onClose':  function(caption) {
                                         list_container.find('[name="actionType[]"]:checked').parent().find("input:text, textarea").focus();
@@ -121 +133 @@
                 if(er_mail.test($.trim(list_container.find('[value="redirect"]:checked').parent().find("input:text").val())) == false && list_container.find('[name="actionType[]"]:checked').val() == 'redirect'){
                         $.Zebra_Dialog(get_lang("Invalid mail"),{
+                'overlay_opacity': '0.5',
+                'custom_class': 'custom-zebra-filter',
                                 'onClose':  function(caption) {
                                         list_container.find('[name="actionType[]"]:checked').parent().find("input:text, textarea").focus();
@@ -141 +155 @@
                         });
                         if(hasValue){
-                                $.Zebra_Dialog('<strong>'+get_lang('Filter with alert')+'</strong><br>'+get_lang('If more than one criterion for the filter, the "Meeting all the criteria" must be selected'));
+                                $.Zebra_Dialog('<strong>'+get_lang('Filter with alert')+'</strong><br>'+get_lang('If more than one criterion for the filter, the "Meeting all the criteria" must be selected'),{
+                    'overlay_opacity': '0.5',
+                    'custom_class': 'custom-zebra-filter'
+                });
                                 return false;
                         } 
                 }else{
-                        $.Zebra_Dialog('<strong>'+get_lang('Filter with alert')+'</strong><br>'+get_lang('The filter should be set as a criteria "Sender" and action "Archive folder"'));
+                        $.Zebra_Dialog('<strong>'+get_lang('Filter with alert')+'</strong><br>'+get_lang('The filter should be set as a criteria "Sender" and action "Archive folder"'),{
+                'overlay_opacity': '0.5',
+                'custom_class': 'custom-zebra-filter'
+            });
                         return false;
                 }
@@ -225 +245 @@
                 if((filter.actions[i].type == "fileinto" && first_fileinto_action) || filter.actions[i].type == "setflag"){
                         actions.parent().find('[value="'+filter.actions[i].parameter+'"]').attr("selected", "selected");
-                        if(filter.actions[i].type == "fileinto")
-                                first_fileinto_action =false;
+//                      if(filter.actions[i].type == "fileinto")
+//                              first_fileinto_action =false;
                 }
                 /*A condição abaixo é executada quando uma segunda action do tipo "fileinto" for encontrada*/
                 if(filter.actions[i].type == "fileinto" && !first_fileinto_action){
                         $('.fileintoInbox').attr('checked', 'True');
-                        continue;
-                }       
-                /*O comando "continue" da condição acima faz com que estas linhas restantes sejam ignoradas*/
-                actions.filter( '[value="' + filter.actions[i].type + '"]' ).attr("checked", "True");
-                actions.filter( '[value="' + filter.actions[i].type + '"]' ).val( filter.actions[i].type )
-                .siblings( '[name="actionParameter[]"]' ).val( filter.actions[i].parameter );
+                }else{
+            first_fileinto_action =false;
+            actions.filter( '[value="' + filter.actions[i].type + '"]' ).attr("checked", "True");
+            actions.filter( '[value="' + filter.actions[i].type + '"]' ).val( filter.actions[i].type )
+            .siblings( '[name="actionParameter[]"]' ).val( filter.actions[i].parameter );
+        }
     }   
         isExact.filter('[value="'+(filter.isExact != "false"? "and" : "or")+'"]').attr("checked", "True");
@@ -401 +421 @@
                                 DataLayer.remove( 'filter', filters[index].id );
                                 DataLayer.commit("filter", false, function(){
-                                        $.Zebra_Dialog(get_lang("Lock User") + " " + email + " " + get_lang("removed"));
+                                        $.Zebra_Dialog(get_lang("Lock User") + " " + email + " " + get_lang("removed"),{
+                        'overlay_opacity': '0.5',
+                        'custom_class': 'custom-zebra-filter'
+                    });
                                         list_filters();
                                         getFromAlertRules();
@@ -420 +443 @@
                                         });
                 DataLayer.commit("filter", false, function(){
-                        $.Zebra_Dialog(get_lang("User") + " " + email + " " + get_lang("blocked"));
+                        $.Zebra_Dialog(get_lang("User") + " " + email + " " + get_lang("blocked"),{
+                'overlay_opacity': '0.5',
+                'custom_class': 'custom-zebra-filter'
+            });
                         list_filters();
                         getFromAlertRules();
@@ -746 +772 @@
                         'title':    get_lang("Exclusion Confirmation"),
                         'buttons':  [get_lang('Yes'), get_lang('No')],
+            'overlay_opacity': '0.5',
+            'custom_class': 'custom-zebra-filter',
                         'onClose':  function(caption) {
                                 if(caption == get_lang('Yes')){
@@ -793 +821 @@
                         'title':    get_lang("Exclusion Confirmation"),
                         'buttons':  [get_lang('Yes'), get_lang('No')],
+            'overlay_opacity': '0.5',
+            'custom_class': 'custom-zebra-filter',
                         'onClose':  function(caption) {
                                 if(caption == get_lang('Yes')){
@@ -866 +896 @@
                         }).end().filter(".submit").click(function(){
                                 if(list_container.find(".vacation-details-container .filter-textarea").val().length <= 0){
-                                                $.Zebra_Dialog(get_lang('Write a message'));
+                                                $.Zebra_Dialog(get_lang('Write a message'),{
+                            'overlay_opacity': '0.5',
+                            'custom_class': 'custom-zebra-filter'
+                        });
                                                 list_container.find(".vacation-details-container .filter-textarea").focus();
                                 }else{