[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety head.inc.php,1.11.2.2.2.1,1.11.2.2.2.2 navbar.inc.php,1.30.2.7,1.30.2.7.2.1 navbar.tpl,1.18,1.18.4.1

[Ralf Becker <address@hidden>]

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

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/idsociety/Attic/head.inc.php,v
retrieving revision 1.11.2.2.2.1
retrieving revision 1.11.2.2.2.2
diff -C2 -r1.11.2.2.2.1 -r1.11.2.2.2.2
*** head.inc.php        28 Mar 2003 06:08:33 -0000      1.11.2.2.2.1
--- head.inc.php        28 Mar 2003 15:08:22 -0000      1.11.2.2.2.2
***************
*** 40,44 ****
  
  
!       $app = (isset($GLOBALS['phpgw_info']['flags']['currentapp']) ? ' [' . 
lang($GLOBALS['phpgw_info']['flags']['currentapp']) .']' : '');
  
        $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
--- 40,44 ----
  
  
!       $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/idsociety/Attic/navbar.inc.php,v
retrieving revision 1.30.2.7
retrieving revision 1.30.2.7.2.1
diff -C2 -r1.30.2.7 -r1.30.2.7.2.1
*** navbar.inc.php      22 Mar 2003 12:07:51 -0000      1.30.2.7
--- navbar.inc.php      28 Mar 2003 15:08:22 -0000      1.30.2.7.2.1
***************
*** 22,25 ****
--- 22,26 ----
                        )
                );
+               $tpl->set_block('navbar','preferences','preferences_icon');
  
                //$tpl->set_block('navbar','B_powered_top','V_powered_top');
***************
*** 53,66 ****
                #  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 = '<img src="' . $app[1]['icon'] . '" 
alt="' . $app[1]['title'] . '" title="'
!                                       . $app[1]['title'] . '" border="0" 
name="' . str_replace('-','_',$app[0]) . '">';
!                               $img_src_over = $app[1]['icon_hover'];
!                               $img_src_out = $app[1]['icon'];
  
!                               $applications .= '<tr><td><a href="' . 
$app[1]['url'] . '"';
                                if 
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']))
                                {
--- 54,67 ----
                #  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')
                        {
!                               $title = '<img src="' . $app_data['icon'] . '" 
alt="' . $app_data['title'] . '" title="'
!                                       . $app_data['title'] . '" border="0" 
name="' . str_replace('-','_',$app) . '">';
!                               $img_src_over = $app_data['icon_hover'];
!                               $img_src_out = $app_data['icon'];
  
!                               $applications .= '<tr><td><a href="' . 
$app_data['url'] . '"';
                                if 
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']))
                                {
***************
*** 70,78 ****
                                if($img_src_over != '')
                                {
!                                       $applications .= ' onMouseOver="' . 
str_replace('-','_',$app[0]) . ".src='" . $img_src_over . '\'"';
                                }
                                if($img_src_out != '')
                                {
!                                       $applications .= ' onMouseOut="' . 
str_replace('-','_',$app[0]) . ".src='" . $img_src_out . '\'"';
                                }
                                $applications .= 
'>'.$title.'</a></td></tr>'."\r\n";
--- 71,79 ----
                                if($img_src_over != '')
                                {
!                                       $applications .= ' onMouseOver="' . 
str_replace('-','_',$app) . ".src='" . $img_src_over . '\'"';
                                }
                                if($img_src_out != '')
                                {
!                                       $applications .= ' onMouseOut="' . 
str_replace('-','_',$app) . ".src='" . $img_src_out . '\'"';
                                }
                                $applications .= 
'>'.$title.'</a></td></tr>'."\r\n";
***************
*** 80,84 ****
                        else
                        {
!                               $img_src_over = 
$GLOBALS['phpgw']->common->image_on($app[0],Array('navbar','nonav'),'-over');
                        }
                        if($img_src_over != '')
--- 81,85 ----
                        else
                        {
!                               $img_src_over = 
$GLOBALS['phpgw']->common->image_on($app,Array('navbar','nonav'),'-over');
                        }
                        if($img_src_over != '')
***************
*** 200,203 ****
--- 201,213 ----
  */
                $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/idsociety/Attic/navbar.tpl,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -C2 -r1.18 -r1.18.4.1
*** navbar.tpl  4 Jan 2002 22:06:12 -0000       1.18
--- navbar.tpl  28 Mar 2003 15:08:22 -0000      1.18.4.1
***************
*** 49,53 ****
--- 49,55 ----
                                <tr>
                                        <td><a href="{home_link}" 
onMouseOver="nine.src='{welcome_img_hover}'" 
onMouseOut="nine.src='{welcome_img}'"><img src="{welcome_img}" border="0" 
name="nine"></a></td>
+ <!-- BEGIN preferences -->
                                        <td><a href="{preferences_link}" 
onMouseOver="ten.src='{preferences_img_hover}'" 
onMouseOut="ten.src='{preferences_img}'"><img src="{preferences_img}" 
border="0" name="ten"></a></td>
+ <!-- END preferences -->
                                        <td><a href="{logout_link}" 
onMouseOver="eleven.src='{logout_img_hover}'" 
onMouseOut="eleven.src='{logout_img}'"><img src="{logout_img}" border="0" 
name="eleven"></a></td>
                                        <td><a href="{help_link}" 
onMouseOver="help.src='{about_img_hover}'" 
onMouseOut="help.src='{about_img}'"><img src="{about_img}" border="0" 
name="help"></a></td>
***************
*** 72,74 ****
                        <!-- this TD background image moved to body element -->
                        <br>
- <!-- END navbar -->
--- 74,75 ----