Changeset 2561 for trunk/phpgwapi/templates

Timestamp:

04/16/10 12:11:51 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problemas com a execução de javascript no ExpressoMail?.

Location:

trunk/phpgwapi/templates

Files:

• classic/head.tpl (modified) (1 diff)
• default/head.inc.php (modified) (3 diffs)
• default/head.tpl (modified) (1 diff)

trunk/phpgwapi/templates/classic/head.tpl

@@ -19 +19 @@
                 {css}
                 {java_script}
-                {cookie_manager}
         </head>
         <!-- we don't need body tags anymore, do we?) we do!!! onload!! LK -->

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

@@ -45 +45 @@
         }
 
-        if(!$GLOBALS['phpgw_info']['user']['preferences']['common']['disable_slider_effects'])
-        {
-                $slider_effects_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/js/slidereffects.js';
-                $slider_effects = '<script src="'.$slider_effects_src.'" type="text/javascript">
-                </script>';
-        }
-        else
-        {
-                $simple_show_hide_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/js/simple_show_hide.js';
-                $simple_show_hide = '<script src="'.$simple_show_hide_src.'" type="text/javascript">
-                </script>';
-        }
+        $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 );
 
-        $cookie_manager = '<script src="'.$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/js/cookieManager.js" type="text/javascript"></script>'; 
         $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
         $tpl->set_unknowns('remove');
@@ -83 +73 @@
                 'pngfix'        => $pngfix,
                 'slider_effects'=> $slider_effects,
-                'simple_show_hide'=> $simple_show_hide,
+                'simple_show_hide'=> '',//$simple_show_hide,
                 'lang_code'=> $lang_code,
                 'charset'       => $GLOBALS['phpgw']->translation->charset(),
@@ -91 +81 @@
                 'css'           => $GLOBALS['phpgw']->common->get_css(),
                 'java_script'   => $GLOBALS['phpgw']->common->get_java_script(),
-                'cookie_manager'=>      $cookie_manager
+                'cookie_manager'=> ''
         );
         $tpl->set_var($var);

trunk/phpgwapi/templates/default/head.tpl

@@ -19 +19 @@
                 {css}
                 {java_script}
-                {cookie_manager}
         </head>
         <!-- we don't need body tags anymore, do we?) we do!!! onload!! LK -->