Changeset 2366

Timestamp:

03/29/10 12:49:53 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Removendo redundância da exibição da barra de navegação

Location:

trunk

Files:

• home.php (modified) (2 diffs)
• phpgwapi/inc/class.common.inc.php (modified) (1 diff)
• phpgwapi/inc/functions.inc.php (modified) (1 diff)

trunk/home.php

@@ -27 +27 @@
         $GLOBALS['phpgw_info']['flags'] = array(
                 'noheader'                => True,
-                'nonavbar'                => True,
+                'nonavbar'                => ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) ) ? true : false ),
                 'currentapp'              => 'home',
                 'enable_network_class'    => True,
@@ -65 +65 @@
         {
                 $GLOBALS['phpgw']->common->phpgw_header();
-                echo parse_navbar();
+                //echo parse_navbar();
         }
         // Default Applications (Home Page) 

trunk/phpgwapi/inc/class.common.inc.php

@@ -1223 +1223 @@
                                 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
                         }
+
+                        $GLOBALS['phpgw']->js->validate_file( 'tools','event_config' );
+                        $GLOBALS['phpgw']->js->validate_file( 'tools','xconnector' );
+                        //$GLOBALS['phpgw']->js->validate_file( 'tools','xlink' );
+
                         $GLOBALS['phpgw']->js->validate_file('expressoAjax','expressoAjax');
+
                         echo "<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>";
                         echo $GLOBALS['phpgw']->js->get_script_links();
+
                         $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','expressoAjax');
 

trunk/phpgwapi/inc/functions.inc.php

@@ -421 +421 @@
                         {
                                 $GLOBALS['phpgw']->common->phpgw_header();
-                                if ($GLOBALS['phpgw_info']['flags']['noheader'])
-                                {
-                                        echo parse_navbar();
-                                }
 
                                 $GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access %1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));