Changeset 5831

Timestamp:

03/27/12 10:38:18 (12 years ago)

Author:

douglasz

Message:

Ticket #2486 - Correção para sinalizadores como concluidos.

Location:

trunk/prototype/modules/attach_message

Files:

• attach_message.css (modified) (1 diff)
• attach_message.js (modified) (4 diffs)

trunk/prototype/modules/attach_message/attach_message.css

@@ -51 +51 @@
 .forwarded {background-image:url(images/forwarded.gif); background-repeat: no-repeat; position:relative; top:3px; left:3px;}
 .draft {background-image:url(images/draft.gif); background-repeat: no-repeat; position:relative; top:3px; left:3px;}
-.labeled{background-image:url(images/tag.png); background-repeat: no-repeat; position:relative; top:3px; left:3px;}
+.labeled{background-image:url(images/tag.png); background-repeat: no-repeat; position:relative; top:3px;}
 .followupflagged{width:8px;height:6px;}
 .deleted { }

trunk/prototype/modules/attach_message/attach_message.js

@@ -116 +116 @@
                 classes += '<span class="flags '+ (cell[flag]).toLowerCase() + '"' + (cell[flag] != "" ? 'title="'+ get_lang(cell[flag])+'"' : '')+'> </span>'; 
         }
-        
+        console.log(rowObject);
         if(rowObject.labels){   
                 var titles = [];
@@ -136 +136 @@
                         var nameFollowupflag = rowObject.followupflagged.followupflag.name;
                 }
-                classes += '<span class="flags followupflagged" title="'+nameFollowupflag+'" style="background:'+rowObject.followupflagged.backgroundColor+';"><img src="../prototype/modules/mail/img/flagEditor.png"></span>';
+                if(rowObject.followupflagged.isDone == 1){
+                        classes += '<span class="flags followupflagged" title="'+nameFollowupflag+'" style="background:'+rowObject.followupflagged.backgroundColor+';"><img style=" margin-left:-3px;" src="../prototype/modules/mail/img/flagChecked.png"></span>';
+                }else{                  
+                        classes += '<span class="flags followupflagged" title="'+nameFollowupflag+'" style="background:'+rowObject.followupflagged.backgroundColor+';"><img src="../prototype/modules/mail/img/flagEditor.png"></span>';
+                }
+                
         }
 
@@ -469 +474 @@
                                                                         tabPanelTemplateLabel = tabPanelTemplateLabel.substring(0, $mailpreview_tabs_label_length) + '...';
                                                         selectedMessagesCount();
+                                                                
                                                                 if (!$('#' + tabPanelTemplateId).length) {                                                              
                                                                         $mailpreview_tabs.tabs("add", '#' + tabPanelTemplateId, tabPanelTemplateLabel)
@@ -484 +490 @@
                                                                         .find('#' + tabPanelTemplateId + ', [href="#' + tabPanelTemplateId + '"]').removeClass('preview-message-unselected');
                                                                 }
-                                                                
                                                         }
                                                 });