remove topmenu code from framework again

This commit is contained in:
Pim Snel 2007-01-09 22:42:01 +00:00
parent 0315d30672
commit 4e26206909
2 changed files with 3 additions and 17 deletions

View File

@ -1094,10 +1094,6 @@
if (!$GLOBALS['egw_info']['flags']['nonavbar']) if (!$GLOBALS['egw_info']['flags']['nonavbar'])
{ {
if($GLOBALS['egw_info']['user']['preferences']['common']['show_top_menu'] == 'yes')
{
echo $GLOBALS['egw']->framework->topmenu();
}
echo $GLOBALS['egw']->framework->navbar(); echo $GLOBALS['egw']->framework->navbar();
} }
} }

View File

@ -81,10 +81,6 @@ class egw_framework
if (!isset($GLOBALS['egw_info']['flags']['nonavbar']) || !$GLOBALS['egw_info']['flags']['nonavbar']) if (!isset($GLOBALS['egw_info']['flags']['nonavbar']) || !$GLOBALS['egw_info']['flags']['nonavbar'])
{ {
if($GLOBALS['egw_info']['user']['preferences']['common']['show_top_menu'] == 'yes')
{
echo $this->topmenu();
}
echo $this->navbar(); echo $this->navbar();
} }
echo $content; echo $content;
@ -102,14 +98,6 @@ class egw_framework
die('virtual, need to be reimplemented in the template!!!'); die('virtual, need to be reimplemented in the template!!!');
} }
/**
* Returns the html for the top menu
*
* @return string with html
*/
function topmenu()
{}
/** /**
* Returns the html from the body-tag til the main application area (incl. opening div tag) * Returns the html from the body-tag til the main application area (incl. opening div tag)
* *
@ -713,4 +701,6 @@ if (!function_exists('display_sidebox'))
{ {
$GLOBALS['egw']->framework->sidebox($appname,$menu_title,$file); $GLOBALS['egw']->framework->sidebox($appname,$menu_title,$file);
} }
} }