Changeset 6187

Timestamp:

05/15/12 11:35:20 (12 years ago)

Author:

gustavo

Message:

Ticket #2733 - Tela de importar mensagem desajustada na primeira vez

Location:

trunk/expressoMail1_2

Files:

• index.php (modified) (2 diffs)
• js/draw_api.js (modified) (2 diffs)

trunk/expressoMail1_2/index.php

@@ -51 +51 @@
                 
                 <link rel="stylesheet" href="../prototype/plugins/farbtastic/farbtastic.css" type="text/css" >  
+                <link rel="stylesheet" href="../prototype/plugins/fileupload/jquery.fileupload-ui.css" type="text/css" >        
                 
                 <script type="text/javascript" src="../prototype/plugins/zebradialog/javascript/zebra_dialog.js"></script>
@@ -60 +61 @@
                 <script type="text/javascript" src="../prototype/plugins/mask/jquery.maskedinput.js"></script>
                 <script type="text/javascript" src="../prototype/plugins/alphanumeric/jquery.alphanumeric.js"></script>
+                <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.fileupload.js"></script>
+                <script type="text/javascript" src="../prototype/plugins/fileupload/jquery.iframe-transport.js"></script>
                 
                 <script type="text/javascript" src="../prototype/plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>

trunk/expressoMail1_2/js/draw_api.js

@@ -1543 +1543 @@
                 if( (msg_folder.indexOf(special_folders['Sent']) !=-1) && (headers_msgs.from != undefined) && headers_msgs.from.email.toLowerCase() == Element("user_email").value.toLowerCase() && (preferences.from_to_sent == "1") && !(msg_folder.substr(0,5) == "user/"))
                 {
-                        td_element3.onmouseover = function () {
-                                var title_to = '';
-                                $.each(headers_msgs.to, function(index, value) {
-                                        if(index == (headers_msgs.to.length - 1)){
-                                                title_to = title_to + value.email;
-                                        }
-                                        else {
-                                                title_to = title_to + value.email + ', ';
-                                        }
-                                });
-                                this.title = title_to;
-                        };
+                        td_element3.onmouseover = function () {this.title=headers_msgs.to.email;};
                         
                         if (headers_msgs.Draft == 'X')
                                 td_element3.innerHTML += "<span style=\"color:red\">("+get_lang("Draft")+") </span>";
                         else{
-                                if(headers_msgs.to[0].email != null && headers_msgs.to[0].email.toLowerCase() != Element("user_email").value)
+                                if(headers_msgs.to.email != null && headers_msgs.to.email.toLowerCase() != Element("user_email").value)
                                         td_element24.innerHTML = "<img align='center' src ='templates/"+template+"/images/sent.gif' title='"+get_lang('Sent')+"'>";
 
                                 if (headers_msgs.to) {
-                                        if (headers_msgs.to[0].name != null)
-                                                td_element3.innerHTML += headers_msgs.to[0].name;
-                                        else if(headers_msgs.to[0].email != null) {
-                                                td_element3.innerHTML += headers_msgs.to[0].email;
+                                        if (headers_msgs.to.name != null)
+                                                td_element3.innerHTML += headers_msgs.to.name;
+                                        else if(headers_msgs.to.email != null) {
+                                                td_element3.innerHTML += headers_msgs.to.email;
                                         }
                                         else {
@@ -3553 +3542 @@
                 });     
         }
-        if(typeof($.fn.fileupload) == "undefined"){
-                $.lazy({
-                        src: '../prototype/plugins/fileupload/jquery.fileupload.js',
-                        name: 'fileupload',
-                        dependencies: {
-                                js: ['../prototype/plugins/fileupload/jquery.iframe-transport.js'],
-                                css: ['../prototype/plugins/fileupload/jquery.fileupload-ui.css']
-                        }
-                });     
-        }
         var ID = create_border("",border_ID);