Changeset 2578 for trunk/phpgwapi/templates

Timestamp:

04/16/10 18:58:38 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Verificando a inclusão de javascript para que seja feita apenas uma vez.

Location:

trunk/phpgwapi/templates/default

Files:

• navbar.inc.php (modified) (4 diffs)
• navbar.tpl (modified) (1 diff)

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

@@ -64 +64 @@
         }
 
+        $curr_app = NULL;
         $i = 0;
         foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
@@ -79 +80 @@
                         {
                                 $current_app = True;
-                                echo '<script>var curr_app = "' . str_replace('_','',$app) . 'id";</script>';
+                                $curr_app = $app;
                         }
 
@@ -120 +121 @@
                                         . ' onmouseout="if ( this.className != \'navbar_butOut\'){this.className=\'navbar_but\'; zoom_out(this.firstChild.firstChild.id);}"'
                                         . ' onclick="if ( this.className != \'navbar_butOut\'){this.className=\'navbar_butOut\'; zoom_out(curr_app);'
-                                        . 'document.getElementById(curr_app).parentNode.parentNode.className=\'navbar_but\';curr_app=\'' . str_replace('_','',$app) . 'id\'}"'
+                                        . 'var app = document.getElementById(curr_app); if ( app ) app.parentNode.parentNode.className=\'navbar_but\';curr_app=\'' . str_replace('_','',$app) . 'id\'}"'
                                         . ' class="navbar_but'.($current_app?'Out':'').'">';
 
@@ -162 +163 @@
                 }
         }
+
+        echo '<script>var curr_app = "' . ( ( $curr_app ) ? str_replace( '_','',$curr_app ) . 'id' : '' ) . '";</script>';
 
         if($GLOBALS['phpgw_info']['user']['preferences']['common']['start_and_logout_icons']!='no')     

trunk/phpgwapi/templates/default/navbar.tpl

@@ -75 +75 @@
         clearTimeout(zoominTimer[id]);          
         var elem = document.getElementById(id);
+        if ( ! elem )
+                return;
         if (elem.height < 24)
         {