X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fpage%2Fheader.inc;h=87d0ee870c751ad1ba6045a90ff32a2190e1e5f2;hb=063c5f22068dbbd6adccacaf5bd0f66b2eda8e4f;hp=b0364cbebcec0e19c6c94ae187dfe13ea768455c;hpb=8fede7cc2170d17d71eb587477996add5ccadfc6;p=fa-stable.git diff --git a/includes/page/header.inc b/includes/page/header.inc index b0364cbe..87d0ee87 100644 --- a/includes/page/header.inc +++ b/includes/page/header.inc @@ -47,13 +47,12 @@ function help_url($context=null) function send_scripts() { - global $js_lib, $js_static, $js_path, $js_userlib, $comp_path, - $path_to_root, $go_debug; + global $js_static, $js_path, $js_userlib, $path_to_root, $go_debug; $js =''; foreach($js_static as $jsfile) { - $fpath = $comp_path.'/'.user_company().'/js_cache/'.$jsfile; + $fpath = company_path().'/js_cache/'.$jsfile; // compress also static files if (!file_exists($fpath) || $go_debug) cache_js_file($fpath, file_get_contents($js_path.$jsfile)); @@ -70,7 +69,7 @@ function send_scripts() echo $js; } -function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="") +function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="", $css='') { // titles and screen header global $path_to_root, $def_app, $use_popup_windows, $help_base_url; @@ -84,7 +83,6 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" // add_js_ufile($jsext); $theme = user_theme(); - $local_path_to_root = $path_to_root; if ($help_base_url != null && $use_popup_windows && $js == '') { @@ -101,8 +99,6 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" { $no_menu = false; } - //if (!isset($_SESSION["sel_app"])) - // session_register("sel_app"); if (isset($_SESSION["App"]) && is_object($_SESSION["App"]) && isset($_SESSION["App"]->selected_application) && $_SESSION["App"]->selected_application != "") $sel_app = $_SESSION["App"]->selected_application; @@ -127,15 +123,19 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="" echo "dir . "' >\n"; echo "