X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=2ab707cc55e9d14419c6dcfd6d4312e8d56db0ed;hb=e41b7b30847fa2889d67d4e418bb9819a85f065d;hp=50c562521d2e72d7d277b42a463aecef03d4d6b4;hpb=f6e1b649fc75750383b17c2ced6a5c1d6f19fe2e;p=fa-stable.git
diff --git a/includes/page/header.inc b/includes/page/header.inc
index 50c56252..2ab707cc 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -17,7 +17,7 @@ function help_url($title, $app)
}
elseif ($title==_("Main Menu"))
{
- $help_page_url = $applications[$app];
+ $help_page_url = access_string($applications[$app], true);
}
else
{
@@ -27,41 +27,44 @@ function help_url($title, $app)
return $help_base_url.urlencode(str_replace(' ', '', ucwords($help_page_url)));
}
-function send_scripts()
+function send_scripts()
{
global $js_lib, $js_static, $js_path, $js_userlib, $comp_path,
$path_to_root, $go_debug;
-
- add_user_js_data();
+
+ add_user_js_data();
$js ='';
- foreach($js_static as $jsfile) {
+ foreach($js_static as $jsfile)
+ {
$fpath = $comp_path.'/'.user_company().'/js_cache/'.$jsfile;
// compress also static files
- if (!file_exists($fpath) || $go_debug)
- cache_js_file($fpath, file_get_contents($js_path.$jsfile));
-
- $js .= '';
+ if (!file_exists($fpath) || $go_debug)
+ cache_js_file($fpath, file_get_contents($js_path.$jsfile));
+
+ $js .= '';
}
- foreach($js_userlib as $jsfile) {
- $js .= '';
+ foreach($js_userlib as $jsfile)
+ {
+ $js .= '';
}
- foreach($js_lib as $text) {
- $js .= $text;
+ foreach($js_lib as $text)
+ {
+ $js .= $text;
}
- echo $js;
+ echo $js;
}
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js="")
{
// titles and screen header
- global $db_connections, $path_to_root, $def_app, $applications,
- $help_base_url, $help_page_url, $use_popup_windows;
+ global $path_to_root, $def_app, $use_popup_windows, $help_base_url;
- if (in_ajax()) return; // just for speed up
+ if (in_ajax())
+ return; // just for speed up
$theme = user_theme();
$local_path_to_root = $path_to_root;
@@ -91,18 +94,21 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
else
$sel_app = $def_app;
$_SESSION["sel_app"] = $sel_app;
+ if (isset($_SESSION["App"]) && is_object($_SESSION["App"]))
+ $_SESSION["App"]->selected_application = $sel_app;
$encoding = $_SESSION['language']->encoding;
if (!headers_sent()){
header("Content-type: text/html; charset='$encoding'");
}
+ echo "\n";
echo "dir . "' >\n";
echo "
$title";
$local_stylesheet = $_SESSION['language']->get_stylesheet();
- echo "";
- echo " \n";
+ echo "";
+ echo " \n";
if (file_exists($local_path_to_root. "/".$local_stylesheet))
- echo " \n";
+ echo " \n";
send_scripts($js);
echo " \n";
@@ -110,51 +116,9 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
echo "";
else
echo "";
-
- echo "\n";
- echo "\n";
- echo "\n";
-
- echo "\n";
- echo "\n";
- echo "\n";
- echo "\n";
- echo "\n";
- echo " ";
-
- if ($title && !$no_menu && !$is_index)
- {
- echo "";
- }
-
- if (!$is_index)
- echo " ";
+ include_once($local_path_to_root."/themes/".user_theme()."/renderer.php");
+ $rend = new renderer();
+ $rend->menu_header($title, $no_menu, $is_index);
}
?>
\ No newline at end of file
| |