[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.uibilling.inc.php, 1.32, 1.33 clas
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.uibilling.inc.php, 1.32, 1.33 class.uideliveries.inc.php, 1.32, 1.33 class.uiprojecthours.inc.php, 1.33, 1.34 class.uiprojects.inc.php, 1.78, 1.79 class.uistatistics.inc.php, 1.22, 1.23 hook_sidebox_menu.inc.php, 1.2, 1.3 |
|
Date: |
Tue, 25 Nov 2003 15:34:38 +0000 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv7542/inc
Modified Files:
class.uibilling.inc.php class.uideliveries.inc.php
class.uiprojecthours.inc.php class.uiprojects.inc.php
class.uistatistics.inc.php hook_sidebox_menu.inc.php
Log Message:
fix
Index: hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hook_sidebox_menu.inc.php 25 Nov 2003 14:36:24 -0000 1.2
--- hook_sidebox_menu.inc.php 25 Nov 2003 15:34:36 -0000 1.3
***************
*** 29,47 ****
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');
}
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['Projects'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.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);
--- 29,47 ----
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');
}
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['Projects'] =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.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);
***************
*** 51,57 ****
$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);
--- 51,57 ----
$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);
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** class.uiprojects.inc.php 25 Nov 2003 14:36:24 -0000 1.78
--- class.uiprojects.inc.php 25 Nov 2003 15:34:35 -0000 1.79
***************
*** 63,67 ****
$action = get_var('action',array('GET'));
! $this->bo
= CreateObject('projects.boprojects',True, $action);
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->sbox
= CreateObject('phpgwapi.sbox');
--- 63,67 ----
$action = get_var('action',array('GET'));
! $this->boprojects =
CreateObject('projects.boprojects',True, $action);
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
[...1257 lines suppressed...]
*** 2245,2253 ****
if($s_id)
{
! $values = $this->bo->get_single_mstone($s_id);
$GLOBALS['phpgw']->template->set_var('old_edate',$values['edate']);
! //if
($this->bo->check_perms($this->grants[$values['coordinator']],PHPGW_ACL_DELETE)
|| $values['coordinator'] == $this->account)
//{
$GLOBALS['phpgw']->template->set_var('delete','<input type="submit"
name="delete" value="' . lang('Delete') .'">');
--- 2245,2253 ----
if($s_id)
{
! $values =
$this->boprojects->get_single_mstone($s_id);
$GLOBALS['phpgw']->template->set_var('old_edate',$values['edate']);
! //if
($this->boprojects->check_perms($this->grants[$values['coordinator']],PHPGW_ACL_DELETE)
|| $values['coordinator'] == $this->account)
//{
$GLOBALS['phpgw']->template->set_var('delete','<input type="submit"
name="delete" value="' . lang('Delete') .'">');
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** class.uistatistics.inc.php 21 Nov 2003 22:31:36 -0000 1.22
--- class.uistatistics.inc.php 25 Nov 2003 15:34:35 -0000 1.23
***************
*** 122,130 ****
{
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'));
--- 122,131 ----
{
if
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] !=
'idots')
+ 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->boprojects->isprojectadmin('pad'))
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
***************
*** 137,141 ****
}
! if ($this->bo->isprojectadmin('pbo'))
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
--- 138,142 ----
}
! if ($this->boprojects->isprojectadmin('pbo'))
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** class.uideliveries.inc.php 21 Nov 2003 22:31:31 -0000 1.32
--- class.uideliveries.inc.php 25 Nov 2003 15:34:34 -0000 1.33
***************
*** 117,120 ****
--- 117,121 ----
$GLOBALS['phpgw']->template->set_var('lang_work_date',lang('Work date'));
$GLOBALS['phpgw']->template->set_var('lang_submit',lang('Submit'));
+
$GLOBALS['phpgw']->template->set_var('lang_jobs',lang('Jobs'));
}
***************
*** 126,130 ****
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! if ($this->bo->isprojectadmin('pad'))
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
--- 127,131 ----
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! if ($this->boprojects->isprojectadmin('pad'))
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
***************
*** 137,141 ****
}
! if ($this->bo->isprojectadmin('pbo'))
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
--- 138,142 ----
}
! if ($this->boprojects->isprojectadmin('pbo'))
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** class.uibilling.inc.php 23 Oct 2003 12:15:43 -0000 1.32
--- class.uibilling.inc.php 25 Nov 2003 15:34:34 -0000 1.33
***************
*** 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',' | ');
!
$GLOBALS['phpgw']->template->set_var('space1',' ');
!
$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',' | ');
!
$GLOBALS['phpgw']->template->set_var('space2',' ');
!
$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,166 ----
function display_app_header()
{
! if
($GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] !=
'idots')
! 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->boprojects->isprojectadmin('pad'))
! {
!
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
!
$GLOBALS['phpgw']->template->set_var('break1',' | ');
!
$GLOBALS['phpgw']->template->set_var('space1',' ');
!
$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',' | ');
!
$GLOBALS['phpgw']->template->set_var('space2',' ');
!
$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.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** class.uiprojecthours.inc.php 21 Nov 2003 22:31:33 -0000 1.33
--- class.uiprojecthours.inc.php 25 Nov 2003 15:34:35 -0000 1.34
***************
*** 133,137 ****
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! if ($this->bo->isprojectadmin('pad'))
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
--- 133,137 ----
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! if ($this->boprojects->isprojectadmin('pad'))
{
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
***************
*** 144,148 ****
}
! if ($this->bo->isprojectadmin('pbo'))
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
--- 144,148 ----
}
! if ($this->boprojects->isprojectadmin('pbo'))
{
$GLOBALS['phpgw']->template->set_var('book_info',lang('Bookkeeper'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.uibilling.inc.php, 1.32, 1.33 class.uideliveries.inc.php, 1.32, 1.33 class.uiprojecthours.inc.php, 1.33, 1.34 class.uiprojects.inc.php, 1.78, 1.79 class.uistatistics.inc.php, 1.22, 1.23 hook_sidebox_menu.inc.php, 1.2, 1.3,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] projects/setup setup.inc.php,1.27,1.28
- Next by Date:
[Phpgroupware-cvs] projects/inc class.uibilling.inc.php, 1.18.2.6.2.10, 1.18.2.6.2.11 class.uideliveries.inc.php, 1.21.2.3.2.9, 1.21.2.3.2.10 class.uiprojecthours.inc.php, 1.22.2.5.2.12, 1.22.2.5.2.13 class.uiprojects.inc.php, 1.47.2.7.2.40, 1.47.2.7.2.41 class.uistatistics.inc.php, 1.10.2.2.2.8, 1.10.2.2.2.9 hook_sidebox_menu.inc.php, 1.1.2.1, 1.1.2.2
- Previous by thread:
[Phpgroupware-cvs] projects/setup setup.inc.php,1.27,1.28
- Next by thread:
[Phpgroupware-cvs] projects/inc class.uibilling.inc.php, 1.18.2.6.2.10, 1.18.2.6.2.11 class.uideliveries.inc.php, 1.21.2.3.2.9, 1.21.2.3.2.10 class.uiprojecthours.inc.php, 1.22.2.5.2.12, 1.22.2.5.2.13 class.uiprojects.inc.php, 1.47.2.7.2.40, 1.47.2.7.2.41 class.uistatistics.inc.php, 1.10.2.2.2.8, 1.10.2.2.2.9 hook_sidebox_menu.inc.php, 1.1.2.1, 1.1.2.2
- Index(es):