allways explicitly calling header, to allow to supress navbar via egw_framework::$navbar_done=true

This commit is contained in:
Ralf Becker 2014-03-26 12:18:51 +00:00
parent 7f237a0b03
commit 5df1bb6ea6

View File

@ -344,13 +344,13 @@ class etemplate extends boetemplate
{ {
if (!@self::$hooked) if (!@self::$hooked)
{ {
echo $GLOBALS['egw']->framework->header();
if((int) $output_mode != 2) if((int) $output_mode != 2)
{ {
echo $GLOBALS['egw']->framework->navbar(); // do header too echo $GLOBALS['egw']->framework->navbar();
} }
else else
{ {
echo $GLOBALS['egw']->framework->header();
echo '<div id="popupMainDiv">'."\n"; echo '<div id="popupMainDiv">'."\n";
if ($GLOBALS['egw_info']['user']['apps']['manual']) // adding a manual icon to every popup if ($GLOBALS['egw_info']['user']['apps']['manual']) // adding a manual icon to every popup
{ {