Changeset 5760 for trunk

Timestamp:

03/20/12 10:50:42 (12 years ago)

Author:

douglasz

Message:

Ticket #2486 - Correção nos titulos dos icones no anexar mensagem.

File:

• trunk/prototype/modules/attach_message/attach_message.js (modified) (3 diffs)

trunk/prototype/modules/attach_message/attach_message.js

@@ -114 +114 @@
                 };
         for(var flag in cell){
-                classes += '<span class="flags '+ (cell[flag]) +'" title="'+ (cell[flag]) +'"> </span>';        
-        }
-        
+                classes += '<span class="flags '+ (cell[flag]).toLowerCase() +((cell[flag]) == '' ? '"' : '" title="'+ get_lang((cell[flag])))+'"> </span>';    
+        }
+
         if(rowObject.labels){           
                 classes += '<span class="flags labeled"> </span>';
@@ -122 +122 @@
                 classes += '<span class="flags"> </span>';
         }
-        
         if(rowObject.followupflagged){          
-                classes += '<span class="flags followupflagged" style="background:'+rowObject.followupflagged.backgroundColor+';"><img src="../prototype/modules/mail/img/flagEditor.png"></span>';
+                if(rowObject.followupflagged.followupflag.id < 7){
+                        var nameFollowupflag = get_lang(rowObject.followupflagged.followupflag.name);
+                }else{
+                        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>';
         }
         return classes;
@@ -333 +337 @@
                         colModel:[
                                 {name:'msg_number',index:'msg_number', width:45, hidden:true, sortable:false},
-                                {name:'flags',index:'msg_number',edittype: 'image', width:100, sortable:false, formatter:flags2Class},
+                                {name:'flags',index:'msg_number',edittype: 'image', width:100, sortable:false, formatter:flags2Class, title :false},
                                 {name:'from.name',index:'msg_number', width:70, sortable:false, formatter:NormaliseFrom},
                                 {name:'subject',index:'subject', width:245, sortable:false},