phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] projects/inc hook_sidebox_menu.inc.php, NONE, 1.1.2.1


From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] projects/inc hook_sidebox_menu.inc.php, NONE, 1.1.2.1 class.uibilling.inc.php, 1.18.2.6.2.9, 1.18.2.6.2.10 class.uideliveries.inc.php, 1.21.2.3.2.8, 1.21.2.3.2.9 class.uiprojecthours.inc.php, 1.22.2.5.2.11, 1.22.2.5.2.12 class.uiprojects.inc.php, 1.47.2.7.2.39, 1.47.2.7.2.40 class.uistatistics.inc.php, 1.10.2.2.2.7, 1.10.2.2.2.8
Date: Fri, 21 Nov 2003 22:41:31 +0000

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv25374

Modified Files:
      Tag: Version-0_9_16-branch
        class.uibilling.inc.php class.uideliveries.inc.php 
        class.uiprojecthours.inc.php class.uiprojects.inc.php 
        class.uistatistics.inc.php 
Added Files:
      Tag: Version-0_9_16-branch
        hook_sidebox_menu.inc.php 
Log Message:
update

--- NEW FILE: hook_sidebox_menu.inc.php ---
<?php
        
/**************************************************************************\
        * phpGroupWare - projects's Sidebox-Menu for idots-template             
   *
        * http://www.phpgroupware.org                                           
   *
        * Written by Pim Snel <address@hidden>                                  
 *
        * --------------------------------------------                          
   *
        *  This program is free software; you can redistribute it and/or modify 
it *
        *  under the terms of the GNU General Public License as published by 
the   *
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
        /* $Id: hook_sidebox_menu.inc.php,v 1.1.2.1 2003/11/21 22:40:38 ceb Exp 
$ */
        {

 /*
        This hookfile is for generating an app-specific side menu used in the 
idots 
        template set.

        $menu_title speaks for itself
        $file is the array with link to app functions

        display_sidebox can be called as much as you like
 */

                        $boprojects = CreateObject('projects.boprojects');
                        $appname = 'projects';
                        $menu_title = 
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
                        $file = array();
                        if ($boprojects->isprojectadmin('pad'))
                        {
                                $file['Activities'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act');
                                $file['Budget']     = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains');
                        }
                        $file['Projects']       = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains');

                        if ($boprojects->isprojectadmin('pbo'))
                        {
                                $file['Billing']    = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains');
                                $file['Deliveries'] = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains');
                        }
                        $file['Jobs']           = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs');
                        $file['Work hours']          = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours');

                        $file['Statistics']     = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains');
                        $file['Archive']        = 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains');

                        display_sidebox($appname,$menu_title,$file);

                        if 
($GLOBALS['phpgw_info']['user']['apps']['preferences'])
                        {
                                $menu_title = 
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Preferences');
                                $file = Array(
                                        'Preferences'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.preferences'),
                                        'Grant Access'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='.$appname),
                                        'Edit categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uicategories.index&cats_app=projects&cats_level=True&global_cats=True')
                                );
                                display_sidebox($appname,$menu_title,$file);
                        }

                        if ($GLOBALS['phpgw_info']['user']['apps']['admin'])
                        {
                                $menu_title = 
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Administration');
                                $file = Array(
                                        'Administration'        => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pad'),
                                        'Accountancy'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins&action=pbo'),
                                        'Global Categories'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
 . $appname)
                                );
                                display_sidebox($appname,$menu_title,$file);
                        }
                        unset($boprojects);
        }
?>

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.39
retrieving revision 1.47.2.7.2.40
diff -C2 -d -r1.47.2.7.2.39 -r1.47.2.7.2.40
*** class.uiprojects.inc.php    23 Oct 2003 11:16:34 -0000      1.47.2.7.2.39
--- class.uiprojects.inc.php    21 Nov 2003 22:38:45 -0000      1.47.2.7.2.40
***************
*** 161,202 ****
                function display_app_header()
                {
!                       $GLOBALS['phpgw']->template->set_file(array('header' => 
'header.tpl'));
!                       
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! 
!                       $this->set_app_langs();
! 
!                       if ($this->bo->isprojectadmin('pad'))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                               
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                               
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));     
                                                                                
                                          
!                               
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                       }
  
