mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-19 03:41:32 +01:00
re-enabled after_navbar hook
don't create a link in topmenu notifiy when link is not given
This commit is contained in:
parent
9467610549
commit
f2c57020a5
@ -254,15 +254,10 @@
|
||||
}
|
||||
|
||||
// hook after navbar
|
||||
// ToDo: change it to return the content!
|
||||
|
||||
if($GLOBALS['egw_info']['user']['preferences']['common']['show_general_menu'] == 'sidebox')
|
||||
{
|
||||
ob_start();
|
||||
$GLOBALS['egw']->hooks->process('after_navbar');
|
||||
$content .= ob_get_contents();
|
||||
ob_end_clean();
|
||||
}
|
||||
ob_start();
|
||||
$GLOBALS['egw']->hooks->process('after_navbar');
|
||||
$content .= ob_get_contents();
|
||||
ob_end_clean();
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
@ -47,7 +47,13 @@
|
||||
|
||||
<div id="topmenu_info">
|
||||
<?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 foreach($this->menuinfoitems as $mitems):?>
|
||||
|
Loading…
Reference in New Issue
Block a user