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

* ProjectManager: fixed project-tree was not shown in idots template

Browse Source 
caused by etemplate change in r46410 calling header explicitly before navbar, causing navbar no longer being able to add stuff to header, eg. include javascript
thats now fixed by reverting the change 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:32:01 +00:00
parent c2e56017c4
commit ca85133247
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

@ -344,13 +344,13 @@ class etemplate extends boetemplate
{
if (!@self::$hooked)
{
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

@ -123,7 +123,10 @@ class idots_framework extends egw_framework
*/
function navbar()
{
if (self::$navbar_done) return '';
if (self::$navbar_done)
{
return !self::$header_done ? $this->header() : '';
}
self::$navbar_done = true;
// the navbar