From 284a6440699374c94d3b9a866af2d5d284a19532 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 26 Nov 2012 16:13:41 +0000
Subject: [PATCH] Use parent method to generate top menu

---
 .../jerryr/class.jerryr_framework.inc.php     | 30 ++-----------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php b/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php
index c685c649af..3f64080b77 100644
--- a/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php
+++ b/phpgwapi/templates/jerryr/class.jerryr_framework.inc.php
@@ -60,36 +60,10 @@ class jerryr_framework extends idots_framework
 		$this->tplsav2->menuitems = array();
 		$this->tplsav2->menuinfoitems = array();
 
-		if($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
-		{
-			$this->_add_topmenu_item($apps['home']);
-		}
-		/*if($GLOBALS['egw_info']['user']['apps']['manual'])
-		{
-			$this->_add_topmenu_item('manual');
-		}
-		*/
-		if($GLOBALS['egw_info']['user']['apps']['preferences'])
-		{
-			$this->_add_topmenu_item($apps['preferences']);
-		}
-		if($GLOBALS['egw_info']['user']['apps']['manual'] && isset($apps['manual']))
-		{
-			$this->_add_topmenu_item($apps['manual']);
-		}
-		//$this->_add_topmenu_item('about',lang('About %1',$GLOBALS['egw_info']['apps'][$GLOBALS['egw_info']['flags']['currentapp']]['title']));
-		$this->_add_topmenu_item($apps['logout']);
+		parent::topmenu($vars,$apps);
 
 		$this->tplsav2->assign('info_icons',$this->topmenu_icon_arr);
 
-		if($GLOBALS['egw_info']['user']['apps']['notifications'])
-		{
-			$this->_add_topmenu_info_item($this->_get_notification_bell());
-		}
-		$this->_add_topmenu_info_item($vars['user_info']);
-		$this->_add_topmenu_info_item($vars['current_users']);
-		$this->_add_topmenu_info_item($vars['quick_add']);
-
-		$this->tplsav2->display('topmenu.tpl.php');
+		return $this->tplsav2->fetch('topmenu.tpl.php');
 	}
 }