Changeset 2623 for trunk/phpgwapi/templates/default/head.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/templates/default/head.inc.php (modified) (2 diffs)

trunk/phpgwapi/templates/default/head.inc.php

@@ -13 +13 @@
         if($GLOBALS['phpgw_info']['user']['preferences']['common']['show_generation_time'])
         {
-                $mtime = microtime(); 
-                $mtime = explode(' ',$mtime); 
-                $mtime = $mtime[1] + $mtime[0]; 
-                $GLOBALS['page_start_time'] = $mtime; 
+                $mtime = microtime();
+                $mtime = explode(' ',$mtime);
+                $mtime = $mtime[1] + $mtime[0];
+                $GLOBALS['page_start_time'] = $mtime;
         }
 
-        // get used language code
-        $lang_code = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
+        $pngfix = '';
+        if ( ! $GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'disable_pngfix' ] )
+                $pngfix = "\t\t" . '<!--[if lt IE 7]>' . "\n\t\t\t"
+                        . '<script src="'
+                        . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] . '/phpgwapi/templates/' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ] . '/js/pngfix.js'
+                        . '" type="text/javascript">'
+                        . "</script>\n\t\t"
+                        . "<![endif]-->\n";
 
-        $bodyheader = ' bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
-                . $GLOBALS['phpgw_info']['theme']['alink'] . '" link="' . $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
-                . $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
+        error_log( var_export( $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode',
+                ( ( ! $GLOBALS['phpgw_info']['user']['preferences']['common']['disable_slider_effects'] ) ? 'slidereffects' : 'simple_show_hide' ),
+                'phpgwapi/templates/' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ], true ), true ) . "\n\n" , 3, '/tmp/log' );
 
-        if(!$GLOBALS['phpgw_info']['server']['htmlcompliant'])
-        {
-                $bodyheader .= '';
-        }
-        $currentapp = $GLOBALS['phpgw_info']['flags']['currentapp'] ;
+        $bodyheader = ' bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color']
+                . '" link="' . $GLOBALS['phpgw_info']['theme']['link']
+                . '" alink="' . $GLOBALS['phpgw_info']['theme']['alink']
+                . '" vlink="' . $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
 
-        #_debug_array($GLOBALS['phpgw_info']['user']['preferences']['common']);
+        $app = $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ];
+        $app = ( $app ) ? ' [' . ( isset( $GLOBALS[ 'phpgw_info' ][ 'apps' ][ $app ] ) ? $GLOBALS[ 'phpgw_info' ][ 'apps' ][ $app ][ 'title' ] : lang( $app ) ) . ']' : '';
 
-        //pngfix defaults to yes
-        if(!$GLOBALS['phpgw_info']['user']['preferences']['common']['disable_pngfix'])
-        {
-                $pngfix_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/js/pngfix.js';
-                $pngfix ='<!-- This solves the Internet Explorer PNG-transparency bug, but only for IE 5.5 and higher --> 
-                <!--[if lt IE 7]>
-                <script src="'.$pngfix_src.'" type="text/javascript">
-                </script>
-                <![endif]-->';
-        }
+        $webserver_url = ( ! empty( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] ) ) ?
+                $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] : '/';
 
-        $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode',
-                ( ( ! $GLOBALS['phpgw_info']['user']['preferences']['common']['disable_slider_effects'] ) ? 'slidereffects' : 'simple_show_hide' ),
-                'phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'], true );
+        if ( strpos( $webserver_url, '/' ) != ( strlen( $webserver_url ) - 1 ) )
+                $webserver_url .= '/';
 
-        $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
-        $tpl->set_unknowns('remove');
-        $tpl->set_file(array('_head' => 'head.tpl'));
-        $tpl->set_block('_head','head');
-
-        $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
-        $app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
-
-        $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url'];
-        $webserver_url = ( !empty($webserver_url) ) ? $webserver_url : '/';
-        
-        if(strrpos($webserver_url,'/') === false || strrpos($webserver_url,'/') != (strlen($webserver_url)-1))
-                $webserver_url .= '/';
-        
         if( is_null($_SESSION['phpgw_info'][$GLOBALS['phpgw_info']['flags']['currentapp']]['user']))
                 $tmpDefault = "default";
@@ -69 +52 @@
 
         $var = Array(
-                'img_icon'      => $webserver_url . $currentapp . '/templates/'.$tmpDefault.'/images/navbar.png',
-                'img_shortcut'  => $webserver_url . $currentapp . '/templates/'.$tmpDefault.'/images/navbar.png',
-                'pngfix'        => $pngfix,
-                'slider_effects'=> $slider_effects,
-                'simple_show_hide'=> '',//$simple_show_hide,
-                'lang_code'=> $lang_code,
-                'charset'       => $GLOBALS['phpgw']->translation->charset(),
-                'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
-                'website_title' => $GLOBALS['phpgw_info']['server']['site_title'].$app,
-                'body_tags'     => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
-                'css'           => $GLOBALS['phpgw']->common->get_css(),
-                'java_script'   => $GLOBALS['phpgw']->common->get_java_script(),
-                'cookie_manager'=> ''
+                'img_icon'       => "{$webserver_url}{$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]}/templates/{$tmpDefault}/images/navbar.png",
+                'img_shortcut'   => "{$webserver_url}{$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]}/templates/{$tmpDefault}/images/navbar.png",
+                'pngfix'         => $pngfix,
+                'lang_code'      => $GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'lang' ],
+                'charset'        => $GLOBALS[ 'phpgw' ] -> translation -> charset( ),
+                'font_family'    => $GLOBALS[ 'phpgw_info' ][ 'theme' ][ 'font' ],
+                'website_title'  => "{$GLOBALS[ 'phpgw_info' ][ 'server' ][ 'site_title' ]} $app",
+                'body_tags'      => "{$bodyheader} {$GLOBALS[ 'phpgw' ] -> common -> get_body_attribs()}",
+                'css'            => $GLOBALS[ 'phpgw' ] -> common -> get_css( ),
+                'java_script'    => $GLOBALS[ 'phpgw' ] -> common -> get_java_script( ),
+                'content'        => $content
         );
-        $tpl->set_var($var);
-        $tpl->pfp('out','head');
-        unset($tpl);
+
+        $tpl = CreateObject( 'phpgwapi.Template', PHPGW_TEMPLATE_DIR );
+        $tpl -> set_unknowns( 'remove' );
+        $tpl -> set_file( array( '_head' => 'head.tpl' ) );
+        $tpl -> set_block( '_head', 'head' );
+        $tpl -> set_var( $var );
+        $tpl -> pfp( 'out', 'head' );
+        unset( $tpl );
 ?>