Changeset 2495 for trunk/phpgwapi

Timestamp:

04/13/10 11:43:13 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Permitindo que o ExpressoPreferences? não realize reload de página.

Location:

trunk/phpgwapi

Files:

• js/tools/xlink.js (modified) (1 diff)
• templates/classic/navbar.tpl (modified) (1 diff)
• templates/default/navbar.tpl (modified) (1 diff)

trunk/phpgwapi/js/tools/xlink.js

@@ -14 +14 @@
                 a = ( a || ( action.indexOf( window.location + '#' ) === 0 ) );
                 */
-                var a = ( action.indexOf( 'admin/' ) > 0 || action.indexOf( 'admin.' ) > 0 );
+                var a = ( action.indexOf( 'admin' ) > 0 );
                 a = ( a || action.indexOf( 'home' ) > 0 );
                 a = ( a || action.indexOf( 'contactcenter' ) > 0 );
                 a = ( a || action.indexOf( 'expressoAdmin1_2' ) > 0 );
                 a = ( a || action.indexOf( 'filemanager' ) > 0 );
-                a = ( a || action.indexOf( 'abberit_messenger' ) > 0 );
-                a = ( a || action.indexOf( 'calendar/' ) > 0 || action.indexOf( '=calendar.' ) > 0 );
+                a = ( a || action.indexOf( 'jabberit_messenger' ) > 0 );
+                a = ( a || action.indexOf( 'preferences' ) > 0 );
+                a = ( a || action.indexOf( 'calendar' ) > 0 );
                 a = ! ( a && ! ( action.indexOf( '#' ) === 0 || action.indexOf( window.location + '#' ) === 0 || action.indexOf( 'javascript:' ) === 0 ) );
 

trunk/phpgwapi/templates/classic/navbar.tpl

@@ -73 +73 @@
   <td width="30%" id="admin_info" nowrap>{current_users}</td>
   <td style="padding-right:10px" width="*" align="right" valign="center" nowrap="true">
-                <a href="{dir_root}/preferences" title="{title_my_preferences}" alt="{title_my_preferences}" onmouseover="javascript:self.status='{title_my_preferences}'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/celepar/images/preferences.png"><font size="-1">{my_preferences}</font></a>
+                <a href="{dir_root}/preferences/" title="{title_my_preferences}" alt="{title_my_preferences}" onmouseover="javascript:self.status='{title_my_preferences}'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/celepar/images/preferences.png"><font size="-1">{my_preferences}</font></a>
                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
                 <a href="#" title="{title_suggestions}" alt="{title_suggestions}" onmouseover="javascript:self.status='{title_suggestions}'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(400,550,'{dir_root}/help/enviasugestao.php')"><img src="{dir_root}/phpgwapi/templates/celepar/images/criticas.jpg"><font size="-1">{suggestions}</font></a>

trunk/phpgwapi/templates/default/navbar.tpl

@@ -99 +99 @@
   <td width="30%" id="admin_info" nowrap>{current_users}</td>
   <td style="padding-right:10px" width="*" align="right" valign="center" nowrap="true">
-                <a href="{dir_root}/preferences" title="{title_my_preferences}" alt="{title_my_preferences}" onmouseover="javascript:self.status='{title_my_preferences}'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/{template}/images/preferences.png"><font id="links_bar">{my_preferences}</font></a>
+                <a href="{dir_root}/preferences/" title="{title_my_preferences}" alt="{title_my_preferences}" onmouseover="javascript:self.status='{title_my_preferences}'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/{template}/images/preferences.png"><font id="links_bar">{my_preferences}</font></a>
                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
                 <a href="#" title="{title_suggestions}" alt="{title_suggestions}" onmouseover="javascript:self.status='{title_suggestions}'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(400,550,'{dir_root}/help/enviasugestao.php')"><img src="{dir_root}/phpgwapi/templates/{template}/images/critic.png"><font id="links_bar">{suggestions}</font></a>