[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.18.2.6.2
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.18.2.6.2.3,1.18.2.6.2.4 class.uideliveries.inc.php,1.21.2.3.2.3,1.21.2.3.2.4 class.uiprojecthours.inc.php,1.22.2.5.2.2,1.22.2.5.2.3 class.uistatistics.inc.php,1.10.2.2.2.3,1.10.2.2.2.4 |
|
Date: |
Mon, 09 Jun 2003 18:25:36 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv5084/inc
Modified Files:
Tag: Version-0_9_16-branch
class.uibilling.inc.php class.uideliveries.inc.php
class.uiprojecthours.inc.php class.uistatistics.inc.php
Log Message:
update
Index: class.uibilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uibilling.inc.php,v
retrieving revision 1.18.2.6.2.3
retrieving revision 1.18.2.6.2.4
diff -C2 -r1.18.2.6.2.3 -r1.18.2.6.2.4
*** class.uibilling.inc.php 9 Jun 2003 22:05:16 -0000 1.18.2.6.2.3
--- class.uibilling.inc.php 9 Jun 2003 22:25:34 -0000 1.18.2.6.2.4
***************
*** 181,190 ****
$pro_parent =
get_var('pro_parent',array('POST','GET'));
$this->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('projects_list_t' =>
'bill_list.tpl'));
$GLOBALS['phpgw']->template->set_block('projects_list_t','projects_list','list');
-
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects'));
if (!$action)
--- 181,189 ----
$pro_parent =
get_var('pro_parent',array('POST','GET'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects'));
$this->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('projects_list_t' =>
'bill_list.tpl'));
$GLOBALS['phpgw']->template->set_block('projects_list_t','projects_list','list');
if (!$action)
Index: class.uideliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uideliveries.inc.php,v
retrieving revision 1.21.2.3.2.3
retrieving revision 1.21.2.3.2.4
diff -C2 -r1.21.2.3.2.3 -r1.21.2.3.2.4
*** class.uideliveries.inc.php 9 Jun 2003 22:05:16 -0000 1.21.2.3.2.3
--- class.uideliveries.inc.php 9 Jun 2003 22:25:34 -0000 1.21.2.3.2.4
***************
*** 166,175 ****
$pro_parent =
get_var('pro_parent',array('POST','GET'));
$this->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('projects_list_t' =>
'bill_list.tpl'));
$GLOBALS['phpgw']->template->set_block('projects_list_t','projects_list','list');
-
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects'));
if (!$action)
--- 166,174 ----
$pro_parent =
get_var('pro_parent',array('POST','GET'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects'));
$this->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('projects_list_t' =>
'bill_list.tpl'));
$GLOBALS['phpgw']->template->set_block('projects_list_t','projects_list','list');
if (!$action)
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.2
retrieving revision 1.22.2.5.2.3
diff -C2 -r1.22.2.5.2.2 -r1.22.2.5.2.3
*** class.uiprojecthours.inc.php 9 Jun 2003 22:05:16 -0000
1.22.2.5.2.2
--- class.uiprojecthours.inc.php 9 Jun 2003 22:25:34 -0000
1.22.2.5.2.3
***************
*** 190,193 ****
--- 190,194 ----
$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();
***************
*** 210,214 ****
$GLOBALS['phpgw']->template->set_var('state_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'asubs')?lang('work hours
archive'):lang('list work hours'));
$GLOBALS['phpgw']->template->set_var('project_list',$this->boprojects->select_project_list('all',(($action
!= 'asubs')?$status:'archive'),$project_id));
--- 211,214 ----
***************
*** 452,455 ****
--- 452,456 ----
);
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($hours_id?lang('edit work hours'):lang('add work
hours'));
$this->display_app_header();
***************
*** 465,469 ****
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($hours_id?lang('edit work hours'):lang('add work
hours'));
if ($hours_id)
--- 466,469 ----
***************
*** 602,612 ****
if (!$hours_id)
{
! Header('Location: ' . $referer);
}
$this->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('hours_view' => 'hours_view.tpl'));
-
$GLOBALS['phpgw']->template->set_var('lang_action',lang('View work hours'));
$GLOBALS['phpgw']->template->set_var('doneurl',$referer);
--- 602,612 ----
if (!$hours_id)
{
! $GLOBALS['phpgw']->redirect_link($referer);
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('view work hours');
$this->display_app_header();
$GLOBALS['phpgw']->template->set_file(array('hours_view' => 'hours_view.tpl'));
$GLOBALS['phpgw']->template->set_var('doneurl',$referer);
***************
*** 679,683 ****
{
$this->boprojecthours->delete_hours($hours_id);
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
--- 679,683 ----
{
$this->boprojecthours->delete_hours($hours_id);
!
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.10.2.2.2.3
retrieving revision 1.10.2.2.2.4
diff -C2 -r1.10.2.2.2.3 -r1.10.2.2.2.4
*** class.uistatistics.inc.php 9 Jun 2003 22:05:16 -0000 1.10.2.2.2.3
--- class.uistatistics.inc.php 9 Jun 2003 22:25:34 -0000 1.10.2.2.2.4
***************
*** 162,165 ****
--- 162,166 ----
$pro_parent =
get_var('pro_parent',array('POST','GET'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list jobs'):lang('list projects'));
$this->display_app_header();
***************
*** 355,358 ****
--- 356,360 ----
$action = get_var('action',array('POST','GET'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('User statistics');
$this->display_app_header();
***************
*** 360,364 ****
$GLOBALS['phpgw']->template->set_block('user_list_t','user_list','list');
-
$GLOBALS['phpgw']->template->set_var('lang_action',lang('User statistics'));
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(1));
--- 362,365 ----
***************
*** 440,446 ****
if (! $account_id)
{
! Header('Location: ' .
$phpgw->link('/index.php','menuaction=projects.uistatistics.list_users&action=ustat'));
}
$this->display_app_header();
--- 441,448 ----
if (! $account_id)
{
!
$phpgw->redirect_link('/index.php','menuaction=projects.uistatistics.list_users&action=ustat');
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('User statistics');
$this->display_app_header();
***************
*** 448,452 ****
$GLOBALS['phpgw']->template->set_block('user_stat_t','user_stat','stat');
-
$GLOBALS['phpgw']->template->set_var('lang_action',lang('User statistic'));
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 450,453 ----
***************
*** 583,589 ****
if (! $project_id)
{
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
}
$this->display_app_header();
--- 584,591 ----
if (! $project_id)
{
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains');
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('project statistic');
$this->display_app_header();
***************
*** 604,608 ****
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
-
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Project statistic'));
$title = $GLOBALS['phpgw']->strip_html($pro['title']);
--- 606,609 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.uibilling.inc.php,1.18.2.6.2.3,1.18.2.6.2.4 class.uideliveries.inc.php,1.21.2.3.2.3,1.21.2.3.2.4 class.uiprojecthours.inc.php,1.22.2.5.2.2,1.22.2.5.2.3 class.uistatistics.inc.php,1.10.2.2.2.3,1.10.2.2.2.4,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/inc class.soprojecthours.inc.php,1.8.4.3,1.8.4.4 class.soprojects.inc.php,1.34.2.6.2.11,1.34.2.6.2.12 class.uibilling.inc.php,1.18.2.6.2.2,1.18.2.6.2.3 class.uideliveries.inc.php,1.21.2.3.2.2,1.21.2.3.2.3 class.uiprojecthours.inc.php,1.22.2.5.2.1,1.22.2.5.2.2 class.uistatistics.inc.php,1.10.2.2.2.2,1.10.2.2.2.3
- Next by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang,1.17.2.4.2.1,1.17.2.4.2.2 phpgw_en.lang,1.25.2.4.2.8,1.25.2.4.2.9
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/inc class.soprojecthours.inc.php,1.8.4.3,1.8.4.4 class.soprojects.inc.php,1.34.2.6.2.11,1.34.2.6.2.12 class.uibilling.inc.php,1.18.2.6.2.2,1.18.2.6.2.3 class.uideliveries.inc.php,1.21.2.3.2.2,1.21.2.3.2.3 class.uiprojecthours.inc.php,1.22.2.5.2.1,1.22.2.5.2.2 class.uistatistics.inc.php,1.10.2.2.2.2,1.10.2.2.2.3
- Next by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang,1.17.2.4.2.1,1.17.2.4.2.2 phpgw_en.lang,1.25.2.4.2.8,1.25.2.4.2.9
- Index(es):