Changeset 6329

Timestamp:

05/28/12 18:09:51 (12 years ago)

Author:

marcieli

Message:

Ticket #2764 - Atualizado subtitulo da janela de alerta de Filtro por Remetente, ao remover uma msg da listagem.

Location:

sandbox/2.4.1-1/prototype/modules/mail

Files:

• css/followupflag.css (modified) (2 diffs)
• js/followupflag.js (modified) (1 diff)
• templates/followupflag_alarm_list.ejs (modified) (1 diff)

sandbox/2.4.1-1/prototype/modules/mail/css/followupflag.css

@@ -236 +236 @@
         margin-top: 5px;
 }
+.title-alarm {
+    margin-left: 90px;
+        font-size: 16px;
+}
+.alert-options {
+        border: none;
+}
+.confirm-alarm {
+        float:right;
+}
+.freeow .gray h2 {
+        font-size: 12px;
+}
+.freeow {
+        width: 325px;
+}
 .freeow .gray .content {
         margin: 5px;
@@ -246 +262 @@
         margin: 5px;
 }
-.title-alarm {
-    margin-left: 90px;
-        font-size: 16px;
-}
-.alert-options {
-        border: none;
-}
-.confirm-alarm {
-        float:right;
-}
-.freeow .gray h2 {
-        font-size: 12px;
-}
-.freeow {
-        width: 325px;
-}

sandbox/2.4.1-1/prototype/modules/mail/js/followupflag.js

@@ -618 +618 @@
                                 alarmInRange : messages_alarm, 
                                 caption: caption, 
-                                type: it.attrDeadline
+                                type: it.attrDeadline,
+                                captions: it.caption
                         };
                         // tipo de modal a ser exibida

sandbox/2.4.1-1/prototype/modules/mail/templates/followupflag_alarm_list.ejs

@@ -7 +7 @@
         for(var i=0; i<data.alarmInRange.length; i++){
                 if(data.type == 'filtersDeadline')
-                        var openMessageScript = "cExecute('$this.imap_functions.open_flagged_msg&msg_number="+data.alarmInRange[i].msg_number+"&msg_folder="+data.alarmInRange[i].msg_folder+"&alarm=true', show_msg); $(this).parent().remove(); if($('.filtersDeadline').find('.message-item').length == 0){ $('.filtersDeadline').remove(); } ";
+                        var openMessageScript = "$(this).parent().remove(); var msgs_count = $('.filtersDeadline').find('.message-item').length; if(msgs_count == 0){ $('.filtersDeadline').remove(); } $('.subtitle-alarm').find('strong').html((msgs_count == 1)?get_lang('"+data.captions.singular+"'):get_lang('"+data.captions.plural+"', msgs_count)); cExecute('$this.imap_functions.open_flagged_msg&msg_number="+data.alarmInRange[i].msg_number+"&msg_folder="+data.alarmInRange[i].msg_folder+"&alarm=true', show_msg);";
                 else    
                         var openMessageScript = "cExecute('$this.imap_functions.get_info_msg&msg_number="+data.alarmInRange[i].msg_number+"&msg_folder="+data.alarmInRange[i].msg_folder+"&alarm=true', show_msg);";