Changeset 6528 for trunk/expressoMail1_2/js/search.js

Timestamp:

06/15/12 17:00:17 (12 years ago)

Author:

gustavo

Message:

Ticket #2766 - Merge do branch das novas funcionalidaes para o trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• expressoMail1_2/js/search.js (modified) (4 diffs)

trunk/expressoMail1_2/js/search.js

@@ -20 +20 @@
         
         //Monta os forms dentro da janela;
-        searchE.prototype.showForms = function(value)
+        searchE.prototype.showForms = function(value, data)
         {
                 if( trim(value) != "" )
@@ -39 +39 @@
                         var div         = document.createElement("div");
                         var args        = null;
-        
+                        
                         args = 
                         {
@@ -63 +63 @@
                                 "Old"                                           : get_lang('Old'),
                                 "Search_the_messages_in_these_folders" : get_lang('Search the messages in these folders'),
-                                "In_all_the_folders"            : get_lang('In all the folders')
-                        }
-                        
+                                "In_all_the_folders"            : get_lang('In all the folders'),
+                                "From_value" : (data != "undefined" ? data : "")
+                        }
+                                
                         $(div).html(DataLayer.render("./templates/default/searchMails.ejs", args ));
                         div.setAttribute( "style","overflow:hidden");
@@ -515 +516 @@
                                 td.id = "td_message_answered_"+uid_msg;
                                 if (aux.flag.match('X'))
-                                        td1 = '<img src=templates/'+template+'/images/forwarded.gif title="'+get_lang('Forwarded')+'">';
+                                        td1 = '<img src=templates/'+template+'/images/forwarded.png title="'+get_lang('Forwarded')+'">';
                                 else
                                         if (aux.flag.match('A'))
-                                                td1 = '<img src=templates/'+template+'/images/answered.gif title="'+get_lang('Answered')+'">';
+                                                td1 = '<img src=templates/'+template+'/images/answered.png title="'+get_lang('Answered')+'">';
                                         else
                                                 td1 = '';