From 201cec124d4949fc978663341e4e6570e3390fc2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 27 Mar 2010 18:39:20 +0000 Subject: [PATCH] Fix: Menu slection when using frames --- htdocs/externalsite/frames.php | 5 +++-- htdocs/includes/menus/barre_top/eldy.lib.php | 1 - htdocs/mantis/mantis.php | 3 ++- htdocs/phenix/phenix.php | 5 +++-- htdocs/webcal/webcal.php | 5 +++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php index f6a324f8ed9..ee958f7f3c4 100644 --- a/htdocs/externalsite/frames.php +++ b/htdocs/externalsite/frames.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2004-2010 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,6 +36,7 @@ if (empty($conf->global->EXTERNALSITE_URL)) $mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:""; $leftmenu=isset($_GET["leftmenu"])?$_GET["leftmenu"]:""; +$idmenu=isset($_GET["idmenu"])?$_GET["idmenu"]:""; print " @@ -44,7 +45,7 @@ print " - + global->EXTERNALSITE_URL."\"> <body> diff --git a/htdocs/includes/menus/barre_top/eldy.lib.php b/htdocs/includes/menus/barre_top/eldy.lib.php index e89a5155757..d98a1602ae9 100644 --- a/htdocs/includes/menus/barre_top/eldy.lib.php +++ b/htdocs/includes/menus/barre_top/eldy.lib.php @@ -40,7 +40,6 @@ function print_eldy_menu($db,$atarget,$hideifnotallowed) if (isset($_GET["idmenu"])) $_SESSION["idmenu"]=$_GET["idmenu"]; $_SESSION["leftmenuopened"]=""; - print '<table class="tmenu" summary="topmenu"><tr class="tmenu">'; // Home diff --git a/htdocs/mantis/mantis.php b/htdocs/mantis/mantis.php index a475d74fc11..78ba4ddf7bd 100644 --- a/htdocs/mantis/mantis.php +++ b/htdocs/mantis/mantis.php @@ -36,6 +36,7 @@ if (empty($conf->global->PHPMANTIS_URL)) $mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:""; $leftmenu=isset($_GET["leftmenu"])?$_GET["leftmenu"]:""; +$idmenu=isset($_GET["idmenu"])?$_GET["idmenu"]:""; print " <html> @@ -44,7 +45,7 @@ print " </head> <frameset rows=\"28,*\" border=0 framespacing=0 frameborder=0> - <frame name=\"barre\" src=\"mantistop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."\" noresize scrolling=\"NO\" noborder> + <frame name=\"barre\" src=\"mantistop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder> <frame name=\"main\" src=\"".$conf->global->PHPMANTIS_URL."\"> <noframes> <body> diff --git a/htdocs/phenix/phenix.php b/htdocs/phenix/phenix.php index ec1f301bab0..1bbab647b2d 100644 --- a/htdocs/phenix/phenix.php +++ b/htdocs/phenix/phenix.php @@ -1,5 +1,5 @@ <?php -/* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> +/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ if (empty($conf->global->PHPPHENIX_URL)) $mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:""; $leftmenu=isset($_GET["leftmenu"])?$_GET["leftmenu"]:""; +$idmenu=isset($_GET["idmenu"])?$_GET["idmenu"]:""; print " <html> @@ -42,7 +43,7 @@ print " </head> <frameset rows=\"28,*\" border=0 framespacing=0 frameborder=0> - <frame name=\"barre\" src=\"phenixtop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."\" noresize scrolling=\"NO\" noborder> + <frame name=\"barre\" src=\"phenixtop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder> <frame name=\"main\" src=\"".$conf->global->PHPPHENIX_URL."\"> <noframes> <body> diff --git a/htdocs/webcal/webcal.php b/htdocs/webcal/webcal.php index 6649bc374e9..97d51e5c7d9 100644 --- a/htdocs/webcal/webcal.php +++ b/htdocs/webcal/webcal.php @@ -1,5 +1,5 @@ <?php -/* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> +/* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,6 +34,7 @@ if (empty($conf->global->PHPWEBCALENDAR_URL)) $mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:""; $leftmenu=isset($_GET["leftmenu"])?$_GET["leftmenu"]:""; +$idmenu=isset($_GET["idmenu"])?$_GET["idmenu"]:""; print " <html> @@ -42,7 +43,7 @@ print " </head> <frameset rows=\"28,*\" border=0 framespacing=0 frameborder=0> - <frame name=\"barre\" src=\"webcaltop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."\" noresize scrolling=\"NO\" noborder> + <frame name=\"barre\" src=\"webcaltop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder> <frame name=\"main\" src=\"".$conf->global->PHPWEBCALENDAR_URL."\"> <noframes> <body>