mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
Fixed frames
This commit is contained in:
parent
9ca521458c
commit
96791d2cad
@ -34,8 +34,8 @@
|
||||
"frame_navbar" => "frames_navbar.tpl"
|
||||
));
|
||||
|
||||
$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("navbar_link",$phpgw->link("index.php","navbarframe=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");
|
||||
|
@ -221,8 +221,14 @@
|
||||
function delete($app_name,$var)
|
||||
{
|
||||
global $phpgw_info;
|
||||
unset($phpgw_info["user"]["preferences"][$app_name][$var]);
|
||||
|
||||
unset($phpgw_info["user"]["preferences"][$app_name][$var]);
|
||||
}
|
||||
|
||||
// This will kill all preferences within a certain app
|
||||
function reset($app_name)
|
||||
{
|
||||
global $phpgw_info;
|
||||
$phpgw_info["user"]["preferences"][$app_name] = array();
|
||||
}
|
||||
} //end of preferences class
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
include("../header.inc.php");
|
||||
|
||||
if (! $submit) {
|
||||
if ($phpgw_info["server"]["useframes"] == "allowed") {
|
||||
if ($phpgw_info["server"]["useframes"] != "never") {
|
||||
$target = ' target="_top"';
|
||||
}
|
||||
?>
|
||||
@ -56,7 +56,7 @@
|
||||
</tr>
|
||||
<?php
|
||||
}
|
||||
if ($phpgw_info["server"]["useframes"] == "always") {
|
||||
if ($phpgw_info["server"]["useframes"] != "never") {
|
||||
?>
|
||||
<tr>
|
||||
<td><?php echo lang("Navigation bar frame location"); ?>: </td>
|
||||
@ -202,6 +202,7 @@
|
||||
$phpgw->common->phpgw_footer();
|
||||
} else {
|
||||
|
||||
$phpgw->preferences->reset("common");
|
||||
while ($setting = each($settings)) {
|
||||
$phpgw->preferences->change("common",$setting[0],$setting[1]);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user