X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fpage%2Fheader.inc;h=97529207827b49f15a4b97c41126d9dec924d57b;hb=aed150783ec07b89200759f15beb4962779e1568;hp=c421a66587c0f3f7c4620953623e6ab40417d0a6;hpb=4def49c9e0be02ccdf814188c2a72ebd969a7a98;p=fa-stable.git
diff --git a/includes/page/header.inc b/includes/page/header.inc
index c421a665..97529207 100644
--- a/includes/page/header.inc
+++ b/includes/page/header.inc
@@ -1,12 +1,85 @@
';
+ }
+ foreach($js_userlib as $jsfile)
+ {
+ $js .= '';
+ }
+
+ foreach($js_lib as $text)
+ {
+ $js .= $text;
+ }
+ 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;
+ global $path_to_root, $def_app, $use_popup_windows, $help_base_url;
+
+ if (in_ajax())
+ return; // just for speed up
+
$theme = user_theme();
$local_path_to_root = $path_to_root;
+ if ($help_base_url != null && $use_popup_windows && $js == '')
+ {
+ if (!function_exists('get_js_open_window'))
+ {
+ include_once($path_to_root.'/includes/ui/ui_view.inc');
+ }
+ add_js_source(get_js_open_window(900, 500));
+ }
+ if ($js!='')
+ add_js_source($js);
+
if (!isset($no_menu))
{
$no_menu = false;
@@ -15,68 +88,37 @@ function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
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;
+ $sel_app = $_SESSION["App"]->selected_application;
elseif (isset($_SESSION["sel_app"]) && $_SESSION["sel_app"] != "")
$sel_app = $_SESSION["sel_app"];
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;
- echo "dir . "' >";
- 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
| |