[Phpgroupware-cvs] CVS: phpgwapi/templates/linux-at-work.de head.inc.php,1.3.2.1,1.3.2.1.2.1 navbar.inc.php,1.6.2.6,1.6.2.6.2.1 navbar.tpl,1.3.2.1,1.3.2.1.2.1

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de
In directory subversions:/tmp/cvs-serv10113/templates/linux-at-work.de

Modified Files:
      Tag: Version-0_9_16-branch
        head.inc.php navbar.inc.php navbar.tpl 
Log Message:
now admin can enable/disable the preferences as any other app, fix for bug#2967


Index: head.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/head.inc.php,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.1.2.1
diff -C2 -r1.3.2.1 -r1.3.2.1.2.1
*** head.inc.php        11 Mar 2003 00:08:24 -0000      1.3.2.1
--- head.inc.php        28 Mar 2003 15:08:22 -0000      1.3.2.1.2.1
***************
*** 61,65 ****
                'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'],
!               'app_name'      => 
lang($GLOBALS['phpgw_info']['flags']['currentapp']),
                'body_tags'     => $bodyheader,
                'bg_color'      => $GLOBALS['phpgw_info']['theme']['bg_color'],
--- 61,65 ----
                'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'],
!               'app_name'      => 
$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title'],
                'body_tags'     => $bodyheader,
                'bg_color'      => $GLOBALS['phpgw_info']['theme']['bg_color'],

Index: navbar.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/navbar.inc.php,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.6.2.1
diff -C2 -r1.6.2.6 -r1.6.2.6.2.1
*** navbar.inc.php      22 Mar 2003 12:07:51 -0000      1.6.2.6
--- navbar.inc.php      28 Mar 2003 15:08:22 -0000      1.6.2.6.2.1
***************
*** 22,25 ****
--- 22,26 ----
                        )
                );
+               $tpl->set_block('navbar','preferences','preferences_icon');
  
                //$tpl->set_block('navbar','B_powered_top','V_powered_top');
***************
*** 32,42 ****
                #  echo '<pre>'; print_r($GLOBALS['phpgw_info']['navbar']); 
echo '</pre>';
                $applications = '';
!               while ($app = each($GLOBALS['phpgw_info']['navbar']))
                {
!                       if ($app[1]['title'] != 'Home' && $app[1]['title'] != 
'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] != 
'Logout')
                        {
!                               $title = $app[1]['title'];
! 
!                               $applications .= '<tr><td 
class="main_menu_apps"><a class="main_menu" href="' . $app[1]['url'] . '"';
                                if 
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']))
                                {
--- 33,41 ----
                #  echo '<pre>'; print_r($GLOBALS['phpgw_info']['navbar']); 
echo '</pre>';
                $applications = '';
!               foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
                {
!                       if ($app != 'home' && $app != 'preferences' && ! 
ereg('about',$app) && $app != 'logout')
                        {
!                               $applications .= '<tr><td 
class="main_menu_apps"><a class="main_menu" href="' . $app_data['url'] . '"';
                                if 
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']))
                                {
***************
*** 44,50 ****
                                }
  
!                               $applications .= 
'>'.$title.'</a></td></tr>'."\r\n";
                        }
!                       $img_src_over = 
$GLOBALS['phpgw']->common->image($app[0],'navbar-over.gif');
                        if($img_src_over)
                        {
--- 43,49 ----
                                }
  
!                               $applications .= 
'>'.$app_data['title'].'</a></td></tr>'."\r\n";
                        }
!                       $img_src_over = 
$GLOBALS['phpgw']->common->image($app,'navbar-over.gif');
                        if($img_src_over)
                        {
***************
*** 82,87 ****
                if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
                {
!                       $var['current_users'] = '<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
!                               . '">&nbsp;' . lang('Current users') . ': ' . 
$GLOBALS['phpgw']->session->total() . '</a>';
                        $tpl->set_var($var);
                }
--- 81,86 ----
                if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
                {
!                       $var['current_users'] = '<a class="main_menu_bottom" 
href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
!                               . '">' . lang('Current users') . ': ' . 
$GLOBALS['phpgw']->session->total() . '</a>';
                        $tpl->set_var($var);
                }
***************
*** 121,124 ****
--- 120,132 ----
  */
                $tpl->set_var($var);
+               // check if user is allowed to change his prefs
+               if ($GLOBALS['phpgw_info']['user']['apps']['preferences'])
+               {
+                       $tpl->parse('preferences_icon','preferences');
+               }
+               else
+               {
+                       $tpl->set_var('preferences_icon','');
+               }
                $tpl->pfp('out','navbar');
                // If the application has a header include, we now include it

Index: navbar.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/navbar.tpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.1.2.1
diff -C2 -r1.3.2.1 -r1.3.2.1.2.1
*** navbar.tpl  11 Mar 2003 00:08:26 -0000      1.3.2.1
--- navbar.tpl  28 Mar 2003 15:08:22 -0000      1.3.2.1.2.1
***************
*** 6,9 ****
--- 6,10 ----
                        </td>
                </tr>
+ <!-- BEGIN preferences -->
                <tr >
                        <td class="main_menu">
***************
*** 11,14 ****
--- 12,16 ----
                        </td>
                </tr>
+ <!-- END preferences -->
                <tr >
                        <td class="main_menu">
***************
*** 31,38 ****
  </div>
  
! <div class="main_menu" style="width : 150px ; height : 50px ; left : 0px ; 
bottom : 0px ;">
        <table summary="" style="width : 100%; ">
                <tr>
                        <td class="main_menu_bottom">
                                {user_info_name}<br>
                                {user_info_date}<br>
--- 33,41 ----
  </div>
  
! <div class="main_menu" style="width : 150px ; height : 60px ; left : 0px ; 
bottom : 0px ;">
        <table summary="" style="width : 100%; ">
                <tr>
                        <td class="main_menu_bottom">
+                               {current_users}<br>
                                {user_info_name}<br>
                                {user_info_date}<br>