[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.soprojects.inc.php, 1.49, 1.50 cla
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.soprojects.inc.php, 1.49, 1.50 class.uiprojects.inc.php, 1.74, 1.75 |
|
Date: |
Fri, 21 Nov 2003 21:33:02 +0000 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv19647/inc
Modified Files:
class.soprojects.inc.php class.uiprojects.inc.php
Log Message:
update
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** class.uiprojects.inc.php 18 Nov 2003 16:11:44 -0000 1.74
--- class.uiprojects.inc.php 21 Nov 2003 21:32:28 -0000 1.75
***************
*** 56,60 ****
'list_budget' => True,
'view_pcosts' => True,
! 'edit_mstone' => True
);
--- 56,61 ----
'list_budget' => True,
'view_pcosts' => True,
! 'edit_mstone' => True,
! 'hook_sidebox_menu' => True
);
***************
*** 160,203 ****
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',' | ');
!
$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->bo->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();
}
--- 161,254 ----
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');
! $this->set_app_langs();
!
! if ($this->bo->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->bo->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();
+ }
+
+ function hook_sidebox_menu()
+ {
+ $appname = 'projects';
+ $menu_title =
$GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('menu');
+ $file = array();
if ($this->bo->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 ($this->bo->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);
! }
}
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** class.soprojects.inc.php 18 Nov 2003 16:11:44 -0000 1.49
--- class.soprojects.inc.php 21 Nov 2003 21:32:25 -0000 1.50
***************
*** 191,195 ****
if ($query)
{
! $querymethod = " AND (title like '%$query%' OR
num like '%$query%' OR descr like '%$query%') ";
}
--- 191,195 ----
if ($query)
{
! $querymethod = " AND (title like '%$query%' OR
p_number like '%$query%' OR descr like '%$query%') ";
}
***************
*** 1031,1035 ****
else
{
! $ordermethod = " order by num asc";
}
--- 1031,1035 ----
else
{
! $ordermethod = " order by a_number asc";
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.soprojects.inc.php, 1.49, 1.50 class.uiprojects.inc.php, 1.74, 1.75,
Bettina Gille <address@hidden> <=