[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.65, 1.66 cla
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.65, 1.66 class.soprojects.inc.php, 1.53, 1.54 class.uiprojecthours.inc.php, 1.34, 1.35 class.uiprojects.inc.php, 1.81, 1.82 class.uistatistics.inc.php, 1.24, 1.25 hook_admin.inc.php, 1.15, 1.16 |
|
Date: |
Wed, 03 Dec 2003 15:03:24 +0000 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv29022/inc
Modified Files:
class.boprojects.inc.php class.soprojects.inc.php
class.uiprojecthours.inc.php class.uiprojects.inc.php
class.uistatistics.inc.php hook_admin.inc.php
Log Message:
update
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/hook_admin.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** hook_admin.inc.php 1 Dec 2003 16:27:04 -0000 1.15
--- hook_admin.inc.php 3 Dec 2003 15:03:21 -0000 1.16
***************
*** 15,18 ****
--- 15,19 ----
$file = Array
(
+ 'Site Configuration' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
. $appname),
'project administrators' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_admins'),
'Global Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname='
. $appname)
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** class.uiprojects.inc.php 3 Dec 2003 13:20:20 -0000 1.81
--- class.uiprojects.inc.php 3 Dec 2003 15:03:21 -0000 1.82
***************
*** 167,171 ****
if ($this->boprojects->isprojectadmin())
{
-
$GLOBALS['phpgw']->template->set_var('admin_info',lang('Administrator'));
$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'));
--- 167,170 ----
***************
*** 190,194 ****
}
-
function status_format($status = '', $showarchive = False)
{
--- 189,192 ----
***************
*** 225,229 ****
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_main?lang('list jobs'):lang('list projects'));
$this->display_app_header();
--- 223,228 ----
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_main?lang('list jobs'):lang('list projects'))
!
.
($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):'');
$this->display_app_header();
***************
*** 432,436 ****
if ($menuaction)
{
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_main?lang('list jobs'):lang('list projects'));
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 431,436 ----
if ($menuaction)
{
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_main?lang('list jobs'):lang('list projects'))
!
.
($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):'');
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 718,726 ****
if ($action == 'mains' || $action == 'amains')
{
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($project_id?lang('edit project'):lang('add
project'));
}
else
{
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($project_id?lang('edit job'):lang('add job'));
}
--- 718,728 ----
if ($action == 'mains' || $action == 'amains')
{
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($project_id?lang('edit project'):lang('add project'))
!
.
($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):'');
}
else
{
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($project_id?lang('edit job'):lang('add job'))
!
.
($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):'');
}
***************
*** 998,1002 ****
$public_view = $_GET['public_view'];
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_main?lang('view job'):lang('view project'));
if (isset($public_view))
--- 1000,1005 ----
$public_view = $_GET['public_view'];
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_main?lang('view job'):lang('view project'))
!
.
($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):'');
if (isset($public_view))
***************
*** 1169,1178 ****
case 'mains' : $menu =
'projects.uiprojects.list_projects';
$deleteheader = lang('are you sure you want to delete this project');
break;
case 'subs' : $menu =
'projects.uiprojects.list_projects';
!
$deleteheader = lang('are you sure you want to delete this project');
break;
case 'act' : $menu =
'projects.uiprojects.list_activities';
$deleteheader = lang('are you sure you want to delete this activity');
break;
}
--- 1172,1184 ----
case 'mains' : $menu =
'projects.uiprojects.list_projects';
$deleteheader = lang('are you sure you want to delete this project');
+ $header
= lang('delete project');
break;
case 'subs' : $menu =
'projects.uiprojects.list_projects';
!
$deleteheader = lang('are you sure you want to delete this task');
! $header
= lang('delete task');
break;
case 'act' : $menu =
'projects.uiprojects.list_activities';
$deleteheader = lang('are you sure you want to delete this activity');
+ $header
= lang('delete activity');
break;
}
***************
*** 1206,1209 ****
--- 1212,1218 ----
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . $header
+
.
($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):'');
+
$this->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('pa_delete'
=> 'delete.tpl'));
***************
*** 1237,1241 ****
$action = 'act';
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('list activities');
$this->display_app_header();
--- 1246,1251 ----
$action = 'act';
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('list activities')
!
.
($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):'');
$this->display_app_header();
***************
*** 1386,1390 ****
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($activity_id?lang('edit activity'):lang('add
activity'));
$this->display_app_header();
--- 1396,1401 ----
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($activity_id?lang('edit activity'):lang('add
activity'))
!
.
($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):'');
$this->display_app_header();
***************
*** 1719,1723 ****
);
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('preferences');
$GLOBALS['phpgw']->common->phpgw_header();
--- 1730,1735 ----
);
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('preferences')
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$GLOBALS['phpgw']->common->phpgw_header();
***************
*** 1725,1730 ****
$GLOBALS['phpgw']->template->set_file(array('prefs' =>
'preferences.tpl'));
-
$GLOBALS['phpgw']->template->set_block('prefs','book','bookhandle');
-
$GLOBALS['phpgw']->template->set_block('prefs','all','allhandle');
$this->set_app_langs();
--- 1737,1740 ----
***************
*** 1742,1746 ****
$GLOBALS['phpgw']->template->set_var('notify_assign_selected',($prefs['notify_assign']
== 'yes'? ' checked':''));
! if ($this->boprojects->isprojectadmin('pad'))
{
if ($obill)
--- 1752,1756 ----
$GLOBALS['phpgw']->template->set_var('notify_assign_selected',($prefs['notify_assign']
== 'yes'? ' checked':''));
! /*if ($this->boprojects->isprojectadmin())
{
if ($obill)
***************
*** 1766,1778 ****
$GLOBALS['phpgw']->template->pfp('bookhandle','book');
$GLOBALS['phpgw']->template->pfp('allhandle','all');
! }
! else
! {
!
$GLOBALS['phpgw']->template->set_var('bookhandle','');
!
$GLOBALS['phpgw']->template->set_var('allhandle','');
!
! $GLOBALS['phpgw']->template->pfp('out','prefs');
!
$GLOBALS['phpgw']->template->pfp('allhandle','all');
! }
}
--- 1776,1781 ----
$GLOBALS['phpgw']->template->pfp('bookhandle','book');
$GLOBALS['phpgw']->template->pfp('allhandle','all');
! }*/
! $GLOBALS['phpgw']->template->pfp('out','prefs');
}
***************
*** 1782,1786 ****
$pro_main =
get_var('pro_main',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'amains')?lang('project
archive'):lang('job archive'));
$this->display_app_header();
--- 1785,1790 ----
$pro_main =
get_var('pro_main',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'amains')?lang('project
archive'):lang('job archive'))
!
.
($this->boprojects->isprojectadmin()?' - ' . lang('administrator'):'');
$this->display_app_header();
***************
*** 1948,1952 ****
$pro_main =
get_var('pro_main',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list budget'):lang('list budget'));
$this->display_app_header();
--- 1952,1957 ----
$pro_main =
get_var('pro_main',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list budget'):lang('list budget'))
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
***************
*** 2071,2075 ****
$project_id = get_var('project_id',array('GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('list pcosts');
$this->display_app_header();
--- 2076,2081 ----
$project_id = get_var('project_id',array('GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('list pcosts')
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
***************
*** 2141,2145 ****
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (isset($s_id)?lang('edit milestone'):lang('add
milestone'));
$this->display_app_header();
--- 2147,2152 ----
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (isset($s_id)?lang('edit milestone'):lang('add
milestone'))
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** class.boprojects.inc.php 1 Dec 2003 16:27:01 -0000 1.65
--- class.boprojects.inc.php 3 Dec 2003 15:03:20 -0000 1.66
***************
*** 255,259 ****
if
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
{
! $prefs['bill'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'];
$prefs['notify_mstone'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
$prefs['notify_pro'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_pro'];
--- 255,259 ----
if
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
{
! //$prefs['bill'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'];
$prefs['notify_mstone'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
$prefs['notify_pro'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_pro'];
***************
*** 269,273 ****
if (is_array($prefs))
{
!
$GLOBALS['phpgw']->preferences->change('projects','bill',$prefs['bill']);
$GLOBALS['phpgw']->preferences->change('projects','notify_mstone',(isset($prefs['notify_mstone'])?'yes':''));
$GLOBALS['phpgw']->preferences->change('projects','notify_pro',(isset($prefs['notify_pro'])?'yes':''));
--- 269,273 ----
if (is_array($prefs))
{
!
//$GLOBALS['phpgw']->preferences->change('projects','bill',$prefs['bill']);
$GLOBALS['phpgw']->preferences->change('projects','notify_mstone',(isset($prefs['notify_mstone'])?'yes':''));
$GLOBALS['phpgw']->preferences->change('projects','notify_pro',(isset($prefs['notify_pro'])?'yes':''));
***************
*** 275,279 ****
$GLOBALS['phpgw']->preferences->save_repository(True);
! // _debug_array($prefs);
// exit;
}
--- 275,281 ----
$GLOBALS['phpgw']->preferences->save_repository(True);
! }
!
! /* _debug_array($prefs);
// exit;
}
***************
*** 286,290 ****
{
return False;
! }
}
--- 288,292 ----
{
return False;
! } */
}
***************
*** 298,308 ****
}
! if ($this->isprojectadmin('pad'))
{
! if (! isset($prefs['bill']))
! {
! $error[] = lang('if you are an
administrator, please set the preferences for this application');
! $error[] = lang('if you are not an
administrator, please inform the administrator to set the preferences for this
application');
! }
}
return $error;
--- 300,309 ----
}
! $config = $this->so->get_site_config();
!
! if (! isset($config['bill']))
{
! $error[] = lang('if you are an administrator,
please edit the site configuration for projects in the admin section');
! $error[] = lang('if you are not an
administrator, please inform the administrator to edit the site configuration
for projects in the admin section');
}
return $error;
***************
*** 320,327 ****
if
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
{
! if ($this->isprojectadmin('pad'))
{
$prefs['bill'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'];
! }
$prefs['notify_mstone'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
$prefs['notify_pro'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_pro'];
--- 321,328 ----
if
($GLOBALS['phpgw_info']['user']['preferences']['projects'])
{
! /*if ($this->isprojectadmin())
{
$prefs['bill'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'];
! }*/
$prefs['notify_mstone'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_mstone'];
$prefs['notify_pro'] =
$GLOBALS['phpgw_info']['user']['preferences']['projects']['notify_pro'];
***************
*** 793,797 ****
}
! if
($GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'] == 'wu')
{
if ((! $values['minperae']) ||
($values['minperae'] == 0))
--- 794,800 ----
}
! $config = $this->so->get_site_config();
!
! if ($config['bill'] == 'wu')
{
if ((! $values['minperae']) ||
($values['minperae'] == 0))
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** class.soprojects.inc.php 1 Dec 2003 16:27:02 -0000 1.53
--- class.soprojects.inc.php 3 Dec 2003 15:03:21 -0000 1.54
***************
*** 54,64 ****
}
function bill_lang()
{
! switch
($GLOBALS['phpgw_info']['user']['preferences']['projects']['bill'])
{
case 'wu': $l = lang('per workunit');
break;
! case 'h': $l = lang('per hour'); break;
! default: $l = lang('per hour/workunit');
}
return $l;
--- 54,77 ----
}
+ function get_site_config()
+ {
+ $this->config =
CreateObject('phpgwapi.config','projects');
+ $this->config->read_repository();
+
+ if ($this->config->config_data)
+ {
+ $items = $this->config->config_data;
+ }
+ return $items;
+ }
+
function bill_lang()
{
! $config = $this->get_site_config();
!
! switch ($config['bill'])
{
case 'wu': $l = lang('per workunit');
break;
! default: $l = lang('per hour'); break;
}
return $l;
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** class.uistatistics.inc.php 27 Nov 2003 18:41:55 -0000 1.24
--- class.uistatistics.inc.php 3 Dec 2003 15:03:21 -0000 1.25
***************
*** 122,135 ****
{
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'));
--- 122,131 ----
{
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())
{
$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'));
***************
*** 138,152 ****
}
- 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'));
--- 134,137 ----
***************
*** 194,198 ****
$pro_main =
get_var('pro_main',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_main?lang('list jobs'):lang('list projects'));
$this->display_app_header();
--- 179,184 ----
$pro_main =
get_var('pro_main',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_main?lang('list jobs'):lang('list projects'))
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
***************
*** 340,344 ****
$action = get_var('action',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('User statistics');
$this->display_app_header();
--- 326,331 ----
$action = get_var('action',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('User statistics')
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
***************
*** 428,432 ****
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('User statistics');
$this->display_app_header();
--- 415,420 ----
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('User statistics')
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
***************
*** 575,579 ****
);
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('gantt chart for project %1',
$this->boprojects->return_value('pro',$project_id));
$this->display_app_header();
--- 563,568 ----
);
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('gantt chart for project %1',
$this->boprojects->return_value('pro',$project_id))
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** class.uiprojecthours.inc.php 25 Nov 2003 15:34:35 -0000 1.34
--- class.uiprojecthours.inc.php 3 Dec 2003 15:03:21 -0000 1.35
***************
*** 133,141 ****
$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'));
--- 133,138 ----
$GLOBALS['phpgw']->template->set_block('header','projects_header');
! if ($this->boprojects->isprojectadmin())
{
$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'));
***************
*** 144,158 ****
}
- 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'));
--- 141,144 ----
***************
*** 171,175 ****
}
-
function format_htime($hdate = '')
{
--- 157,160 ----
***************
*** 197,201 ****
$pro_parent =
get_var('pro_parent',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'asubs')?lang('work hours
archive'):lang('list work hours'));
$this->display_app_header();
--- 182,187 ----
$pro_parent =
get_var('pro_parent',array('POST','GET'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'asubs')?lang('work hours
archive'):lang('list work hours'))
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
***************
*** 461,465 ****
);
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($hours_id?lang('edit work hours'):lang('add work
hours'));
$this->display_app_header();
--- 447,452 ----
);
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($hours_id?lang('edit work hours'):lang('add work
hours'))
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
***************
*** 627,631 ****
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('view work hours');
$this->display_app_header();
--- 614,619 ----
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('view work hours')
!
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
***************
*** 703,706 ****
--- 691,697 ----
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('delete work hours')
+
. ($this->boprojects->isprojectadmin()?' - ' .
lang('administrator'):'');
$this->display_app_header();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.boprojects.inc.php, 1.65, 1.66 class.soprojects.inc.php, 1.53, 1.54 class.uiprojecthours.inc.php, 1.34, 1.35 class.uiprojects.inc.php, 1.81, 1.82 class.uistatistics.inc.php, 1.24, 1.25 hook_admin.inc.php, 1.15, 1.16,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] projects/templates/default config.tpl, 1.4, 1.5 header.tpl, 1.20, 1.21 preferences.tpl, 1.25, 1.26
- Next by Date:
[Phpgroupware-cvs] addressbook/inc/export Netscape_LDIF, 1.2, 1.2.6.1
- Previous by thread:
[Phpgroupware-cvs] projects/templates/default config.tpl, 1.4, 1.5 header.tpl, 1.20, 1.21 preferences.tpl, 1.25, 1.26
- Next by thread:
[Phpgroupware-cvs] addressbook/inc/export Netscape_LDIF, 1.2, 1.2.6.1
- Index(es):