projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tabs/menu/roles extensions moved to module hooks file, added (un)install hooks.
[fa-stable.git]
/
includes
/
page
/
header.inc
diff --git
a/includes/page/header.inc
b/includes/page/header.inc
index 9bff3d2f391710be748f72f5b3e34a86c18eb367..fc850b953b950172d173c2299d351463d3bd177a 100644
(file)
--- a/
includes/page/header.inc
+++ b/
includes/page/header.inc
@@
-47,13
+47,12
@@
function help_url($context=null)
function send_scripts()
{
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)
{
$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));
// 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;
}
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;
{
// 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();
// add_js_ufile($jsext);
$theme = user_theme();
- $local_path_to_root = $path_to_root;
if ($help_base_url != null && $use_popup_windows && $js == '')
{
if ($help_base_url != null && $use_popup_windows && $js == '')
{
@@
-101,8
+99,8
@@
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
{
$no_menu = false;
}
{
$no_menu = false;
}
- if (!isset($_SESSION["sel_app"]))
-
session_register("sel_app");
+
//
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;
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
+125,19
@@
function page_header($title, $no_menu=false, $is_index=false, $onload="", $js=""
echo "<html dir='" . $_SESSION['language']->dir . "' >\n";
echo "<head><title>$title</title>";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding'>";
echo "<html dir='" . $_SESSION['language']->dir . "' >\n";
echo "<head><title>$title</title>";
echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding'>";
- echo "<link href='$local_path_to_root/themes/$theme/default.css' rel='stylesheet' type='text/css'> \n";
- send_scripts($js);
+ echo "<link href='$path_to_root/themes/$theme/default.css' rel='stylesheet' type='text/css'> \n";
+ if ($css)
+ echo '<link href="'.$css.'" rel="stylesheet" type="text/css">';
+
+ send_scripts();
echo "</head> \n";
if ($onload == "")
echo "<body>";
else
echo "<body onload=\"$onload\">";
echo "</head> \n";
if ($onload == "")
echo "<body>";
else
echo "<body onload=\"$onload\">";
- include_once($local_path_to_root."/themes/".user_theme()."/renderer.php");
+
+ include_once($path_to_root . "/themes/".user_theme()."/renderer.php");
$rend = new renderer();
$rend->menu_header($title, $no_menu, $is_index);
error_box();
$rend = new renderer();
$rend->menu_header($title, $no_menu, $is_index);
error_box();