[Phpgroupware-cvs] CVS: phpgwapi/templates/default head.inc.php,1.11.2.1.2.1,1.11.2.1.2.2navbar.inc.php,1.28.2.3,1.28.2.3.2.1

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        head.inc.php navbar.inc.php 
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/default/Attic/head.inc.php,v
retrieving revision 1.11.2.1.2.1
retrieving revision 1.11.2.1.2.2
diff -C2 -r1.11.2.1.2.1 -r1.11.2.1.2.2
*** head.inc.php        28 Mar 2003 06:08:33 -0000      1.11.2.1.2.1
--- head.inc.php        28 Mar 2003 15:08:22 -0000      1.11.2.1.2.2
***************
*** 32,36 ****
        $tpl->set_file(array('head' => 'head.tpl'));
  
!       $app = (isset($GLOBALS['phpgw_info']['flags']['currentapp']) ? ' [' . 
lang($GLOBALS['phpgw_info']['flags']['currentapp']) .']' : '');
  
        $var = Array (
--- 32,36 ----
        $tpl->set_file(array('head' => 'head.tpl'));
  
!       $app = (isset($GLOBALS['phpgw_info']['flags']['currentapp']) ? ' [' . 
$GLOBALS['phpgw_info']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']]['title']
 .']' : '');
  
        $var = Array (

Index: navbar.inc.php
===================================================================
RCS file: 
/cvsroot/phpgroupware/phpgwapi/templates/default/Attic/navbar.inc.php,v
retrieving revision 1.28.2.3
retrieving revision 1.28.2.3.2.1
diff -C2 -r1.28.2.3 -r1.28.2.3.2.1
*** navbar.inc.php      22 Mar 2003 12:07:51 -0000      1.28.2.3
--- navbar.inc.php      28 Mar 2003 15:08:22 -0000      1.28.2.3.2.1
***************
*** 32,42 ****
  
                $i = 1;
!               while ($app = each($GLOBALS['phpgw_info']['navbar']))
                {
                        if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 
'text')
                        {
!                               $tabs[$i]['label'] = $app[1]['title'];
!                               $tabs[$i]['link']  = $app[1]['url'];
!                               if 
(ereg($GLOBALS['phpgw_info']['navbar'][$app[0]],$PHP_SELF))
                                {
                                        $selected = $i;
--- 32,42 ----
  
                $i = 1;
!               foreach($GLOBALS['phpgw_info']['navbar'] as $app => $app_data)
                {
                        if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 
'text')
                        {
!                               $tabs[$i]['label'] = $app_data['title'];
!                               $tabs[$i]['link']  = $app_data['url'];
!                               if 
(ereg($GLOBALS['phpgw_info']['navbar'][$app],$PHP_SELF))
                                {
                                        $selected = $i;
***************
*** 46,54 ****
                        else
                        {
!                               $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'];
                                        $var['width'] = '7%';
                                }
--- 46,54 ----
                        else
                        {
!                               $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'];
                                        $var['width'] = '7%';
                                }
***************
*** 58,62 ****
                                }
     
!                               $var['value'] = '<a href="' . $app[1]['url'] . 
'"' . $target . '>' . $title . '</a>';
                                $var['align'] = 'center';
                                $tpl->set_var($var);
--- 58,62 ----
                                }
     
!                               $var['value'] = '<a href="' . $app_data['url'] 
. '"' . $target . '>' . $title . '</a>';
                                $var['align'] = 'center';
                                $tpl->set_var($var);