diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index e2cb3544be..45d132408e 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -1094,10 +1094,6 @@ 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(); } } diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 1d9862848f..dcb41259a7 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -81,10 +81,6 @@ class egw_framework 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 $content; @@ -102,14 +98,6 @@ class egw_framework 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) * @@ -713,4 +701,6 @@ if (!function_exists('display_sidebox')) { $GLOBALS['egw']->framework->sidebox($appname,$menu_title,$file); } -} + } + +