Changeset 6139 for trunk/expressoMail1_2/js/InfoContact.js

Timestamp:

05/08/12 16:43:09 (12 years ago)

Author:

niltonneto

Message:

Ticket #2230 - Correção da versão 2.2 replicada para o Trunk. Vide Ticket.

File:

• trunk/expressoMail1_2/js/InfoContact.js (modified) (2 diffs)

trunk/expressoMail1_2/js/InfoContact.js

@@ -95 +95 @@
 
 
-        if(preferences.voip_enabled && phoneUser) {
-                phoneUser = "<a title=\""+get_lang("Call to Comercial Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+phoneUser+"', 'com')\">"+phoneUser+"</a>";
+        if(preferences.voip_enabled) {
+                phoneUser = '';
+                if(data.telefone)
+                        phoneUser = "<a title=\""+get_lang("Call to Comercial Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+ data.telefone+"', 'com')\">"+ data.telefone+"</a>";
                 if(data.mobile){
-                        phoneUser += " / <a title=\""+get_lang("Call to Mobile Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+data.mobile+"', 'mob')\">"+data.mobile+"</a>";
+                        phoneUser += "<br>&nbsp;<a title=\""+get_lang("Call to Mobile Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+data.mobile+"', 'mob')\">"+data.mobile+"</a>";
                 }
         }
@@ -106 +108 @@
                                                 "<td  style='padding-top:4px' align='center' valign='center' colspan ='2'><img src='templates/"+template+"/images/"+(data.type)+"_catalog.png' /><font size=1 color=BLACK>&nbsp;<b>"+get_lang("Sender's Information")+"</b></font>"+_this.verifyIM(data.uid,data.email)+"</td></tr>"+
 
-                                                "<tr><td align='center' width='70' height='93' style='padding-left:6px' align='center' valign='center'>"+
+                                                "<tr><td align='center' style='width:70px;height:93px;padding-left:6px' align='center' valign='center'>"+
                                                 "<img style='float:left' src='./inc/show_img.php?email="+data.email+"'></td>"+
-                                                "<td style='padding-left:2px' align='left' valign='top'>"+
+                                                "<td style='padding-left:2px' width='70%' align='left' valign='top'>"+
                                                 "<br><img style='float:left'align='center' src='templates/"+template+"/images/phone.gif' />&nbsp;<font  size=1  color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font><br />"+
-                                                "<font size=1 color=BLACK>"+employeeNumber+"<br/>"+cn+"</font>"+
+                                                "<br><font size=1 color=BLACK>"+cn+"</font><br><b>"+employeeNumber+"</b>"+
                                                 "<br/>"+ou+"</td></tr>"+
-
-                                                "<tr><td  style='padding-bottom:4px' align='center' valign='center' colspan ='2'><span title='"+get_lang("Write message")+"' style='cursor:pointer' onclick='InfoContact.sendMail(\""+cn+"\",\""+data.email+"\")'><font size=1 color=DARKBLUE><u>"+data.email+"</u></font></span>"+
+                                                "<tr><td  style='padding-bottom:4px' align='center' valign='center' colspan ='2' nowrap><span title='"+get_lang("Write message")+"' style='cursor:pointer' onclick='InfoContact.sendMail(\""+cn+"\",\""+data.email+"\")'><font size=1 color=DARKBLUE><u>"+data.email+"</u></font></span>"+
                                                                                 "</td></tr></table>";