[Phpgroupware-cvs] CVS: phpgwapi/templates/justweb head.inc.php,1.13.2.2.2.1,1.13.2.2.2.2 navbar.inc.php,1.20.2.3,1.20.2.3.2.1 navbar.tpl,1.4,1.4.4.1

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/templates/justweb
In directory subversions:/tmp/cvs-serv10113/templates/justweb

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/justweb/Attic/head.inc.php,v
retrieving revision 1.13.2.2.2.1
retrieving revision 1.13.2.2.2.2
diff -C2 -r1.13.2.2.2.1 -r1.13.2.2.2.2
*** head.inc.php        28 Mar 2003 06:08:33 -0000      1.13.2.2.2.1
--- head.inc.php        28 Mar 2003 15:08:22 -0000      1.13.2.2.2.2
***************
*** 28,32 ****
        }
  
!       $app = (isset($GLOBALS['phpgw_info']['flags']['currentapp']) ? ' [' . 
lang($GLOBALS['phpgw_info']['flags']['currentapp']) .']' : '');
  
        $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
--- 28,32 ----
        }
  
!       $app = (isset($GLOBALS['phpgw_info']['flags']['currentapp']) ? ' [' . 
$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title']
 .']' : '');
  
        $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);

Index: navbar.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/templates/justweb/Attic/navbar.inc.php,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.3.2.1
diff -C2 -r1.20.2.3 -r1.20.2.3.2.1
*** navbar.inc.php      22 Mar 2003 12:07:51 -0000      1.20.2.3
--- navbar.inc.php      28 Mar 2003 15:08:22 -0000      1.20.2.3.2.1
***************
*** 21,25 ****
                        )
                );
! 
                $var['img_root'] = 
$GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/phpgwapi/templates/justweb/images';
                $var['table_bg_color'] = 
$GLOBALS['phpgw_info']['theme']['navbar_bg'];
--- 21,26 ----
                        )
                );
!               $tpl->set_block('navbar','preferences','preferences_icon');
!               
                $var['img_root'] = 
$GLOBALS['phpgw_info']['server']['webserver_url'] . 
'/phpgwapi/templates/justweb/images';
                $var['table_bg_color'] = 
$GLOBALS['phpgw_info']['theme']['navbar_bg'];
***************
*** 30,44 ****
                }
  
!               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 = '<img src="' . $app[1]['icon'] . '" 
alt="' . $app[1]['title'] . '" title="'
!                                       . $app[1]['title'] . '" border="0">';
                                if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 
'icons_and_text')
                                {
!                                       $title .= '<br>' . $app[1]['title'];
                                }
!                               $applications .= '<br><a href="' . 
$app[1]['url'] . '"' . $target . '>' . $title . '</a>';
                        }
                }
--- 31,45 ----
                }
  
!               foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
                {
!                       if ($app != 'home' && $app != 'preferences' && 
!ereg('about',$app) && $app != 'logout')
                        {
!                               $title = '<img src="' . $app_data['icon'] . '" 
alt="' . $app_data['title'] . '" title="'
!                                       . $app_data['title'] . '" border="0">';
                                if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 
'icons_and_text')
                                {
!                                       $title .= '<br>' . $app_data['title'];
                                }
!                               $applications .= '<br><a href="' . 
$app_data['url'] . '"' . $target . '>' . $title . '</a>';
                        }
                }
***************
*** 138,141 ****
--- 139,151 ----
  
                $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/justweb/Attic/navbar.tpl,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** navbar.tpl  4 Jan 2002 17:31:57 -0000       1.4
--- navbar.tpl  28 Mar 2003 15:08:22 -0000      1.4.4.1
***************
*** 7,11 ****
--- 7,13 ----
                                        <td width="100%" valign="bottom" 
background="{img_root}/menu_filler.gif">&nbsp;</td>
                                        <td valign="bottom" width="56" 
background="{img_root}/blue_filler.gif"><a href="{home_link}"><img 
src="{img_root}/tab_home.gif" width="56" height="23" border="0"></a></td>
+ <!-- BEGIN preferences -->
                                        <td valign="bottom" width="85" 
background="{img_root}/blue_filler.gif"><a href="{preferences_link}"><img 
src="{img_root}/tab_prefs.gif" width="85" height="23" border="0"></a></td>
+ <!-- END preferences -->
                                        <td valign="bottom" width="56" 
background="{img_root}/blue_filler.gif"><a href="{logout_link}"><img 
src="{img_root}/tab_logout.gif" width="56" height="23" border="0"></a></td>
                                        <td valign="bottom" width="39" 
background="{img_root}/blue_filler.gif"><a href="{help_link}"><img 
src="{img_root}/tab_help.gif" width="39" height="23" border="0"></a></td>