extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-09 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

"- fixed off-by-one error in extra-icons (gave an empty box)

Browse Source 
- make topmenu return it's content, not echo it"
This commit is contained in:
Ralf Becker 2007-04-29 11:06:44 +00:00
parent c128b0a017
commit 335b0eb97a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpgwapi/templates/idots/class.idots_framework.inc.php
View File

@ -38,6 +38,12 @@
* @var Template * @var Template
*/ */
var $tpl; var $tpl;
/**
* Instance of the Savant template class
*
* @var tplsavant2
*/
var $tplsav2;
/** /**
* true if $this->navbar() was called * true if $this->navbar() was called
* *
@ -107,7 +113,7 @@
if($GLOBALS['egw_info']['user']['preferences']['common']['show_general_menu'] != 'sidebox') if($GLOBALS['egw_info']['user']['preferences']['common']['show_general_menu'] != 'sidebox')
{ {
$GLOBALS['egw']->hooks->process('topmenu_info'); $GLOBALS['egw']->hooks->process('topmenu_info');
echo $this->topmenu(); $content = $this->topmenu();
} }
$this->navbar_done = true; $this->navbar_done = true;
@ -139,7 +145,7 @@
$vars = $this->_get_navbar($apps); $vars = $this->_get_navbar($apps);
$this->tpl->set_var($vars); $this->tpl->set_var($vars);
$content = $this->tpl->fp('out','navbar_header'); $content .= $this->tpl->fp('out','navbar_header');
// general (app-unspecific) sidebox menu // general (app-unspecific) sidebox menu
if($GLOBALS['egw_info']['user']['preferences']['common']['show_general_menu'] == 'sidebox') if($GLOBALS['egw_info']['user']['preferences']['common']['show_general_menu'] == 'sidebox')
@ -532,7 +538,7 @@
} }
} }
// settings for the extra icons dif // settings for the extra icons dif
if ($i < $max_icons) // no extra icon div if ($i <= $max_icons) // no extra icon div
{ {
$this->tpl->set_var('app_extra_icons_div',''); $this->tpl->set_var('app_extra_icons_div','');
$this->tpl->set_var('app_extra_icons_icon',''); $this->tpl->set_var('app_extra_icons_icon','');
@ -626,7 +632,7 @@
$this->_add_topmenu_info_item($this->_current_users()); $this->_add_topmenu_info_item($this->_current_users());
$this->_add_topmenu_info_item($this->_get_quick_add()); $this->_add_topmenu_info_item($this->_get_quick_add());
$this->tplsav2->display('topmenu.tpl.php'); return $this->tplsav2->fetch('topmenu.tpl.php');
} }
/** /**