!                       if ($this->bo->isprojectadmin('pbo'))
!                       {
!                               
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                               
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                               
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                       }
  
!                       
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                       
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                       
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
!                       
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                       
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
!                       
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
  
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
--- 161,203 ----
                function display_app_header()
                {
!                       if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] != 
'idots')
                        {
!                               
$GLOBALS['phpgw']->template->set_file(array('header' => 'header.tpl'));
!                               
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->bo->isprojectadmin('pad'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                                       
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                                       
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));     
                                                                                
                                          
!                                       
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                               }
  
!                               if ($this->bo->isprojectadmin('pbo'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                                       
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                                       
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                               }
  
!                               
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                               
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                               
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
!                               
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                               
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
+                               
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
+                       }
+                       $this->set_app_langs();
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();

Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.10.2.2.2.7
retrieving revision 1.10.2.2.2.8
diff -C2 -d -r1.10.2.2.2.7 -r1.10.2.2.2.8
*** class.uistatistics.inc.php  20 Jun 2003 22:04:33 -0000      1.10.2.2.2.7
--- class.uistatistics.inc.php  21 Nov 2003 22:40:13 -0000      1.10.2.2.2.8
***************
*** 118,159 ****
                function display_app_header()
                {
!                       $GLOBALS['phpgw']->template->set_file(array('header' => 
'header.tpl'));
!                       
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! 
!                       $this->set_app_langs();
! 
!                       if ($this->boprojects->isprojectadmin('pad'))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                               
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                               
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));     
                                                                                
                                          
!                               
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                       }
  
!                       if ($this->boprojects->isprojectadmin('pbo'))
!                       {
!                               
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                               
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                               
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                       }
  
!                       
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                       
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                       
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang("Statistics"));
!                       
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                       
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
!                       
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
  
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
--- 118,160 ----
                function display_app_header()
                {
!                       if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] != 
'idots')
                        {
!                               
$GLOBALS['phpgw']->template->set_file(array('header' => 'header.tpl'));
!                               
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->bo->isprojectadmin('pad'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                                       
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                                       
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));     
                                                                                
                                          
!                                       
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                               }
  
!                               if ($this->bo->isprojectadmin('pbo'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                                       
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                                       
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                               }
  
!                               
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                               
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                               
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
!                               
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                               
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
+                               
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
+                       }
+                       $this->set_app_langs();
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();

Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3.2.8
retrieving revision 1.21.2.3.2.9
diff -C2 -d -r1.21.2.3.2.8 -r1.21.2.3.2.9
*** class.uideliveries.inc.php  1 Oct 2003 20:28:58 -0000       1.21.2.3.2.8
--- class.uideliveries.inc.php  21 Nov 2003 22:38:32 -0000      1.21.2.3.2.9
***************
*** 121,163 ****
                function display_app_header()
                {
!                       $GLOBALS['phpgw']->template->set_file(array('header' => 
'header.tpl'));
!                       
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! 
!                       $this->set_app_langs();
! 
!                       if ($this->boprojects->isprojectadmin('pad'))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                               
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                               
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));     
                                                                                
                                          
!                               
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                       }
  
!                       if ($this->boprojects->isprojectadmin('pbo'))
!                       {
!                               
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                               
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                               
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                       }
  
!                       
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_jobs',lang('Jobs'));
!                       
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                       
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang("Statistics"));
!                       
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                       
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
!                       
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
  
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
--- 121,163 ----
                function display_app_header()
                {
!                       if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] != 
'idots')
                        {
!                               
$GLOBALS['phpgw']->template->set_file(array('header' => 'header.tpl'));
!                               
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->bo->isprojectadmin('pad'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                                       
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                                       
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));     
                                                                                
                                          
!                                       
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                               }
  
