Changeset 2623 for trunk/phpgwapi/inc/class.common.inc.php

Timestamp:

04/23/10 10:41:56 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Organizando o HTML do template default.

File:

• trunk/phpgwapi/inc/class.common.inc.php (modified) (8 diffs)

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

@@ -399 +399 @@
                                         $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'cookieManager', 'phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] );
 
-                                        $this -> phpgw_header( );
+                                        $this -> phpgw_header( $module_content );
                                 }
                                 else
+                                {
                                         echo $this -> get_java_script( );
-
-                                echo $module_content;
+                                        echo $module_content;
+                                }
 
                                 /*if (is_object($GLOBALS['phpgw']->accounts))
@@ -1207 +1208 @@
                         if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'about')
                         {
-                                $app = $app_title = 'eGroupWare';
+                                $app = $app_title = ':: ExpressoLivre ::';
                         }
                         else
@@ -1250 +1251 @@
                 @abstract load the phpgw header
                 */
-                function phpgw_header()
+                function phpgw_header( $content )
                 {
                         // add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv)
-                        header('Content-type: text/html; charset='.$GLOBALS['phpgw']->translation->charset());
+                        header( "Content-type: text/html; charset={$GLOBALS[ 'phpgw' ] -> translation -> charset( )}" );
 
                         $path = PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'];
 
-                        include_once( "{$path}/head.inc.php" );
-
                         $this -> navbar( false );
 
                         include_once( "{$path}/navbar.inc.php" );
 
-                        if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target'])
-                                echo parse_navbar();
+                        if ( ! @$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target'])
+                        {
+                                parse_navbar( );
+                                $content = ob_get_contents( ) . $content;
+                                ob_clean( );
+
+                                parse_navbar_end( );
+                                $content .= ob_get_contents( ) . "\t";
+                                ob_clean( );
+                        }
+
+                        require_once "{$path}/head.inc.php";
                 }
 
                 function phpgw_footer()
                 {
-                        if (!defined('PHPGW_FOOTER'))
-                        {
-                                define('PHPGW_FOOTER',True);
-                                if (!isset($GLOBALS['phpgw_info']['flags']['nofooter']) || !$GLOBALS['phpgw_info']['flags']['nofooter'])
-                                {
-                                        include(PHPGW_API_INC . '/footer.inc.php');
-                                }
+                        if ( ! defined( 'PHPGW_FOOTER' ) )
+                        {
+                                define( 'PHPGW_FOOTER', true );
+                                if ( ! isset( $GLOBALS['phpgw_info']['flags']['nofooter']) || !$GLOBALS['phpgw_info']['flags']['nofooter'] )
+                                        include_once PHPGW_API_INC . '/footer.inc.php';
                         }
                 }
@@ -1294 +1301 @@
                         $tpl->set_var($GLOBALS['phpgw_info']['theme']);
                         $app_css = '';
+
                         if(@isset($_GET['menuaction']))
                         {
@@ -1303 +1311 @@
                                 }
                         }
-                        if (isset($GLOBALS['phpgw_info']['flags']['css']))
-                        {
+
+                        if ( isset( $GLOBALS['phpgw_info']['flags']['css'] ) )
                                 $app_css .= $GLOBALS['phpgw_info']['flags']['css'];
-                        }
-                        $tpl->set_var('app_css', $app_css);
+
+                        $tpl->set_var( 'app_css', $app_css );
 
                         // search for app specific css file
@@ -1318 +1326 @@
                                 $path = PHPGW_SERVER_ROOT . str_replace( '/', SEP, $css );
 
-                                $link = '<LINK href="%s" type="text/css" rel="StyleSheet">';
-                                $link = sprintf( $link,
+                                $link = '<link href="%s" type="text/css" rel="StyleSheet" />';
+                                $link = "\n\t\t" . sprintf( $link,
                                         "{$GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ]}{$css}"
                                 );
@@ -1347 +1355 @@
                         }
 
-                        return $tpl -> subst('css');
+                        return $tpl -> subst( 'css' );
                 }
 
@@ -1362 +1370 @@
                 function get_java_script( )
                 {
-                        $java_script = '';
+                        $java_script = "\t\t";
 
                         /* this flag is for all javascript code that has to be put before other jscode.