Changeset 2520

Timestamp:

04/14/10 12:16:28 (14 years ago)

Author:

rodsouza

Message:

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

Location:

trunk

Files:

• expressoMail1_2/js/jscode/abas.js (modified) (1 diff)
• expressoMail1_2/js/jscode/main.js (modified) (3 diffs)
• phpgwapi/js/expressoAjax/expressoAjax.js (modified) (2 diffs)

trunk/expressoMail1_2/js/jscode/abas.js

@@ -137 +137 @@
                 borderTitle = borderTitle.substring(0, resize*0.08);
 
-        td.innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + ID+" class='font-menu' width=*>" + borderTitle + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='templates/"+template+"/images/close_button.gif'></td></tr></table>";
+        td.innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + ID+" class='font-menu' width=*>" + borderTitle + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='"+URL_SERVER+"/expressoMail1_2/templates/"+template+"/images/close_button.gif'></td></tr></table>";
 
         bb = document.getElementById("border_blank");

trunk/expressoMail1_2/js/jscode/main.js

@@ -9 +9 @@
         if (!is_ie)
                 if ( Element('tableDivAppbox') )
-                        ifElement('tableDivAppbox').width = '100%';
+                        Element('tableDivAppbox').width = '100%';
         
         var save_contacts = function(data){
@@ -1397 +1397 @@
                 title = title.substring(0, parseInt(resize)*0.08);
 
-        Element("border_id_" + new_border_ID).innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + new_border_ID +" class='font-menu' width=*>" +title + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + new_border_ID + "','false') src='templates/"+template+"/images/close_button.gif'></td></tr></table>";
+        Element("border_id_" + new_border_ID).innerHTML = "<table width=100% border=0 cellspacing=0 cellpadding=0><tr><td id=font_border_id_" + new_border_ID +" class='font-menu' width=*>" +title + "</td><td width=1px><img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + new_border_ID + "','false') src='"+URL_SERVER+"/expressoMail1_2/templates/"+template+"/images/close_button.gif'></td></tr></table>";
         return new_border_ID; //Preciso retornar o ID da nova mensagem.
 }
@@ -2044 +2044 @@
                 if (data.status && Element("td_message_answered_"+msg_number)) {        
                         if(flag == 'answered')
-                                Element("td_message_answered_"+msg_number).innerHTML = '<img src=templates/'+template+'/images/answered.gif title=Respondida>';
+                                Element("td_message_answered_"+msg_number).innerHTML = '<img src="'+URL_SERVER+'/expressoMail1_2/templates/'+template+'/images/answered.gif" title="Respondida">';
                         else if(flag == 'forwarded')
-                                Element("td_message_answered_"+msg_number).innerHTML = '<img src=templates/'+template+'/images/forwarded.gif title=Encaminhada>';
+                                Element("td_message_answered_"+msg_number).innerHTML = '<img src="'+URL_SERVER+'/expressoMail1_2/templates/'+template+'/images/forwarded.gif" title="Encaminhada">';
                 }
         }

trunk/phpgwapi/js/expressoAjax/expressoAjax.js

@@ -470 +470 @@
                 if(is_ie) {
 
-                        this.oxmlhttp.open("GET", "js/"+scriptPath+".js?"+this.updateVersion, false);
+                        this.oxmlhttp.open("GET", URL_SERVER + "/expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion, false);
                         this.oxmlhttp.setRequestHeader('Content-Type','text/plain');
                         this.oxmlhttp.send(null);
@@ -478 +478 @@
                 }
                 else {
-                        script.src =  "js/"+scriptPath+".js?"+this.updateVersion;
+                        script.src =  URL_SERVER + "/expressoMail1_2/js/"+scriptPath+".js?"+this.updateVersion;
                 }