Changeset 2473 for trunk/contactcenter/inc

Timestamp:

04/09/10 12:22:03 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Permitindo que o ExpressoContacts? não realize reload de página.

Location:

trunk/contactcenter/inc

Files:

• class.ui_api.inc.php (modified) (1 diff)
• class.ui_data.inc.php (modified) (3 diffs)

trunk/contactcenter/inc/class.ui_api.inc.php

@@ -62 +62 @@
                         $template->set_var('cc_js_aux', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/contactcenter/js/ccAux.js');
                         $template->set_var('cc_js_connector', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/contactcenter/js/connector.js');
-                        $template->set_var('cc_js_wz_dragdrop', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/js/wz_dragdrop/wz_dragdrop.js');
-                        $template->set_var('cc_js_dtree', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/js/dftree/dftree.js');
-                        $template->set_var('cc_js_dtabs', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/js/dTabs/dTabs.js');
-                        $template->set_var('cc_js_djswin', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/js/dJSWin/dJSWin.js');
                         $template->set_var('cc_js_catalog_tree', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/contactcenter/js/cc_tree.js');
+
+                        $GLOBALS['phpgw']->js->validate_file( 'dftree', 'dftree', 'phpgwapi' );
+                        $GLOBALS['phpgw']->js->validate_file( 'dTabs', 'dTabs', 'phpgwapi' );
+                        $GLOBALS['phpgw']->js->validate_file( 'dJSWin', 'dJSWin', 'phpgwapi' );
+
+                        //$GLOBALS['phpgw']->js->validate_file( '', '', '' );
+
                         
                         $template->parse('out','api');

trunk/contactcenter/inc/class.ui_data.inc.php

@@ -101 +101 @@
 
 //                      $GLOBALS['phpgw']->js->set_onload('setTimeout(\'updateCards()\',1000)');
-                        $GLOBALS['phpgw']->common->phpgw_header();
+                        //$GLOBALS['phpgw']->common->phpgw_header();
 
                         $GLOBALS['phpgw']->template->set_file(array('index' => 'index.tpl'));
                         $GLOBALS['phpgw']->template->set_var('cc_root_dir', $GLOBALS['phpgw_info']['server']['webserver_url'].'/contactcenter/');
+
+                        $GLOBALS['phpgw']->template->set_var( 'url', $GLOBALS[ 'phpgw' ] -> link( '/contactcenter' ) );
 
                         /* Quick Add */
@@ -263 +265 @@
                         $main .= $GLOBALS['phpgw']->template->get_var('out');
 
+                        echo $GLOBALS['phpgw']->common->get_java_script( );
                         echo $main;
                 }
@@ -384 +387 @@
 
                                 case 'email_win':
-                                        $GLOBALS['phpgw']->common->phpgw_header();
+                                        //$GLOBALS['phpgw']->common->phpgw_header();
                                         $api = CreateObject('contactcenter.ui_api');
                                         $win = $api->get_email_win();