Changeset 2469
- Timestamp:
- 04/08/10 14:45:57 (14 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 5 edited
-
expressoAdmin1_2/inc/class.db_functions.inc.php (modified) (1 diff)
-
expressoAdmin1_2/inc/class.uishared_accounts.inc.php (modified) (2 diffs)
-
expressoAdmin1_2/index.php (modified) (1 diff)
-
expressoAdmin1_2/templates/default/index.tpl (modified) (1 diff)
-
phpgwapi/images/loading.gif (added)
-
phpgwapi/js/tools/xlink.js (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.db_functions.inc.php
r2459 r2469 10 10 * option) any later version. * 11 11 \**************************************************************************/ 12 define('PHPGW_INCLUDE_ROOT','./');12 //define('PHPGW_INCLUDE_ROOT','./'); 13 13 define( 'PHPGW_API_INC', dirname( __FILE__ ) . '/../../phpgwapi/inc' ); 14 14 include_once(PHPGW_API_INC.'/class.db.inc.php'); -
trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php
r2419 r2469 10 10 * option) any later version. * 11 11 \***********************************************************************************/ 12 13 define('PHPGW_API_INC','../phpgwapi/inc');14 12 15 13 class uishared_accounts … … 113 111 ); 114 112 $p->set_var($var); 113 echo "<script>var expressoAdmin_url = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/' )}';var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( ); 115 114 $p->pfp('out','body'); 116 115 } -
trunk/expressoAdmin1_2/index.php
r1913 r2469 47 47 'lang_show_sessions' => lang('Show Sessions'), 48 48 'display_samba_suport' => $current_config['expressoAdmin_samba_support'] == 'true' ? '' : 'display:none', 49 'lang_logs' => lang('Logs') 49 'lang_logs' => lang('Logs'), 50 'url' => $GLOBALS[ 'phpgw' ] -> link( '/' ) 50 51 ); 51 52 $template->set_var($var); -
trunk/expressoAdmin1_2/templates/default/index.tpl
r1913 r2469 3 3 <tr> 4 4 <td width="1%" align="center"> 5 <img src=' ./templates/default/images/user.png'>5 <img src='{url}/expressoAdmin1_2/templates/default/images/user.png'> 6 6 </td> 7 7 <td> 8 <a href=" ../index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users">{lang_user_accounts}</a>8 <a href="{url}/index.php?menuaction=expressoAdmin1_2.uiaccounts.list_users">{lang_user_accounts}</a> 9 9 </td> 10 10 </tr> 11 11 <tr> 12 12 <td width="1%" align="center"> 13 <img HEIGHT='24' WIDTH='24' src=' ./templates/default/images/institutional_account.png'>13 <img HEIGHT='24' WIDTH='24' src='{url}/expressoAdmin1_2/templates/default/images/institutional_account.png'> 14 14 </td> 15 15 <td> 16 <a href=" ../index.php?menuaction=expressoAdmin1_2.institutional_accounts.index">{lang_institutional_accounts}</a>16 <a href="{url}/index.php?menuaction=expressoAdmin1_2.institutional_accounts.index">{lang_institutional_accounts}</a> 17 17 </td> 18 18 </tr> 19 19 <tr> 20 20 <td width="1%" align="center"> 21 <img src=' ./templates/default/images/mail_share.png'>21 <img src='{url}/expressoAdmin1_2/templates/default/images/mail_share.png'> 22 22 </td> 23 23 <td> 24 <a href=" ../index.php?menuaction=expressoAdmin1_2.uishared_accounts.index">{lang_shared_accounts}</a>24 <a href="{url}/index.php?menuaction=expressoAdmin1_2.uishared_accounts.index">{lang_shared_accounts}</a> 25 25 </td> 26 26 </tr> 27 27 <tr> 28 28 <td width="1%" align="center"> 29 <img src=' ./templates/default/images/group.png'>29 <img src='{url}/expressoAdmin1_2/templates/default/images/group.png'> 30 30 </td> 31 31 <td> 32 <a href=" ../index.php?menuaction=expressoAdmin1_2.uigroups.list_groups">{lang_user_groups}</a>32 <a href="{url}/index.php?menuaction=expressoAdmin1_2.uigroups.list_groups">{lang_user_groups}</a> 33 33 </td> 34 34 </tr> 35 35 <tr> 36 36 <td width="1%" align="center"> 37 <img src=' ./templates/default/images/mail_list.png'>37 <img src='{url}/expressoAdmin1_2/templates/default/images/mail_list.png'> 38 38 </td> 39 39 <td> 40 <a href=" ../index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists">{lang_email_lists}</a>40 <a href="{url}/index.php?menuaction=expressoAdmin1_2.uimaillists.list_maillists">{lang_email_lists}</a> 41 41 </td> 42 42 </tr> 43 43 <tr style={display_samba_suport}> 44 44 <td width="1%" align="center"> 45 <img src=' ./templates/default/images/computer.png'>45 <img src='{url}/expressoAdmin1_2/templates/default/images/computer.png'> 46 46 </td> 47 47 <td> 48 <a href=" ../index.php?menuaction=expressoAdmin1_2.uicomputers.list_computers">{lang_computers}</a>48 <a href="{url}/index.php?menuaction=expressoAdmin1_2.uicomputers.list_computers">{lang_computers}</a> 49 49 </td> 50 50 </tr> 51 51 <tr style={display_samba_suport}> 52 52 <td width="1%" align="center"> 53 <img src=' ./templates/default/images/samba.png'>53 <img src='{url}/expressoAdmin1_2/templates/default/images/samba.png'> 54 54 </td> 55 55 <td> 56 <a href=" ../index.php?menuaction=expressoAdmin1_2.uidomains.list_domains">{lang_sambadomains}</a>56 <a href="{url}/index.php?menuaction=expressoAdmin1_2.uidomains.list_domains">{lang_sambadomains}</a> 57 57 </td> 58 58 </tr> 59 59 <tr> 60 60 <td width="1%" align="center"> 61 <img src=' ./templates/default/images/sectors.png'>61 <img src='{url}/expressoAdmin1_2/templates/default/images/sectors.png'> 62 62 </td> 63 63 <td> 64 <a href=" ../index.php?menuaction=expressoAdmin1_2.uisectors.list_sectors">{lang_organizations}</a>64 <a href="{url}/index.php?menuaction=expressoAdmin1_2.uisectors.list_sectors">{lang_organizations}</a> 65 65 </td> 66 66 </tr> 67 67 <tr> 68 68 <td width="1%" align="center"> 69 <img src=' ./templates/default/images/sessions.png'>69 <img src='{url}/expressoAdmin1_2/templates/default/images/sessions.png'> 70 70 </td> 71 71 <td> 72 <a href=" ../index.php?menuaction=expressoAdmin1_2.totalsessions.show_total_sessions">{lang_show_sessions}</a>72 <a href="{url}/index.php?menuaction=expressoAdmin1_2.totalsessions.show_total_sessions">{lang_show_sessions}</a> 73 73 </td> 74 74 </tr> 75 75 <tr> 76 76 <td width="1%" align="center"> 77 <img src=' ./templates/default/images/logs.png'>77 <img src='{url}/expressoAdmin1_2/templates/default/images/logs.png'> 78 78 </td> 79 79 <td> 80 <a href=" ../index.php?menuaction=expressoAdmin1_2.uilogs.list_logs">{lang_logs}</a>80 <a href="{url}/index.php?menuaction=expressoAdmin1_2.uilogs.list_logs">{lang_logs}</a> 81 81 </td> 82 82 </tr> -
trunk/phpgwapi/js/tools/xlink.js
r2459 r2469 2 2 { 3 3 var _connector = new XConnector; 4 var _container = null; 5 var _loading = new Image( ); 6 _loading.src = URL_SERVER + '/phpgwapi/images/loading.gif'; 7 4 8 function handler( pLink ) 5 9 { … … 11 15 */ 12 16 var a = ( action.indexOf( 'admin/' ) > 0 || action.indexOf( '=admin.' ) > 0 ); 13 a = ( a || action.indexOf( '=expressoAdmin1_2.' ) > 0 ); 17 a = ( a || action.indexOf( 'home' ) > 0 ); 18 a = ( a || action.indexOf( 'expressoAdmin1_2' ) > 0 ); 14 19 a = ( a || action.indexOf( 'calendar/' ) > 0 || action.indexOf( '=calendar.' ) > 0 ); 15 20 a = ! ( a && ! ( action.indexOf( '#' ) === 0 || action.indexOf( window.location + '#' ) === 0 || action.indexOf( 'javascript:' ) === 0 ) ); … … 18 23 pLink.onclick = function( ) 19 24 { 25 _container.innerHTML = ''; 26 _container.appendChild( _loading ); 20 27 var request = _connector.go( { 21 28 'access' : action, 22 29 'handler' : function( data ) 23 30 { 24 //alert( action );25 //alert( data );26 27 31 var el = document.createElement( 'div' ); 28 32 el.innerHTML = data; … … 32 36 handler( links.item( i ) ); 33 37 34 document.getElementById( 'divAppbox' ).innerHTML = '';38 _container.innerHTML = ''; 35 39 while ( el.hasChildNodes( ) ) 36 document.getElementById( 'divAppbox' ).appendChild( el.firstChild );40 _container.appendChild( el.firstChild ); 37 41 } 38 42 } ); … … 43 47 XEvents.add( window, 'onload', function( ) 44 48 { 49 _container = document.getElementById( 'divAppbox' ); 50 document.getElementsByTagName( 'body' ).item( 0 ).style.overflowY = 'scroll'; 45 51 var links = document.getElementsByTagName( 'a' ); 46 52 for ( var i = 0; i < links.length; i++ )
Note: See TracChangeset
for help on using the changeset viewer.
