Changeset 2549 for trunk/calendar

Timestamp:

04/15/10 15:26:02 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problemas com a inclusão de javascript.

Location:

trunk/calendar

Files:

• inc/class.uicalendar.inc.php (modified) (2 diffs)
• inc/hook_home.inc.php (modified) (1 diff)
• js/edit_exmail.js (modified) (2 diffs)

trunk/calendar/inc/class.uicalendar.inc.php

@@ -3090 +3090 @@
                         }
                         
-                        include($file);
+                        include_once($file);
                         $refer = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
                         if($refer[2] != 'view') {
@@ -4916 +4916 @@
                         if ($param['plain'] != "True"){
                         //      $GLOBALS['phpgw']->common->phpgw_header();
-                                echo $GLOBALS['phpgw']->common->get_java_script( );
                         }
                         else{

trunk/calendar/inc/hook_home.inc.php

@@ -14 +14 @@
         $phpgw_flags = Array(
                 'currentapp'    =>      'calendar',
-                'noheader'      =>      True,
-                'nonavbar'      =>      True,
+                //'noheader'    =>      True,
+                //'nonavbar'    =>      True,
                 'noappheader'   =>      True,
                 'noappfooter'   =>      True,

trunk/calendar/js/edit_exmail.js

@@ -226 +226 @@
                 return;
         }
-        
+
+        scriptPath = URL_SERVER + '/' + scriptPath;
+
         expresso.connector.oxmlhttp.open("GET", scriptPath, false);
     expresso.connector.oxmlhttp.setRequestHeader('Content-Type','text/plain');
@@ -245 +247 @@
         Element('tbl_ext_participants').style.display='';
         el.style.display='none';
-        loadScript(path+"/js/DropDownContacts.js");
-        loadScript(path+"/js/common_functions.js");
-        loadScript(path+"/js/QuickCatalogSearch.js");
+        loadScript(path+"/js/jscode/DropDownContacts.js");
+        loadScript(path+"/js/jscode/common_functions.js");
+        loadScript(path+"/js/jscode/QuickCatalogSearch.js");
         loadScript("calendar/js/over_fn_exmail.js");
         if(!contacts)