Changeset 2473
- Timestamp:
- 04/09/10 12:22:03 (14 years ago)
- Location:
- trunk
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/contactcenter/inc/class.ui_api.inc.php
r1612 r2473 62 62 $template->set_var('cc_js_aux', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/contactcenter/js/ccAux.js'); 63 63 $template->set_var('cc_js_connector', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/contactcenter/js/connector.js'); 64 $template->set_var('cc_js_wz_dragdrop', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/js/wz_dragdrop/wz_dragdrop.js');65 $template->set_var('cc_js_dtree', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/js/dftree/dftree.js');66 $template->set_var('cc_js_dtabs', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/js/dTabs/dTabs.js');67 $template->set_var('cc_js_djswin', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/js/dJSWin/dJSWin.js');68 64 $template->set_var('cc_js_catalog_tree', $GLOBALS['phpgw_info']['server']['webserver_url'] . '/contactcenter/js/cc_tree.js'); 65 66 $GLOBALS['phpgw']->js->validate_file( 'dftree', 'dftree', 'phpgwapi' ); 67 $GLOBALS['phpgw']->js->validate_file( 'dTabs', 'dTabs', 'phpgwapi' ); 68 $GLOBALS['phpgw']->js->validate_file( 'dJSWin', 'dJSWin', 'phpgwapi' ); 69 70 //$GLOBALS['phpgw']->js->validate_file( '', '', '' ); 71 69 72 70 73 $template->parse('out','api'); -
trunk/contactcenter/inc/class.ui_data.inc.php
r2410 r2473 101 101 102 102 // $GLOBALS['phpgw']->js->set_onload('setTimeout(\'updateCards()\',1000)'); 103 $GLOBALS['phpgw']->common->phpgw_header();103 //$GLOBALS['phpgw']->common->phpgw_header(); 104 104 105 105 $GLOBALS['phpgw']->template->set_file(array('index' => 'index.tpl')); 106 106 $GLOBALS['phpgw']->template->set_var('cc_root_dir', $GLOBALS['phpgw_info']['server']['webserver_url'].'/contactcenter/'); 107 108 $GLOBALS['phpgw']->template->set_var( 'url', $GLOBALS[ 'phpgw' ] -> link( '/contactcenter' ) ); 107 109 108 110 /* Quick Add */ … … 263 265 $main .= $GLOBALS['phpgw']->template->get_var('out'); 264 266 267 echo $GLOBALS['phpgw']->common->get_java_script( ); 265 268 echo $main; 266 269 } … … 384 387 385 388 case 'email_win': 386 $GLOBALS['phpgw']->common->phpgw_header();389 //$GLOBALS['phpgw']->common->phpgw_header(); 387 390 $api = CreateObject('contactcenter.ui_api'); 388 391 $win = $api->get_email_win(); -
trunk/contactcenter/index.php
r1598 r2473 17 17 18 18 $GLOBALS['phpgw_info']['flags'] = array( 19 'currentapp' => 'contactcenter' ,20 'noheader' => true,19 'currentapp' => 'contactcenter' 20 //'noheader' => true, 21 21 //'nonavbar' => true 22 22 ); -
trunk/contactcenter/js/cc.js
r2171 r2473 293 293 294 294 }; 295 Connector.newRequest('populateSharingSelect', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cards_data', 'POST', handler);295 Connector.newRequest('populateSharingSelect', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cards_data', 'POST', handler); 296 296 } 297 297 … … 398 398 //populateRelations(data['relations']); 399 399 }; 400 Connector.newRequest('populateFullEdit', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_full_data&id=' + id + "&catalog="+catalog, 'GET', handler);400 Connector.newRequest('populateFullEdit', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_full_data&id=' + id + "&catalog="+catalog, 'GET', handler); 401 401 } 402 402 … … 443 443 ccAddGroup.clear(true); 444 444 if(!shared) 445 Connector.newRequest('populateEditGroup', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_group&id='+id, 'GET', handler);445 Connector.newRequest('populateEditGroup', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_group&id='+id, 'GET', handler); 446 446 else 447 Connector.newRequest('populateEditGroup', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_group&id='+id+'&shared_from='+shared, 'GET', handler);447 Connector.newRequest('populateEditGroup', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_group&id='+id+'&shared_from='+shared, 'GET', handler); 448 448 } 449 449 … … 1006 1006 }; 1007 1007 1008 Connector.newRequest('populateStates', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_states&country='+Element('cc_addr_countries').value, 'GET', handler);1008 Connector.newRequest('populateStates', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_states&country='+Element('cc_addr_countries').value, 'GET', handler); 1009 1009 } 1010 1010 … … 1121 1121 }; 1122 1122 1123 Connector.newRequest('populateCities', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cities&'+requestStr, 'GET', handler);1123 Connector.newRequest('populateCities', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cities&'+requestStr, 'GET', handler); 1124 1124 } 1125 1125 … … 1799 1799 if(result) { 1800 1800 if(result.toLowerCase() == number) 1801 Connector.newRequest('removeAllEntries', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=remove_all_entries', 'GET', handler);1801 Connector.newRequest('removeAllEntries', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=remove_all_entries', 'GET', handler); 1802 1802 else 1803 1803 alert('Código Incorreto'); … … 1835 1835 typeArg = (type == 'groups' ? 'group' : 'entry'); 1836 1836 1837 Connector.newRequest('removeEntry', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=remove_'+typeArg+'&remove=' + id, 'GET', handler);1837 Connector.newRequest('removeEntry', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=remove_'+typeArg+'&remove=' + id, 'GET', handler); 1838 1838 } 1839 1839 … … 2362 2362 }; 2363 2363 2364 Connector.newRequest('setMaxCards', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=set_n_cards&ncards=' + ncards, 'GET');2364 Connector.newRequest('setMaxCards', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=set_n_cards&ncards=' + ncards, 'GET'); 2365 2365 } 2366 2366 … … 2681 2681 2682 2682 var info = "letter="+letter+"&page="+CC_actual_page+"&ids="+ids; 2683 Connector.newRequest('showCards', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cards_data', 'POST', handler, info);2683 Connector.newRequest('showCards', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_cards_data', 'POST', handler, info); 2684 2684 } 2685 2685 … … 2831 2831 resetQuickAdd(); 2832 2832 2833 Connector.newRequest('quickAdd', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=quick_add', 'POST', handler, 'add='+escape(str));2833 Connector.newRequest('quickAdd', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=quick_add', 'POST', handler, 'add='+escape(str)); 2834 2834 } 2835 2835 … … 2845 2845 } 2846 2846 } 2847 Connector.newRequest('voip', "../../expressoMail1_2/controller.php?action=expressoMail1_2.functions.callVoipconnect&to="+phoneUser+"&typePhone="+typePhone, 'POST', handler_voip);2848 } 2847 Connector.newRequest('voip', URL_SERVER + "/expressoMail1_2/controller.php?action=expressoMail1_2.functions.callVoipconnect&to="+phoneUser+"&typePhone="+typePhone, 'POST', handler_voip); 2848 } -
trunk/contactcenter/js/ccIEContacts.js
r285 r2473 238 238 var typeImport = Element('typeImport').value; 239 239 240 Connector.newRequest('import_contacts', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=import_contacts&typeImport='+typeImport,'GET',handler_import);240 Connector.newRequest('import_contacts', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=import_contacts&typeImport='+typeImport,'GET',handler_import); 241 241 } 242 242 … … 280 280 var typeExport = Element("typeExport"); 281 281 Element('export_button').disabled = true; 282 Connector.newRequest('export_contacts', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=export_contacts', 'POST', handler_export, 'typeExport='+typeExport.value);282 Connector.newRequest('export_contacts', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=export_contacts', 'POST', handler_export, 'typeExport='+typeExport.value); 283 283 } 284 284 -
trunk/contactcenter/js/ccMain.js
r1721 r2473 57 57 } 58 58 59 Connector.newRequest('ViewLdap', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_visible_all_ldap', 'GET', ViewLdap);59 Connector.newRequest('ViewLdap', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_visible_all_ldap', 'GET', ViewLdap); 60 60 61 61 ccTree.Connector = Connector; -
trunk/contactcenter/js/ccQuickAddContact.js
r1612 r2473 61 61 this.showWindow(div); 62 62 else { 63 Connector.newRequest('get_catalog_add_contact', '../index.php?menuaction=contactcenter.ui_data.data_manager&method=get_catalog_add_contact', 'POST', handler, 'id='+id);63 Connector.newRequest('get_catalog_add_contact', URL_SERVER + '/index.php?menuaction=contactcenter.ui_data.data_manager&method=get_catalog_add_contact', 'POST', handler, 'id='+id); 64 64 } 65 65 } -
trunk/contactcenter/js/connector.js
r2 r2473 51 51 { 52 52 oxmlhttp = new XMLHttpRequest(); 53 oxmlhttp.overrideMimeType('text/ xml');53 oxmlhttp.overrideMimeType('text/plain'); 54 54 } 55 55 catch (e) … … 117 117 try 118 118 { 119 target += '&BackgroundRequest=' + Date.parse( new Date ); 119 120 if (method == '' || method == 'GET') 120 121 { -
trunk/contactcenter/templates/classic/api_common.tpl
r2 r2473 30 30 <script type="text/javascript" src="{cc_js_aux}"></script> 31 31 <script type="text/javascript" src="{cc_js_connector}"></script> 32 <script type="text/javascript" src="{cc_js_wz_dragdrop}"></script>33 <script type="text/javascript" src="{cc_js_dtree}"></script>34 <script type="text/javascript" src="{cc_js_dtabs}"></script>35 <script type="text/javascript" src="{cc_js_djswin}"></script>36 32 <script type="text/javascript" src="{cc_js_catalog_tree}"></script> 37 33 -
trunk/contactcenter/templates/classic/index.tpl
r1690 r2473 11 11 } 12 12 </style> 13 <script src=" js/cc.js" type="text/javascript"></script>13 <script src="{url}/js/cc.js" type="text/javascript"></script> 14 14 <!-- JS MESSAGES --> 15 15 <input id="cc_msg_name_mandatory" type="hidden" value="{cc_msg_name_mandatory}"> … … 252 252 <!-- _END VIEW CARDS --> 253 253 <!-- BOTTOM DETAILS--> 254 <script type="text/javascript" src=" js/moo.fx.js"></script>255 <script type="text/javascript" src=" js/ccListParticipants.js"></script>256 <script type="text/javascript" src=" js/ccQuickAddContact.js"></script>257 <script type="text/javascript" src=" js/ccIEContacts.js"></script>258 <script type="text/javascript" src=" js/ccMain.js"></script>254 <script type="text/javascript" src="{url}/js/moo.fx.js"></script> 255 <script type="text/javascript" src="{url}/js/ccListParticipants.js"></script> 256 <script type="text/javascript" src="{url}/js/ccQuickAddContact.js"></script> 257 <script type="text/javascript" src="{url}/js/ccIEContacts.js"></script> 258 <script type="text/javascript" src="{url}/js/ccMain.js"></script> 259 259 <!-- END BOTTOM DETAILS--> -
trunk/contactcenter/templates/default/api_common.tpl
r1496 r2473 38 38 <script type="text/javascript" src="{cc_js_aux}"></script> 39 39 <script type="text/javascript" src="{cc_js_connector}"></script> 40 <script type="text/javascript" src="{cc_js_wz_dragdrop}"></script>41 <script type="text/javascript" src="{cc_js_dtree}"></script>42 <script type="text/javascript" src="{cc_js_dtabs}"></script>43 <script type="text/javascript" src="{cc_js_djswin}"></script>44 40 <script type="text/javascript" src="{cc_js_catalog_tree}"></script> 45 41 <script type="text/javascript"> -
trunk/contactcenter/templates/default/index.tpl
r1690 r2473 11 11 } 12 12 </style> 13 <script src=" js/cc.js" type="text/javascript"></script>13 <script src="{url}/js/cc.js" type="text/javascript"></script> 14 14 <!-- JS MESSAGES --> 15 15 <input id="cc_msg_name_mandatory" type="hidden" value="{cc_msg_name_mandatory}"> … … 254 254 <!-- _END VIEW CARDS --> 255 255 <!-- BOTTOM DETAILS--> 256 <script type="text/javascript" src=" js/moo.fx.js"></script>257 <script type="text/javascript" src=" js/ccListParticipants.js"></script>258 <script type="text/javascript" src=" js/ccQuickAddContact.js"></script>259 <script type="text/javascript" src=" js/ccIEContacts.js"></script>260 <script type="text/javascript" src=" js/ccMain.js"></script>256 <script type="text/javascript" src="{url}/js/moo.fx.js"></script> 257 <script type="text/javascript" src="{url}/js/ccListParticipants.js"></script> 258 <script type="text/javascript" src="{url}/js/ccQuickAddContact.js"></script> 259 <script type="text/javascript" src="{url}/js/ccIEContacts.js"></script> 260 <script type="text/javascript" src="{url}/js/ccMain.js"></script> 261 261 <!-- END BOTTOM DETAILS--> -
trunk/phpgwapi/inc/class.common.inc.php
r2439 r2473 1230 1230 $GLOBALS['phpgw']->js->validate_file('expressoAjax','expressoAjax'); 1231 1231 1232 $GLOBALS['phpgw']->js->validate_file('wz_dragdrop','wz_dragdrop'); 1233 1232 1234 echo "<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>"; 1233 1235 echo $GLOBALS['phpgw']->js->get_script_links(); … … 1236 1238 1237 1239 $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','expressoAjax'); 1240 1241 // TODO 1242 // Esse javascript será carregado sempre pois causa grandes 1243 // problemas em diversos módulos. Algum dia será substituido. 1244 $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','wz_dragdrop'); 1238 1245 1239 1246 if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target']) -
trunk/phpgwapi/js/tools/xlink.js
r2470 r2473 16 16 var a = ( action.indexOf( 'admin/' ) > 0 || action.indexOf( '=admin.' ) > 0 ); 17 17 a = ( a || action.indexOf( 'home' ) > 0 ); 18 a = ( a || action.indexOf( 'contactcenter' ) > 0 ); 18 19 a = ( a || action.indexOf( 'expressoAdmin1_2' ) > 0 ); 19 20 a = ( a || action.indexOf( 'abberit_messenger' ) > 0 ); … … 48 49 XEvents.add( window, 'onload', function( ) 49 50 { 51 var _center = document.createElement( 'center' ); 52 _center.appendChild( _loading ); 53 50 54 _container = document.getElementById( 'divAppbox' ); 55 _loading = _center; 56 51 57 document.getElementsByTagName( 'body' ).item( 0 ).style.overflowY = 'scroll'; 58 52 59 var links = document.getElementsByTagName( 'a' ); 53 60 for ( var i = 0; i < links.length; i++ )
Note: See TracChangeset
for help on using the changeset viewer.