mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 09:23:28 +01:00
Added support for display the navbar on top or bottom when using frames
This commit is contained in:
parent
a052584cc7
commit
c28ab79afd
14
index.php
14
index.php
@ -29,11 +29,23 @@
|
|||||||
|
|
||||||
if (! $navbarframe && ! $framebody) {
|
if (! $navbarframe && ! $framebody) {
|
||||||
$tpl = new Template($phpgw_info["server"]["template_dir"]);
|
$tpl = new Template($phpgw_info["server"]["template_dir"]);
|
||||||
$tpl->set_file(array("frames" => "frames.tpl"));
|
$tpl->set_file(array("frames" => "frames.tpl",
|
||||||
|
"frame_body" => "frames_body.tpl",
|
||||||
|
"frame_navbar" => "frames_navbar.tpl"
|
||||||
|
));
|
||||||
|
|
||||||
$tpl->set_var("navbar_link",$phpgw->link("index.php?navbarframe=True"));
|
$tpl->set_var("navbar_link",$phpgw->link("index.php?navbarframe=True"));
|
||||||
$tpl->set_var("body_link",$phpgw->link("index.php?framebody=True"));
|
$tpl->set_var("body_link",$phpgw->link("index.php?framebody=True"));
|
||||||
|
|
||||||
|
if ($phpgw_info["user"]["preferences"]["common"]["frame_navbar_location"] == "bottom") {
|
||||||
|
$tpl->set_var("frame_size","*,60");
|
||||||
|
$tpl->parse("frames_","frame_body",True);
|
||||||
|
$tpl->parse("frames_","frame_navbar",True);
|
||||||
|
} else {
|
||||||
|
$tpl->set_var("frame_size","60,*");
|
||||||
|
$tpl->parse("frames_","frame_navbar",True);
|
||||||
|
$tpl->parse("frames_","frame_body",True);
|
||||||
|
}
|
||||||
$tpl->pparse("out","frames");
|
$tpl->pparse("out","frames");
|
||||||
}
|
}
|
||||||
if ($navbarframe) {
|
if ($navbarframe) {
|
||||||
|
@ -56,6 +56,20 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
if ($phpgw_info["server"]["useframes"] == "always") {
|
||||||
|
?>
|
||||||
|
<tr>
|
||||||
|
<td><?php echo lang("Navigation bar frame location"); ?>: </td>
|
||||||
|
<td>
|
||||||
|
<?php $selected[$phpgw_info["user"]["preferences"]["common"]["frame_navbar_location"]] = " selected"; ?>
|
||||||
|
<select name="settings[frame_navbar_location]">
|
||||||
|
<option value="top"<?php echo $selected["top"] . ">" . lang("Top"); ?></option>
|
||||||
|
<option value="bottom"<?php echo $selected["bottom"] . ">" . lang("bottom"); ?></option>
|
||||||
|
</select>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
@ -213,7 +227,7 @@
|
|||||||
|
|
||||||
$phpgw->db->unlock();
|
$phpgw->db->unlock();
|
||||||
|
|
||||||
if ($settings["useframes"]) {
|
if ($phpgw_info["server"]["useframes"] != "never") {
|
||||||
Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/index.php"));
|
Header("Location: " . $phpgw->link($phpgw_info["server"]["webserver_url"] . "/index.php"));
|
||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user