extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

reverted r46410 calling header explicitly before navbar, causing navbar no longer being able to add stuff to header, eg. include javascript

Browse Source 
and fixing idots_framework::navbar() to still call header, if $navbar_done is set
This commit is contained in:
Ralf Becker 2014-05-15 09:41:31 +00:00
parent 9dbe1ff186
commit bdbc22dd98
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/inc/class.etemplate.inc.php
View File

@ -330,13 +330,13 @@ class etemplate extends boetemplate
{
// let framework know, if we are a popup or not ('popup' not true, which is allways used by index.php!)
$GLOBALS['egw_info']['flags']['nonavbar'] = $output_mode == 2 ? 'popup' : false;
echo $GLOBALS['egw']->framework->header();
if((int) $output_mode != 2)
{
echo $GLOBALS['egw']->framework->navbar();
}
else
{
echo $GLOBALS['egw']->framework->header();
echo '<div id="popupMainDiv">'."\n";
if ($GLOBALS['egw_info']['user']['apps']['manual']) // adding a manual icon to every popup
{

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

@ -143,7 +143,10 @@ class idots_framework extends egw_framework
*/
function navbar()
{
if (self::$navbar_done) return '';
if (self::$navbar_done)
{
return !self::$header_done ? $this->header() : '';
}
if (!empty($_GET['nonavbar']) || $GLOBALS['egw_info']['flags']['currentapp'] == 'admin' && empty($_GET['ajax']))
{