Changeset 2011
- Timestamp:
- 02/12/10 14:10:40 (14 years ago)
- Location:
- trunk/phpgwapi
- Files:
-
- 2 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/inc/class.common.inc.php
r2009 r2011 1221 1221 } 1222 1222 1223 echo "<script type='text/javascript' src='".$GLOBALS['phpgw_info']['server']['webserver_url']."/phpgwapi/expressoAjax/expressoAjax.js'></script>"; 1224 1223 // echo "<script type='text/javascript' src='".$GLOBALS['phpgw_info']['server']['webserver_url']."/phpgwapi/js/expressoAjax/expressoAjax.js'></script>"; 1224 if(!@is_object($GLOBALS['phpgw']->js)) 1225 { 1226 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); 1227 } 1228 $GLOBALS['phpgw']->js->validate_file('expressoAjax','expressoAjax'); 1229 echo $GLOBALS['phpgw']->js->get_script_links(); 1225 1230 } 1226 1231 -
trunk/phpgwapi/js/expressoAjax/expressoAjax.js
r1999 r2011 59 59 div.id = 'divProgressBar'; 60 60 div.align = "center"; 61 //div.innerHTML = ' <font face="Verdana" size="2" color="WHITE">'+document.getElementById('txt_loading').value+'...</font> ';62 div.innerHTML = ' <font face="Verdana" size="2" color="WHITE"> loading...</font> ';61 var loadingTitle = document.getElementById('txt_loading'); 62 div.innerHTML = ' <font face="Verdana" size="2" color="WHITE">'+loadingTitle.value+'...</font> '; 63 63 div.style.background = "#cc4444"; 64 64 div.style.position = 'fixed';
Note: See TracChangeset
for help on using the changeset viewer.