holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-enabled after_navbar hook

Browse Source 
don't create a link in topmenu notifiy when link is not given
This commit is contained in:
Pim Snel 2007-01-23 23:38:09 +00:00
parent 9467610549
commit f2c57020a5
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,15 +254,10 @@
} }
// hook after navbar // hook after navbar
// ToDo: change it to return the content! ob_start();
$GLOBALS['egw']->hooks->process('after_navbar');
if($GLOBALS['egw_info']['user']['preferences']['common']['show_general_menu'] == 'sidebox') $content .= ob_get_contents();
{ ob_end_clean();
ob_start();
$GLOBALS['egw']->hooks->process('after_navbar');
$content .= ob_get_contents();
ob_end_clean();
}
return $content; return $content;
} }

8
phpgwapi/templates/idots/topmenu.tpl.php
View File

@ -47,7 +47,13 @@
<div id="topmenu_info"> <div id="topmenu_info">
<?php foreach($this->info_icons as $iicon):?> <?php foreach($this->info_icons as $iicon):?>
<div style="padding:0px 10px 0px 0px;position:relative;float:left;"><a href="<?=$iicon['link']?>"><img id="<?=$iicon['id']?>" src="<?=$iicon['image']?>" <?=$iicon['tooltip']?>/></a></div> <div style="padding:0px 10px 0px 0px;position:relative;float:left;">
<?php if(trim($iicon['link'])):?>
<a href="<?=$iicon['link']?>"><img id="<?=$iicon['id']?>" src="<?=$iicon['image']?>" <?=$iicon['tooltip']?>/></a>
<?php else:?>
<img id="<?=$iicon['id']?>" src="<?=$iicon['image']?>" <?=$iicon['tooltip']?>/>
<?php endif?>
</div>
<?php endforeach?> <?php endforeach?>
<?php foreach($this->menuinfoitems as $mitems):?> <?php foreach($this->menuinfoitems as $mitems):?>