!                               if ($this->bo->isprojectadmin('pbo'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                                       
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                                       
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                               }
  
!                               
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                               
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                               
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
!                               
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                               
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
+                               
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
+                       }
+                       $this->set_app_langs();
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();

Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.6.2.9
retrieving revision 1.18.2.6.2.10
diff -C2 -d -r1.18.2.6.2.9 -r1.18.2.6.2.10
*** class.uibilling.inc.php     23 Oct 2003 11:16:34 -0000      1.18.2.6.2.9
--- class.uibilling.inc.php     21 Nov 2003 22:38:13 -0000      1.18.2.6.2.10
***************
*** 123,164 ****
                function display_app_header()
                {
!                       $GLOBALS['phpgw']->template->set_file(array('header' => 
'header.tpl'));
!                       
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! 
!                       $this->set_app_langs();
! 
!                       if ($this->boprojects->isprojectadmin('pad'))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                               
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                               
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));     
                                                                                
                                          
!                               
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                       }
  
!                       if ($this->boprojects->isprojectadmin('pbo'))
!                       {
!                               
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                               
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                               
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                       }
  
!                       
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                       
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                       
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang("Statistics"));
!                       
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                       
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
!                       
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
  
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
--- 123,165 ----
                function display_app_header()
                {
!                       if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] != 
'idots')
                        {
!                               
$GLOBALS['phpgw']->template->set_file(array('header' => 'header.tpl'));
!                               
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->bo->isprojectadmin('pad'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                                       
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                                       
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));     
                                                                                
                                          
!                                       
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                               }
  
!                               if ($this->bo->isprojectadmin('pbo'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                                       
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                                       
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                               }
  
!                               
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                               
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                               
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
!                               
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                               
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
+                               
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
+                       }
+                       $this->set_app_langs();
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();

Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.11
retrieving revision 1.22.2.5.2.12
diff -C2 -d -r1.22.2.5.2.11 -r1.22.2.5.2.12
*** class.uiprojecthours.inc.php        26 Aug 2003 01:52:50 -0000      
1.22.2.5.2.11
--- class.uiprojecthours.inc.php        21 Nov 2003 22:38:42 -0000      
1.22.2.5.2.12
***************
*** 128,169 ****
                function display_app_header()
                {
!                       $GLOBALS['phpgw']->template->set_file(array('header' => 
'header.tpl'));
!                       
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! 
!                       $this->set_app_langs();
! 
!                       if ($this->boprojects->isprojectadmin('pad'))
                        {
!                               
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                               
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                               
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));
!                               
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                       }
  
!                       if ($this->boprojects->isprojectadmin('pbo'))
!                       {
!                               
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                               
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                               
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                               
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                       }
  
!                       
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                       
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                       
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
!                       
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                       
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                       
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
!                       
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
  
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
--- 128,170 ----
                function display_app_header()
                {
!                       if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] != 
'idots')
                        {
!                               
$GLOBALS['phpgw']->template->set_file(array('header' => 'header.tpl'));
!                               
$GLOBALS['phpgw']->template->set_block('header','projects_header');
  
!                               if ($this->bo->isprojectadmin('pad'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!                                       
$GLOBALS['phpgw']->template->set_var('break1','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space1','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_activities',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_activities&action=act'));
                                                                                
                         
!                                       
$GLOBALS['phpgw']->template->set_var('lang_activities',lang('Activities'));     
                                                                                
                                          
!                                       
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_budget',lang('budget'));
!                               }
  
!                               if ($this->bo->isprojectadmin('pbo'))
!                               {
!                                       
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
!                                       
$GLOBALS['phpgw']->template->set_var('break2','&nbsp;|&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('space2','&nbsp;&nbsp;&nbsp;');
!                                       
$GLOBALS['phpgw']->template->set_var('link_billing',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_billing',lang('Billing'));
!                                       
$GLOBALS['phpgw']->template->set_var('link_delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_projects&action=mains'));
!                                       
$GLOBALS['phpgw']->template->set_var('lang_delivery',lang('Deliveries'));
!                               }
  
!                               
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
!                               
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_hours'));
!                               
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_statistics',lang('Statistics'));
!                               
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_projects',lang('Projects'));
!                               
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
!                               
$GLOBALS['phpgw']->template->set_var('lang_archiv',lang('archive'));
  
+                               
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
+                       }
+                       $this->set_app_langs();
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();





reply via email to

[Prev in Thread] Current Thread [Next in Thread]