Changeset 2521

Timestamp:

04/14/10 14:21:26 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Correção de problemas no ExpressoMail? ao carregar imagens.

Location:

trunk

Files:

• expressoMail1_2/js/jscode/InfoContact.js (modified) (2 diffs)
• expressoMail1_2/js/jscode/doiMenuData.js (modified) (2 diffs)
• expressoMail1_2/js/jscode/drag_area.js (modified) (1 diff)
• expressoMail1_2/js/jscode/filters.js (modified) (1 diff)
• expressoMail1_2/js/jscode/rich_text_editor.js (modified) (1 diff)
• expressoMail1_2/js/modal/modal.js (modified) (1 diff)
• phpgwapi/js/expressoAjax/expressoAjax.js (modified) (1 diff)

trunk/expressoMail1_2/js/jscode/InfoContact.js

@@ -11 +11 @@
 emInfoContact.prototype.createCard = function(){
         var pic= new Image(); 
-        pic.src="./templates/"+template+"/images/card.gif"; 
+        pic.src=URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/card.gif"; 
         card = document.createElement("DIV");
         card.id = "card_cc";
@@ -91 +91 @@
         Element("card_cc_td").innerHTML = "<table cellpadding=0 cellspacing=0 border=0 height='100%' width='100%'><tr><td width='70' height='93' style='padding-top:5px;padding-left:6px' align='center' valign='center'>"+
                                                                                 "<img src='./inc/show_img.php?email="+data.email+"'></td><td style='padding-left:2px' align='left' valign='top'>"+
-                                                                                "<br><img align='center' src='templates/"+template+"/images/"+(data.type)+"_catalog.png'><font size=1 color=BLACK>&nbsp;<b>"+get_lang("Sender's Information")+"</b></font>"+
+                                                                                "<br><img align='center' src='"+URL_SERVER+"/expressoMail1_2/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)+
-                                                                                "<br><img align='center' src='templates/"+template+"/images/phone.gif'>&nbsp;<font  size=1  color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font>"+
+                                                                                "<br><img align='center' src='"+URL_SERVER+"/expressoMail1_2/templates/"+template+"/images/phone.gif'>&nbsp;<font  size=1  color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font>"+
                                                                                 "</td></tr><tr><td valign='top' align='center' colspan='2'>"+
                                                                                 "<font size=1 color=BLACK>"+cn+"</font>"+

trunk/expressoMail1_2/js/jscode/doiMenuData.js

@@ -1 @@
-_icon_dir="templates/"+template+"/images/menu/";
+_icon_dir = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/menu/';
 
 function ConstructMenuTools(){
@@ -94 +94 @@
                 var _tr = document.createElement("TR");
                 var _td = document.createElement("TD");
-                _td.innerHTML = "<img height=\"16px\" src=\"templates/"+template+"/images/menu/"+item[2]+"\">&nbsp;"+item[1]+"&nbsp;";
+                _td.innerHTML = '<img height="16px" src="' + _icon_dir + item[2]+'">&nbsp;'+item[1]+'&nbsp;';
                 _td.style.color = "DARKBLUE";
                 _td.style.cursor = "pointer";

trunk/expressoMail1_2/js/jscode/drag_area.js

@@ -23 +23 @@
         this.div_dd.style.display ='none';
         this.envelope = new Image();
-        this.envelope.src = "templates/"+template+"/images/envelope.png";
+        this.envelope.src = URL_SERVER + "/expressoMail1_2/templates/"+template+"/images/envelope.png";
         document.body.appendChild(this.div_dd);
         

trunk/expressoMail1_2/js/jscode/filters.js

@@ -7 +7 @@
                 // Images
                 this.grp_open_img = new Image();
-                this.grp_open_img.src = 'templates/'+template+'/images/filtro/group_open.gif';
+                this.grp_open_img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/group_open.gif';
                 this.grp_close_img = new Image();
-                this.grp_close_img.src = 'templates/'+template+'/images/filtro/group_close.gif';
+                this.grp_close_img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/group_close.gif';
                 this.filter_img = new Image();
-                this.filter_img.src = 'templates/'+template+'/images/filtro/filters.gif';
+                this.filter_img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/filters.gif';
                 this.for_email_img = new Image();
-                this.for_email_img.src = 'templates/'+template+'/images/filtro/answered.gif';
+                this.for_email_img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/answered.gif';
                 this.telephone_voip = new Image();
-                this.telephone_voip.src = 'templates/'+template+'/images/filtro/telephone_voip.jpg';
+                this.telephone_voip.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/filtro/telephone_voip.jpg';
         }               
 

trunk/expressoMail1_2/js/jscode/rich_text_editor.js

@@ -179 +179 @@
                 img.className = 'imagebutton';
                 img.align = 'center';
-                img.src = './templates/'+template+'/images/'+buttons[i]+'.gif';
+                img.src = URL_SERVER + '/expressoMail1_2/templates/'+template+'/images/'+buttons[i]+'.gif';
                 img.title = get_lang(buttons[i]);
                 img.style.cursor = 'pointer';

trunk/expressoMail1_2/js/modal/modal.js

@@ -166 +166 @@
         cssNode.rel = 'stylesheet';
         if (navigator.userAgent.toLowerCase().indexOf("msie") != -1)
-                cssNode.href = "./js/modal/css/modal_ie.css";
+                cssNode.href = URL_SERVER + "/expressoMail1_2/js/modal/css/modal_ie.css";
         else
-                cssNode.href = "./js/modal/css/modal_fx.css";
+                cssNode.href = URL_SERVER + "/expressoMail1_2/js/modal/css/modal_fx.css";
         
         cssNode.media = 'screen';

trunk/phpgwapi/js/expressoAjax/expressoAjax.js

@@ -622 +622 @@
                         handlerExecuteForm = null;
                 }
-                divUpload.innerHTML= "<iframe onload=\"cExecute('$this.functions.getReturnExecuteForm',"+form_handler+");\"  style='display:"+(debug_controller ? "" : "none")+";width:"+(debug_controller ? 400 : 0)+";height:"+(debug_controller ? 400 : 0)+";' name='uploadFile'></iframe>";
+                divUpload.innerHTML= "<iframe onload=\"cExecute('expressoMail1_2.functions.getReturnExecuteForm',"+form_handler+");\"  style='display:"+(debug_controller ? "" : "none")+";width:"+(debug_controller ? 400 : 0)+";height:"+(debug_controller ? 400 : 0)+";' name='uploadFile'></iframe>";
                 form.action = URL_SERVER + "/controller.php";
                 form.target ="uploadFile";