extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 04:11:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed navbar showing up twice when using frames and calling phpgw_header() manually

Browse Source
This commit is contained in:
jengo 2000-12-18 21:33:02 +00:00
parent 96791d2cad
commit 3a1c8acfbb
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/editaccount.php
View File

@ -72,7 +72,7 @@
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();
$phpgw->common->navbar(); $phpgw->common->navbar();
$userData = $phpgw->accounts->read_userData($account_id); $userData = $phpgw->accounts->read_userData($account_id);
$db_perms = $phpgw->accounts->read_apps($userData["account_lid"]); $db_perms = $phpgw->accounts->read_apps($userData["account_lid"]);

2
index.php
View File

@ -50,7 +50,7 @@
} }
if ($navbarframe) { if ($navbarframe) {
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();
$phpgw->common->navbar(); $phpgw->common->navbar(True);
} }
} else { } else {
$phpgw->common->phpgw_header(); $phpgw->common->phpgw_header();

2
phpgwapi/phpgw.inc.php
View File

@ -383,7 +383,7 @@
\**************************************************************************/ \**************************************************************************/
if (($phpgw_info["user"]["preferences"]["common"]["useframes"] && $phpgw_info["server"]["useframes"] == "allowed") if (($phpgw_info["user"]["preferences"]["common"]["useframes"] && $phpgw_info["server"]["useframes"] == "allowed")
|| ($phpgw_info["server"]["useframes"] == "always")) { || ($phpgw_info["server"]["useframes"] == "always")) {
$phpgw_info["flags"]["navbar_target"] = "phpgw_body"; $phpgw_info["flags"]["navbar_target"] = "phpgw_body";
} }
/**************************************************************************\ /**************************************************************************\

10
phpgwapi/phpgw_common.inc.php
View File

@ -294,9 +294,17 @@
} }
} }
function navbar() function navbar($force = False)
{ {
global $cd,$phpgw,$phpgw_info,$colspan,$PHP_SELF; global $cd,$phpgw,$phpgw_info,$colspan,$PHP_SELF;
if (($phpgw_info["user"]["preferences"]["common"]["useframes"] && $phpgw_info["server"]["useframes"] == "allowed")
|| ($phpgw_info["server"]["useframes"] == "always")) {
if (! $force) {
return False;
}
}
$tpl = new Template($phpgw_info["server"]["template_dir"]); $tpl = new Template($phpgw_info["server"]["template_dir"]);
$tpl->set_file(array("navbar" => "navbar.tpl", $tpl->set_file(array("navbar" => "navbar.tpl",
"navbar_row" => "navbar_row.tpl", "navbar_row" => "navbar_row.tpl",