[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.36,1.37 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.36,1.37 class.boinvestment.inc.php,1.6,1.7 class.boinvoice.inc.php,1.11,1.12 class.uiadmin.inc.php,1.5,1.6 class.uiapartment.inc.php,1.3,1.4 class.uibuilding.inc.php,1.11,1.12 class.uidrawing.inc.php,1.4,1.5 class.uientrance.inc.php,1.4,1.5class.uiequipment.inc.php,1.12,1.13 class.uiinvestment.inc.php,1.11,1.12 class.uiinvoice.inc.php,1.15,1.16 class.uilookup.inc.php,1.12,1.13 class.uimeter.inc.php,1.1,1.2 class.uipricebook.inc.php,1.5,1.6 class.uiproject.inc.php,1.11,1.12 class.uiproperty.inc.php,1.15,1.16 class.uirequest.inc.php,1.3,1.4 class.uistandard_2.inc.php,1.5,1.6class.uistandard_3.inc.php,1.4,1.5 class.uistandard_entity.inc.php,1.7,1.8 class.uitemplate.inc.php,1.1,1.2 class.uitts.inc.php,1.16,1.17 class.uiwo_hour.inc.php,1.12,1.13 class.uiworkorder.inc.php,1.12,1.13 class.uiXport.inc.php,1.16,1.17 |
|
Date: |
Wed, 23 Apr 2003 03:21:37 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv5645/inc
Modified Files:
class.bocommon.inc.php class.boinvestment.inc.php
class.boinvoice.inc.php class.uiadmin.inc.php
class.uiapartment.inc.php class.uibuilding.inc.php
class.uidrawing.inc.php class.uientrance.inc.php
class.uiequipment.inc.php class.uiinvestment.inc.php
class.uiinvoice.inc.php class.uilookup.inc.php
class.uimeter.inc.php class.uipricebook.inc.php
class.uiproject.inc.php class.uiproperty.inc.php
class.uirequest.inc.php class.uistandard_2.inc.php
class.uistandard_3.inc.php class.uistandard_entity.inc.php
class.uitemplate.inc.php class.uitts.inc.php
class.uiwo_hour.inc.php class.uiworkorder.inc.php
class.uiXport.inc.php
Log Message:
app_header
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** class.bocommon.inc.php 21 Apr 2003 09:23:35 -0000 1.36
--- class.bocommon.inc.php 23 Apr 2003 07:21:34 -0000 1.37
***************
*** 748,755 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('select_part_of_town',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_part_of_town',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 748,755 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('select_part_of_town'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_part_of_town'));
break;
}
***************
*** 789,796 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 789,796 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter'));
break;
}
***************
*** 829,836 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 829,836 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter'));
break;
}
***************
*** 869,876 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 869,876 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter'));
break;
}
***************
*** 909,916 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 909,916 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter'));
break;
}
***************
*** 950,957 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('select_district',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_district',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 950,957 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('select_district'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_district'));
break;
}
***************
*** 992,999 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 992,999 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter'));
break;
}
Index: class.boinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvestment.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.boinvestment.inc.php 28 Feb 2003 19:39:00 -0000 1.6
--- class.boinvestment.inc.php 23 Apr 2003 07:21:34 -0000 1.7
***************
*** 121,128 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 121,128 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter'));
break;
}
***************
*** 160,164 ****
{
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
--- 160,164 ----
{
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
***************
*** 277,281 ****
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 277,281 ----
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_filter'));
break;
}
Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.boinvoice.inc.php 28 Feb 2003 19:39:00 -0000 1.11
--- class.boinvoice.inc.php 23 Apr 2003 07:21:34 -0000 1.12
***************
*** 526,533 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 526,533 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter'));
break;
}
***************
*** 568,575 ****
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('user_lid_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('user_lid_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
break;
}
--- 568,575 ----
{
case 'select':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('user_lid_select'));
break;
case 'filter':
!
$GLOBALS['phpgw']->xslttpl->add_file(array('user_lid_filter'));
break;
}
Index: class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uiadmin.inc.php 10 Mar 2003 09:17:09 -0000 1.5
--- class.uiadmin.inc.php 23 Apr 2003 07:21:34 -0000 1.6
***************
*** 68,72 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('admin','nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 68,71 ----
***************
*** 175,180 ****
'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin.list_acl2'),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('set permission'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_statustext' => lang('Submit
the search string'),
--- 174,177 ----
***************
*** 189,192 ****
--- 186,193 ----
);
+ $appname
= lang('permission');
+ $function_msg =
lang('set permission');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_acl2' => $data));
$this->save_sessiondata();
***************
*** 196,201 ****
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('admin',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$values = get_var('values',array('POST'));
--- 197,201 ----
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('admin'));
$values = get_var('values',array('POST'));
***************
*** 230,235 ****
$data = array
(
- 'appname' =>
lang($this->currentapp),
- 'function_msg' => lang('Edit
ID'),
'form_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin.edit_id'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
--- 230,233 ----
***************
*** 248,251 ****
--- 246,253 ----
);
+ $appname
= lang('ID');
+ $function_msg =
lang('edit ID');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_id' => $data));
$this->save_sessiondata();
Index: class.uiapartment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiapartment.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uiapartment.inc.php 8 Apr 2003 12:38:09 -0000 1.3
--- class.uiapartment.inc.php 23 Apr 2003 07:21:34 -0000 1.4
***************
*** 69,73 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 69,72 ----
***************
*** 162,167 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list apartment'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the apartment belongs to. To do not use a category
select NO CATEGORY'),
--- 161,164 ----
***************
*** 180,183 ****
--- 177,184 ----
);
+ $appname
= lang('apartment');
+ $function_msg =
lang('list apartment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 206,210 ****
$values_attribute =
get_var('values_attribute',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('apartment',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 207,211 ----
$values_attribute =
get_var('values_attribute',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('apartment'));
if ($values['save'])
***************
*** 343,348 ****
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
- 'appname'
=> lang('apartment'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiapartment.index'),
--- 344,347 ----
***************
*** 387,390 ****
--- 386,392 ----
);
+ $appname
= lang('apartment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 412,422 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('apartment'),
- 'function_msg' => lang('delete
apartment'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiapartment.delete&location_code='
. $location_code),
--- 414,421 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiapartment.delete&location_code='
. $location_code),
***************
*** 428,431 ****
--- 427,434 ----
);
+ $appname
= lang('apartment');
+ $function_msg =
lang('delete apartment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 440,444 ****
$apartment_id = $location[3];
!
$GLOBALS['phpgw']->xslttpl->add_file(array('apartment',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$values = $this->bo->read_single($location_code);
--- 443,447 ----
$apartment_id = $location[3];
!
$GLOBALS['phpgw']->xslttpl->add_file(array('apartment'));
$values = $this->bo->read_single($location_code);
***************
*** 473,478 ****
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
- 'appname'
=> lang('apartment'),
- 'function_msg'
=> lang('view apartment'),
'value_name'
=> $values['name'],
'value_descr'
=> $values['descr'],
--- 476,479 ----
***************
*** 492,495 ****
--- 493,500 ----
);
+ $appname
= lang('apartment');
+ $function_msg =
lang('view apartment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uibuilding.inc.php 8 Apr 2003 12:38:09 -0000 1.11
--- class.uibuilding.inc.php 23 Apr 2003 07:21:34 -0000 1.12
***************
*** 73,77 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 73,76 ----
***************
*** 161,166 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list building'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
--- 160,163 ----
***************
*** 179,182 ****
--- 176,183 ----
);
+ $appname
= lang('building');
+ $function_msg =
lang('list building');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 197,201 ****
$values_attribute =
get_var('values_attribute',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 198,202 ----
$values_attribute =
get_var('values_attribute',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('building'));
if ($values['save'])
***************
*** 313,318 ****
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
- 'appname'
=> lang('building'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.index'),
--- 314,317 ----
***************
*** 347,350 ****
--- 346,352 ----
);
+ $appname
= lang('building');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 367,377 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('building'),
- 'function_msg' => lang('delete
building'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.delete&property_id='
. $property_id.'&building_id=' . $building_id),
--- 369,376 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.delete&property_id='
. $property_id.'&building_id=' . $building_id),
***************
*** 383,386 ****
--- 382,389 ----
);
+ $appname
= lang('building');
+ $function_msg =
lang('delete building');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 391,395 ****
$building_id = get_var('building_id',array('GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$values =
$this->bo->read_single($property_id,$building_id);
--- 394,398 ----
$building_id = get_var('building_id',array('GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('building'));
$values =
$this->bo->read_single($property_id,$building_id);
***************
*** 417,422 ****
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
- 'appname'
=> lang('building'),
- 'function_msg'
=> lang('view building'),
'value_building_id'
=> $values['building_id'],
'value_name'
=> $values['name'],
--- 420,423 ----
***************
*** 438,441 ****
--- 439,446 ----
);
+ $appname
= lang('building');
+ $function_msg =
lang('view building');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uidrawing.inc.php 22 Apr 2003 09:06:54 -0000 1.4
--- class.uidrawing.inc.php 23 Apr 2003 07:21:34 -0000 1.5
***************
*** 75,79 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 75,78 ----
***************
*** 200,205 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list drawing'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the drawing belongs to. To do not use a category
select NO CATEGORY'),
--- 199,202 ----
***************
*** 231,234 ****
--- 228,235 ----
);
+ $appname = lang('Drawing');
+ $function_msg = lang('list drawing');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_drawing' => $data));
$this->save_sessiondata();
***************
*** 270,273 ****
--- 271,311 ----
}
+
+ function view_file($file_array='')
+ {
+ if(is_array($file_array))
+ {
+ $this->bo->path = $file_array['path'];
+ $this->bo->file = $file_array['file'];
+ }
+ $file = $this->bo->path.SEP.$this->bo->file;
+ if($this->bo->vfs->file_exists(array(
+ 'string' => $file,
+ 'relatives' => Array(RELATIVE_NONE)
+ )))
+ {
+ $browser = CreateObject('phpgwapi.browser');
+
$browser->content_header($this->bo->file,$this->bo->vfs->file_type(array(
+ 'string' => $file,
+ 'relatives' =>
Array(RELATIVE_NONE))),
+ $this->bo->vfs->get_size(array(
+ 'string' => $file,
+ 'relatives' =>
Array(RELATIVE_NONE),
+ 'checksubdirs' => True
+ )));
+ // $browser->content_header($this->bo->file);
+ echo $this->bo->vfs->read(array(
+ 'string' => $file,
+ 'relatives' => Array(RELATIVE_NONE)
+ ));
+ flush();
+ }
+ if(!is_array($file_array))
+ {
+ exit();
+ }
+ }
+
+
function edit()
{
***************
*** 277,281 ****
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('drawing',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$this->create_home_dir();
--- 315,319 ----
$values =
get_var('values',array('POST'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('drawing'));
$this->create_home_dir();
***************
*** 307,310 ****
--- 345,350 ----
{
+
$values['drawing_name']=$_FILES['drawing_file']['name'];
+
if(!$values['cat_id'])
{
***************
*** 318,326 ****
}
$values['drawing_id'] = $drawing_id;
if(!$receipt['error'])
{
-
$values['drawing_name']=$_FILES['drawing_file']['name'];
$this->vfs->cp (array (
--- 358,373 ----
}
+ if(!$values['drawing_name_orig'] &&
$this->vfs->file_exists(array(
+ 'string' => $this->fakebase.
SEP . 'drawing'. SEP . $values['drawing_name'],
+ 'relatives' =>
Array(RELATIVE_NONE)
+ )))
+ {
+
$receipt['error'][]=array('msg'=>lang('This file already exists !'));
+ }
+
$values['drawing_id'] = $drawing_id;
if(!$receipt['error'])
{
$this->vfs->cp (array (
***************
*** 347,351 ****
--- 394,408 ----
}
+ /* define('PHPGW_FOOTER_RAN',True);
+ echo $this->fakebase. SEP . 'drawing'. SEP .
$values['drawing_name'];
+ $this->vfs->override_acl = 1;
+
+ $this->vfs->read(array(
+ 'string' => $this->fakebase.
SEP . 'drawing'. SEP . $values['drawing_name'],
+ 'relatives' =>
Array(RELATIVE_NONE)
+ ));
+
+ */
$table_header_history[] = array
(
***************
*** 420,425 ****
'location_data'
=> $location_data,
'location_type'
=> 'form',
- 'appname'
=> lang('Drawing'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.index'),
--- 477,480 ----
***************
*** 482,485 ****
--- 537,543 ----
);
+ $appname = lang('Drawing');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 501,511 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('drawing'),
- 'function_msg' => lang('delete
drawing'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.delete&drawing_id='
. $drawing_id),
--- 559,566 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.delete&drawing_id='
. $drawing_id),
***************
*** 517,520 ****
--- 572,579 ----
);
+ $appname
= lang('drawing');
+ $function_msg =
lang('delete drawing');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 524,528 ****
$id = get_var('id',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('project',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$this->config->read_repository();
--- 583,587 ----
$id = get_var('id',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('project'));
$this->config->read_repository();
***************
*** 600,605 ****
'location_data'
=> $location_data,
'location_type'
=> 'view',
- 'appname'
=> lang('Project'),
- 'function_msg'
=> $function_msg,
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index'),
'lang_year'
=> lang('Year'),
--- 659,662 ----
***************
*** 654,657 ****
--- 711,717 ----
);
+ $appname = lang('Drawing');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uientrance.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientrance.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uientrance.inc.php 8 Apr 2003 12:38:09 -0000 1.4
--- class.uientrance.inc.php 23 Apr 2003 07:21:34 -0000 1.5
***************
*** 69,73 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 69,72 ----
***************
*** 155,160 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list entrance'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the entrance belongs to. To do not use a category
select NO CATEGORY'),
--- 154,157 ----
***************
*** 173,176 ****
--- 170,177 ----
);
+ $appname
= lang('entrance');
+ $function_msg =
lang('list entrance');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 195,199 ****
$values_attribute =
get_var('values_attribute',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('entrance',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 196,200 ----
$values_attribute =
get_var('values_attribute',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('entrance'));
if ($values['save'])
***************
*** 322,327 ****
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
- 'appname'
=> lang('entrance'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientrance.index'),
--- 323,326 ----
***************
*** 356,359 ****
--- 355,361 ----
);
+ $appname
= lang('entrance');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 380,390 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('entrance'),
- 'function_msg' => lang('delete
entrance'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientrance.delete&location_code='
. $location_code),
--- 382,389 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientrance.delete&location_code='
. $location_code),
***************
*** 396,399 ****
--- 395,402 ----
);
+ $appname
= lang('entrance');
+ $function_msg =
lang('delete entrance');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 407,411 ****
$entrance_id = $location[2];
!
$GLOBALS['phpgw']->xslttpl->add_file(array('entrance',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$values = $this->bo->read_single($location_code);
--- 410,414 ----
$entrance_id = $location[2];
! $GLOBALS['phpgw']->xslttpl->add_file(array('entrance'));
$values = $this->bo->read_single($location_code);
***************
*** 435,440 ****
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
- 'appname'
=> lang('entrance'),
- 'function_msg'
=> lang('view entrance'),
'value_entrance_id'
=> $values['entrance_id'],
'value_name'
=> $values['name'],
--- 438,441 ----
***************
*** 456,459 ****
--- 457,464 ----
);
+ $appname
= lang('entrance');
+ $function_msg =
lang('view entrance');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uiequipment.inc.php 9 Apr 2003 20:14:11 -0000 1.12
--- class.uiequipment.inc.php 23 Apr 2003 07:21:34 -0000 1.13
***************
*** 72,76 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 72,75 ----
***************
*** 193,198 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list equipment'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the equipment belongs to. To do not use a category
select NO CATEGORY'),
--- 192,195 ----
***************
*** 219,222 ****
--- 216,223 ----
);
+ $appname
= lang('equipment');
+ $function_msg =
lang('list equipment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 229,233 ****
$values_attribute =
get_var('values_attribute',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('equipment',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if($values)
--- 230,234 ----
$values_attribute =
get_var('values_attribute',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('equipment'));
if($values)
***************
*** 383,388 ****
'location_data'
=> $location_data,
'location_type'
=> $location_type,
- 'appname'
=> lang('equipment'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.index'),
--- 384,387 ----
***************
*** 423,426 ****
--- 422,428 ----
);
+ $appname
= lang('equipment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 442,452 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('equipment'),
- 'function_msg' => lang('delete
equipment'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.delete&equipment_id='
. $equipment_id),
--- 444,451 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.delete&equipment_id='
. $equipment_id),
***************
*** 458,461 ****
--- 457,464 ----
);
+ $appname
= lang('equipment');
+ $function_msg =
lang('delete equipment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 466,470 ****
$values = $this->bo->read_single($id);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('equipment',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$location_data=$this->bocommon->initiate_ui_location(array(
--- 469,473 ----
$values = $this->bo->read_single($id);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('equipment'));
$location_data=$this->bocommon->initiate_ui_location(array(
***************
*** 512,517 ****
'value_cost' =>
$values['cost'],
'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
- 'appname'
=> lang('equipment'),
- 'function_msg' =>
lang('view equipment'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.index'),
'edit_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.edit&id='
. $id),
--- 515,518 ----
***************
*** 525,528 ****
--- 526,533 ----
);
+ $appname
= lang('equipment');
+ $function_msg =
lang('view equipment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uiinvestment.inc.php 8 Apr 2003 12:38:09 -0000 1.11
--- class.uiinvestment.inc.php 23 Apr 2003 07:21:34 -0000 1.12
***************
*** 73,78 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('investment',
'menu',
!
'nextmatchs',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$links = $this->bocommon->menu($sub);
--- 73,77 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('investment',
'menu',
!
'nextmatchs'));
$links = $this->bocommon->menu($sub);
***************
*** 212,217 ****
'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.index'),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list investment'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the investment belongs to. To do not use a category
select NO CATEGORY'),
--- 211,214 ----
***************
*** 239,242 ****
--- 236,243 ----
);
+ $appname
= lang('investment');
+ $function_msg =
lang('list investment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 273,278 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('investment',
'menu',
!
'nextmatchs',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$sub =
get_var('sub',array('POST','GET'));
--- 274,278 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('investment',
'menu',
!
'nextmatchs'));
$sub =
get_var('sub',array('POST','GET'));
***************
*** 414,419 ****
'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.history&entity_id='
. $entity_id.'&investment_id=' . $investment_id . '&entity_type=' .
$entity_type),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('investment history'),
'entity_id'
=> $entity_id,
'investment_id'
=> $investment_id,
--- 414,417 ----
***************
*** 425,428 ****
--- 423,430 ----
);
+ $appname
= lang('investment');
+ $function_msg =
lang('investment history');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('history' => $data));
$this->save_sessiondata();
***************
*** 449,453 ****
'equipment_id'
=> $values['equipment_id']));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('investment',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 451,455 ----
'equipment_id'
=> $values['equipment_id']));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('investment'));
if ($values['save'])
***************
*** 510,515 ****
(
'location_data'
=> $location_data,
- 'appname'
=> lang('investment'),
- 'function_msg'
=> lang('add investment'),
'link_calendar_date' =>
'setDateField(document.form.date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
'calendar_gif'
=> './'.$this->currentapp.'/templates/default/images/calendar.gif',
--- 512,515 ----
***************
*** 574,577 ****
--- 574,581 ----
);
+ $appname
= lang('investment');
+ $function_msg =
lang('add investment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('add'
=> $data));
}
***************
*** 602,612 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('investment'),
- 'function_msg' => lang('delete
investment history element'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.delete&entity_id='
. $entity_id.'&investment_id=' . $investment_id.'&index_count=' .
$index_count.'&entity_type='.$entity_type),
--- 606,613 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.delete&entity_id='
. $entity_id.'&investment_id=' . $investment_id.'&index_count=' .
$index_count.'&entity_type='.$entity_type),
***************
*** 618,621 ****
--- 619,626 ----
);
+ $appname
= lang('investment');
+ $function_msg =
lang('delete investment history element');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 626,630 ****
$investment_id = get_var('investment_id',array('GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('investment',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$investment =
$this->bo->read_single($entity_id,$investment_id);
--- 631,635 ----
$investment_id = get_var('investment_id',array('GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('investment'));
$investment =
$this->bo->read_single($entity_id,$investment_id);
***************
*** 632,637 ****
$data = array
(
- 'appname' =>
lang('investment'),
- 'function_msg' => lang('view
investment'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.index'),
'lang_name' => lang('name'),
--- 637,640 ----
***************
*** 646,649 ****
--- 649,656 ----
);
+ $appname
= lang('investment');
+ $function_msg =
lang('view investment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uiinvoice.inc.php 3 Apr 2003 19:12:45 -0000 1.15
--- class.uiinvoice.inc.php 23 Apr 2003 07:21:34 -0000 1.16
***************
*** 87,91 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 87,90 ----
***************
*** 234,239 ****
$data['link_url']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
$data['img_path']
= $GLOBALS['phpgw']->common->get_image_path('phpgwapi');
- $data['appname']
= lang($this->currentapp);
- $data['function_msg']
= lang('list voucher');
$data['lang_no_cat']
= lang('no category');
$data['lang_cat_statustext'] =
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY');
--- 233,236 ----
***************
*** 250,253 ****
--- 247,254 ----
//_debug_array($data);
+ $appname
= lang('invoice');
+ $function_msg =
lang('list voucher');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
if ($paid)
***************
*** 322,327 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
!
'nextmatchs',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$sub = get_var('sub',array('POST','GET'));
--- 323,327 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
!
'nextmatchs'));
$sub = get_var('sub',array('POST','GET'));
***************
*** 478,483 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> $function_msg,
'lang_submit'
=> lang('submit'),
'table_header_list_invoice_sub' =>
$table_header,
--- 478,481 ----
***************
*** 493,496 ****
--- 491,497 ----
//_debug_array($data);
+ $appname
= lang('invoice');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_invoice_sub' => $data));
$this->save_sessiondata();
***************
*** 501,508 ****
{
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
!
'headonly',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
-
//$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi','default')
. SEP . 'phpgw_header');
$voucher_id =
get_var('voucher_id',array('POST','GET'));
--- 502,507 ----
{
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
!
'headonly'));
$voucher_id =
get_var('voucher_id',array('POST','GET'));
***************
*** 541,546 ****
{
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
!
'headonly',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$id = get_var('id',array('POST','GET'));
--- 540,544 ----
{
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
!
'headonly'));
$id = get_var('id',array('POST','GET'));
***************
*** 562,566 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 560,563 ----
***************
*** 643,648 ****
$data['link_url']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
$data['img_path']
= $GLOBALS['phpgw']->common->get_image_path('phpgwapi');
- $data['appname']
= lang($this->currentapp);
- $data['function_msg']
= lang('list voucher');
$data['lang_no_cat']
= lang('no category');
$data['lang_cat_statustext'] =
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY');
--- 640,643 ----
***************
*** 707,710 ****
--- 702,709 ----
//_debug_array($data);
+ $appname
= lang('consume');
+ $function_msg =
lang('list consume');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('consume' => $data));
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uilookup.inc.php 12 Apr 2003 17:55:03 -0000 1.12
--- class.uilookup.inc.php 23 Apr 2003 07:21:34 -0000 1.13
***************
*** 75,79 ****
'nextmatchs',
'headonly',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 75,78 ----
***************
*** 159,164 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- // 'appname'
=> '',
- 'function_msg'
=> lang('list vendors'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
--- 158,161 ----
***************
*** 177,180 ****
--- 174,181 ----
);
+ $appname
= lang('addressbook');
+ $function_msg =
lang('list vendors');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_addressbook' => $data));
$this->save_sessiondata();
***************
*** 187,191 ****
'nextmatchs',
'headonly',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 188,191 ----
***************
*** 256,261 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- // 'appname'
=> '',
- 'function_msg'
=> lang('list vendors'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
--- 256,259 ----
***************
*** 274,277 ****
--- 272,279 ----
);
+ $appname
= lang('budget account');
+ $function_msg =
lang('list budget account');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_b_account' => $data));
$this->save_sessiondata();
***************
*** 285,289 ****
'nextmatchs',
'headonly',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 287,290 ----
***************
*** 352,357 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- // 'appname'
=> '',
- 'function_msg'
=> lang('list streets'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
--- 353,356 ----
***************
*** 370,373 ****
--- 369,376 ----
);
+ $appname
= lang('street');
+ $function_msg =
lang('list street');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_street' => $data));
$this->save_sessiondata();
***************
*** 380,384 ****
'nextmatchs',
'headonly',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 383,386 ----
***************
*** 447,452 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- // 'appname'
=> '',
- 'function_msg'
=> lang('list ns3420'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
--- 449,452 ----
***************
*** 465,468 ****
--- 465,472 ----
);
+ $appname
= lang('standard description');
+ $function_msg =
lang('list standard description');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_ns3420' => $data));
$this->save_sessiondata();
***************
*** 475,479 ****
'nextmatchs',
'headonly',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 479,482 ----
***************
*** 616,621 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> $function_msg,
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
--- 619,622 ----
***************
*** 640,643 ****
--- 641,647 ----
);
+ $appname
= lang($this->currentapp);
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_'.$list => $data));
$this->save_sessiondata();
***************
*** 650,654 ****
'nextmatchs',
'headonly',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 654,657 ----
***************
*** 743,748 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- // 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list equipment'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
--- 746,749 ----
***************
*** 766,769 ****
--- 767,774 ----
);
+ $appname
= lang(equipment);
+ $function_msg =
lang('list equipment');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_equipment' => $data));
$this->save_sessiondata();
Index: class.uimeter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uimeter.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uimeter.inc.php 8 Apr 2003 12:38:09 -0000 1.1
--- class.uimeter.inc.php 23 Apr 2003 07:21:34 -0000 1.2
***************
*** 69,73 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 69,72 ----
***************
*** 164,169 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list meter'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the meter belongs to. To do not use a category select
NO CATEGORY'),
--- 163,166 ----
***************
*** 182,185 ****
--- 179,186 ----
);
+ $appname
= lang('meter');
+ $function_msg =
lang('list meter');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 191,195 ****
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('meter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if($values)
--- 192,196 ----
$values =
get_var('values',array('POST'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('meter'));
if($values)
***************
*** 281,287 ****
$data = array
(
- 'appname'
=> lang('meter'),
'location_data'
=> $location_data,
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uimeter.index'),
--- 282,286 ----
***************
*** 312,315 ****
--- 311,317 ----
);
+ $appname
= lang('meter');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 331,341 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('meter'),
- 'function_msg' => lang('delete
meter'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uimeter.delete&meter_id='
. $meter_id),
--- 333,340 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uimeter.delete&meter_id='
. $meter_id),
***************
*** 347,350 ****
--- 346,353 ----
);
+ $appname
= lang('meter');
+ $function_msg =
lang('delete meter');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 354,358 ****
$meter_id =
get_var('meter_id',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('meter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
--- 357,361 ----
$meter_id =
get_var('meter_id',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('meter'));
***************
*** 393,399 ****
$data = array
(
- 'appname'
=> lang('meter'),
'location_data'
=> $location_data,
- 'function_msg'
=> $function_msg,
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uimeter.index'),
'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uimeter.edit&meter_id='
. $meter_id),
--- 396,400 ----
***************
*** 415,418 ****
--- 416,422 ----
);
+ $appname
= lang('meter');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uipricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uipricebook.inc.php 5 Mar 2003 14:31:49 -0000 1.5
--- class.uipricebook.inc.php 23 Apr 2003 07:21:34 -0000 1.6
***************
*** 79,83 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 79,82 ----
***************
*** 218,223 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list pricebook'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the pricebook belongs to. To do not use a category
select NO CATEGORY'),
--- 217,220 ----
***************
*** 236,239 ****
--- 233,240 ----
'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.index')
);
+ $appname
= lang('pricebook');
+ $function_msg =
lang('list pricebook');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 247,251 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 248,251 ----
***************
*** 332,337 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list agreement'),
'lang_status_statustext' =>
lang('Select the status the agreement belongs to. To do not use a category
select NO STATUS'),
'status_name'
=> 'cat_id',
--- 332,335 ----
***************
*** 350,353 ****
--- 348,355 ----
'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement')
);
+ $appname
= lang('pricebook');
+ $function_msg =
lang('list agreement');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('agreement' => $data));
$this->save_sessiondata();
***************
*** 364,368 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array('pricebook',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 366,370 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array('pricebook'));
if ($values['save'])
***************
*** 450,455 ****
$data = array
(
- 'appname'
=> lang('Pricebook'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement'),
--- 452,455 ----
***************
*** 475,478 ****
--- 475,481 ----
);
+ $appname
= lang('pricebook');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_agreement' => $data));
}
***************
*** 485,489 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 488,491 ----
***************
*** 664,669 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('edit prizing'),
'lang_vendor'
=> lang('Vendor'),
'lang_activity'
=> lang('Activity'),
--- 666,669 ----
***************
*** 683,686 ****
--- 683,690 ----
);
+ $appname
= lang('pricebook');
+ $function_msg =
lang('edit pricing');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('prizing' => $data));
$this->save_sessiondata();
***************
*** 693,697 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 697,700 ----
***************
*** 788,793 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list activities per agreement'),
'lang_no_cat'
=> lang('select agreement'),
'lang_cat_statustext' =>
lang('Select the agreement the pricebook belongs to. To do not use a category
select NO CATEGORY'),
--- 791,794 ----
***************
*** 806,809 ****
--- 807,814 ----
);
+ $appname
= lang('pricebook');
+ $function_msg =
lang('list activities per agreement');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_activities' => $data));
$this->save_sessiondata();
***************
*** 817,821 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 822,825 ----
***************
*** 919,924 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list vendors per activity'),
'lang_no_cat'
=> lang('select agreement'),
'lang_cat_statustext' =>
lang('Select the agreement the pricebook belongs to. To do not use a category
select NO CATEGORY'),
--- 923,926 ----
***************
*** 939,942 ****
--- 941,948 ----
);
+ $appname
= lang('pricebook');
+ $function_msg =
lang('list vendors per activity');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_activity_vendor' =>
$data));
$this->save_sessiondata();
***************
*** 955,959 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array('pricebook',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 961,965 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array('pricebook'));
if ($values['save'])
***************
*** 1037,1042 ****
$data = array
(
- 'appname'
=> lang('Pricebook'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity&cat_id='
. $values['cat_id']),
--- 1043,1046 ----
***************
*** 1091,1094 ****
--- 1095,1101 ----
);
+ $appname
= lang('pricebook');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_activity' => $data));
}
***************
*** 1172,1182 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('pricebook'),
- 'function_msg' =>
$function_msg,
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$delete_action,
--- 1179,1186 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$delete_action,
***************
*** 1188,1191 ****
--- 1192,1198 ----
);
+ $appname
= lang('pricebook');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uiproject.inc.php 20 Apr 2003 22:24:30 -0000 1.11
--- class.uiproject.inc.php 23 Apr 2003 07:21:34 -0000 1.12
***************
*** 50,53 ****
--- 50,54 ----
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'project');
+ //_debug_array($GLOBALS['phpgw_info']['flags']);
}
***************
*** 72,78 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
$lookup = get_var('lookup',array('POST','GET'));
$links = $this->bocommon->menu();
--- 73,79 ----
'menu',
'nextmatchs',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
+
$lookup = get_var('lookup',array('POST','GET'));
$links = $this->bocommon->menu();
***************
*** 201,206 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list project'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the project belongs to. To do not use a category
select NO CATEGORY'),
--- 202,205 ----
***************
*** 232,235 ****
--- 231,239 ----
);
+ $appname
= lang('Project');
+ $function_msg =
lang('list Project');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_project' => $data));
$this->save_sessiondata();
***************
*** 241,245 ****
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('project',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$bypass =
get_var('bypass',array('POST','GET'));
--- 245,249 ----
$values =
get_var('values',array('POST'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('project'));
$bypass =
get_var('bypass',array('POST','GET'));
***************
*** 482,487 ****
'location_data'
=> $location_data,
'location_type'
=> 'form',
- 'appname'
=> lang('project'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index'),
--- 486,489 ----
***************
*** 559,562 ****
--- 561,566 ----
);
+ $appname = lang('project');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 578,588 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('project'),
- 'function_msg' => lang('delete
project'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&project_id='
. $project_id),
--- 582,589 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&project_id='
. $project_id),
***************
*** 594,597 ****
--- 595,602 ----
);
+ $appname
= lang('project');
+ $function_msg =
lang('delete project');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 601,605 ****
$id = get_var('id',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('project',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$this->config->read_repository();
--- 606,610 ----
$id = get_var('id',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('project'));
$this->config->read_repository();
***************
*** 677,682 ****
'location_data'
=> $location_data,
'location_type'
=> 'view',
- 'appname'
=> lang('Project'),
- 'function_msg'
=> $function_msg,
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index'),
'lang_year'
=> lang('Year'),
--- 682,685 ----
***************
*** 731,734 ****
--- 734,739 ----
);
+ $appname = lang('project');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uiproperty.inc.php 8 Apr 2003 12:38:09 -0000 1.15
--- class.uiproperty.inc.php 23 Apr 2003 07:21:34 -0000 1.16
***************
*** 73,77 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 73,76 ----
***************
*** 172,177 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list property'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the property belongs to. To do not use a category
select NO CATEGORY'),
--- 171,174 ----
***************
*** 190,193 ****
--- 187,193 ----
);
+ $appname = lang('Property');
+ $function_msg = lang('List property');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 200,204 ****
$values_attribute =
get_var('values_attribute',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('property',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 200,204 ----
$values_attribute =
get_var('values_attribute',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('property'));
if ($values['save'])
***************
*** 265,270 ****
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
- 'appname'
=> lang('property'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.index&sub=property'),
--- 265,268 ----
***************
*** 305,312 ****
'location_code'
=> $property['location_code'],
'value_generellinfo' =>
$property['generellinfo']
-
-
);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
--- 303,310 ----
'location_code'
=> $property['location_code'],
'value_generellinfo' =>
$property['generellinfo']
);
+ $appname = lang('Property');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 328,333 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
--- 326,330 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
***************
*** 344,347 ****
--- 341,348 ----
);
+ $appname
= lang('property');
+ $function_msg =
lang('delete property');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 351,355 ****
$property_id = get_var('property_id',array('GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('property',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$property = $this->bo->read_single($property_id);
--- 352,356 ----
$property_id = get_var('property_id',array('GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('property'));
$property = $this->bo->read_single($property_id);
***************
*** 367,401 ****
$data = array
(
! 'lang_attributes' =>
lang('Attributes'),
! 'attributes_header' =>
$attributes_header,
! 'attributes_values' =>
$attributes_values,
! 'lang_property_id'
=> lang('Property ID'),
! 'lang_name'
=> lang('name'),
! 'lang_part_of_town'
=> lang('Part of town'),
! 'lang_district'
=> lang('District'),
! 'lang_general_address' =>
lang('General Address'),
! 'lang_generellinfo'
=> lang('General Info'),
! 'lang_category'
=> lang('category'),
! 'lang_access'
=> lang('private'),
! 'lang_save'
=> lang('save'),
! 'lang_done'
=> lang('done'),
! 'value_property_id'
=> $property_id,
! 'value_name'
=> $property['name'],
! 'value_general_address' =>
$property['general_address'],
! 'value_access'
=> $property['access'],
! 'value_district'
=> $property['district_id'],
! 'value_part_of_town' =>
$property['part_of_town'],
! 'value_category'
=> $this->bo->read_category_name($property['cat_id']),
! 'value_generellinfo' =>
$property['generellinfo'],
! 'appname' =>
lang('property'),
! 'function_msg' => lang('view
property'),
! 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.index'),
! 'lang_content' =>
lang('content'),
! 'lang_category' =>
lang('category'),
! 'lang_access' =>
lang('access'),
! 'lang_time_created' => lang('time
created'),
! 'value_content' =>
$property['content'],
! 'value_access' =>
lang(ucfirst($property['access'])),
! 'value_date' =>
$GLOBALS['phpgw']->common->show_date($property['date']),
'edit_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.edit&property_id='
. $property_id),
'lang_done_statustext' => lang('Back
to the list'),
--- 368,400 ----
$data = array
(
! 'lang_attributes' =>
lang('Attributes'),
! 'attributes_header' =>
$attributes_header,
! 'attributes_values' =>
$attributes_values,
! 'lang_property_id' =>
lang('Property ID'),
! 'lang_name'
=> lang('name'),
! 'lang_part_of_town' =>
lang('Part of town'),
! 'lang_district' =>
lang('District'),
! 'lang_general_address' =>
lang('General Address'),
! 'lang_generellinfo' =>
lang('General Info'),
! 'lang_category' =>
lang('category'),
! 'lang_access' =>
lang('private'),
! 'lang_save'
=> lang('save'),
! 'lang_done'
=> lang('done'),
! 'value_property_id' =>
$property_id,
! 'value_name' =>
$property['name'],
! 'value_general_address' =>
$property['general_address'],
! 'value_access' =>
$property['access'],
! 'value_district' =>
$property['district_id'],
! 'value_part_of_town' =>
$property['part_of_town'],
! 'value_category' =>
$this->bo->read_category_name($property['cat_id']),
! 'value_generellinfo' =>
$property['generellinfo'],
! 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.index'),
! 'lang_content' =>
lang('content'),
! 'lang_category' =>
lang('category'),
! 'lang_access' =>
lang('access'),
! 'lang_time_created' =>
lang('time created'),
! 'value_content' =>
$property['content'],
! 'value_access' =>
lang(ucfirst($property['access'])),
! 'value_date' =>
$GLOBALS['phpgw']->common->show_date($property['date']),
'edit_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.edit&property_id='
. $property_id),
'lang_done_statustext' => lang('Back
to the list'),
***************
*** 405,408 ****
--- 404,410 ----
);
+ $appname = lang('Property');
+ $function_msg = lang('view property');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
***************
*** 429,439 ****
}
! $GLOBALS['phpgw']->xslttpl->add_file(array('property',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('property'),
- 'function_msg' => lang('Update
the not active category for locations'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
'update_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.update_cat'),
--- 431,438 ----
}
! $GLOBALS['phpgw']->xslttpl->add_file(array('property'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
'update_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.update_cat'),
***************
*** 446,453 ****
);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('update_cat' => $data));
}
-
-
}
?>
--- 445,453 ----
);
+ $appname = lang('Property');
+ $function_msg = lang('Update the not active category
for locations');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('update_cat' => $data));
}
}
?>
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uirequest.inc.php 20 Apr 2003 22:24:30 -0000 1.3
--- class.uirequest.inc.php 23 Apr 2003 07:21:34 -0000 1.4
***************
*** 73,77 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 73,76 ----
***************
*** 217,222 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list request'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the request belongs to. To do not use a category
select NO CATEGORY'),
--- 216,219 ----
***************
*** 248,251 ****
--- 245,252 ----
);
+ $appname
= lang('request');
+ $function_msg =
lang('list request');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 256,263 ****
{
$GLOBALS['phpgw']->xslttpl->add_file(array('request',
!
'headonly',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
!
!
//$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi','default')
. SEP . 'phpgw_header');
$values = get_var('values',array('POST','GET'));
--- 257,261 ----
{
$GLOBALS['phpgw']->xslttpl->add_file(array('request',
!
'headonly'));
$values = get_var('values',array('POST','GET'));
***************
*** 313,317 ****
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('request',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$bypass =
get_var('bypass',array('POST','GET'));
--- 311,315 ----
$values =
get_var('values',array('POST'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('request'));
$bypass =
get_var('bypass',array('POST','GET'));
***************
*** 599,604 ****
'location_data'
=> $location_data,
'location_type'
=> 'form',
- 'appname'
=> lang('request'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.index'),
--- 597,600 ----
***************
*** 654,657 ****
--- 650,656 ----
);
+ $appname
= lang('request');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 673,683 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('request'),
- 'function_msg' => lang('delete
request'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.delete&request_id='
. $request_id),
--- 672,679 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.delete&request_id='
. $request_id),
***************
*** 689,692 ****
--- 685,692 ----
);
+ $appname
= lang('request');
+ $function_msg =
lang('delete request');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 697,701 ****
$id =
get_var('id',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('request',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$values = $this->bo->read_single($id);
--- 697,701 ----
$id =
get_var('id',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('request'));
$values = $this->bo->read_single($id);
***************
*** 822,827 ****
'location_data'
=> $location_data,
'location_type'
=> 'view',
- 'appname'
=> lang('request'),
- 'function_msg'
=> $function_msg,
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.index'),
'lang_category'
=> lang('category'),
--- 822,825 ----
***************
*** 861,864 ****
--- 859,865 ----
);
+ $appname
= lang('request');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uistandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_2.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uistandard_2.inc.php 21 Feb 2003 10:28:59 -0000 1.5
--- class.uistandard_2.inc.php 23 Apr 2003 07:21:34 -0000 1.6
***************
*** 60,64 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_2','nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 60,63 ----
***************
*** 134,139 ****
'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.index&type='.$type),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list '.$type.' standard'),
'lang_searchfield_standardtext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_standardtext' =>
lang('Submit the search string'),
--- 133,136 ----
***************
*** 145,148 ****
--- 142,149 ----
);
+ $appname
= lang($type);
+ $function_msg =
lang('list '.$type.' standard');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 155,159 ****
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_2',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 156,160 ----
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_2'));
if ($values['save'])
***************
*** 195,200 ****
$data = array
(
- 'appname'
=> lang($type),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.index&type='.$type),
--- 196,199 ----
***************
*** 220,223 ****
--- 219,225 ----
);
+ $appname
= lang($type);
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 241,251 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang($type),
- 'function_msg' => lang('delete
standard'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.delete&id='
. $id.'&type='.$type),
--- 243,250 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_2.delete&id='
. $id.'&type='.$type),
***************
*** 257,260 ****
--- 256,263 ----
);
+ $appname
= lang($type);
+ $function_msg =
lang('delete '.$type.' standard');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
Index: class.uistandard_3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_3.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uistandard_3.inc.php 5 Mar 2003 14:31:49 -0000 1.4
--- class.uistandard_3.inc.php 23 Apr 2003 07:21:34 -0000 1.5
***************
*** 59,63 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_3',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'nextmatchs'));
--- 59,62 ----
***************
*** 134,139 ****
'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_3.index&type='.$type),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list '.$type.' standard'),
'lang_searchfield_standardtext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_standardtext' =>
lang('Submit the search string'),
--- 133,136 ----
***************
*** 145,148 ****
--- 142,149 ----
);
+ $appname
= lang('Standard');
+ $function_msg =
lang('list '.$type.' attribute');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 155,159 ****
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_3',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 156,160 ----
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_3'));
if ($values['save'])
***************
*** 195,200 ****
$data = array
(
- 'appname'
=> lang($type),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_3.index&type='.$type),
--- 196,199 ----
***************
*** 219,222 ****
--- 218,224 ----
);
+ $appname
= lang($type);
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 240,250 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang($type),
- 'function_msg' => lang('delete
standard'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_3.delete&id='
. $id.'&type='.$type),
--- 242,249 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_3.delete&id='
. $id.'&type='.$type),
***************
*** 256,259 ****
--- 255,262 ----
);
+ $appname
= lang($type);
+ $function_msg =
lang('delete '.$type.' standard');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
Index: class.uistandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_entity.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uistandard_entity.inc.php 7 Apr 2003 07:21:56 -0000 1.7
--- class.uistandard_entity.inc.php 23 Apr 2003 07:21:34 -0000 1.8
***************
*** 64,70 ****
'nextmatchs',
'menu',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
- //
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'nextmatchs'));
$links = $this->bocommon->menu();
--- 64,68 ----
***************
*** 146,151 ****
'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.index&type='.$type),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list '.$type.' standard'),
'lang_searchfield_standardtext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_standardtext' =>
lang('Submit the search string'),
--- 144,147 ----
***************
*** 157,160 ****
--- 153,160 ----
);
+ $appname
= lang($type);
+ $function_msg =
lang('list '.$type.' standard');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 167,171 ****
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_entity',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 167,171 ----
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_entity'));
if ($values['save'])
***************
*** 219,224 ****
'lang_name_standardtext' =>
lang('Enter a name of the standard'),
- 'appname'
=> lang($type),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.index&type='.$type),
--- 219,222 ----
***************
*** 243,246 ****
--- 241,247 ----
);
+ $appname
= lang($type);
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 275,285 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang($type),
- 'function_msg' => lang('delete
standard'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.delete&id='
. $id.'&type='.$type.'&type_id='.$type_id),
--- 276,283 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.delete&id='
. $id.'&type='.$type.'&type_id='.$type_id),
***************
*** 291,294 ****
--- 289,296 ----
);
+ $appname
= lang($type);
+ $function_msg =
lang('delete '.$type.' standard');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 303,309 ****
'standard_entity',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
- //
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'nextmatchs'));
$attrib_list = $this->bo->read_attrib($type,$type_id);
--- 305,309 ----
***************
*** 374,379 ****
'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.index&type='.$type),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list '.$type.' attrib'),
'lang_searchfield_attribtext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
'lang_searchbutton_attribtext' => lang('Submit
the search string'),
--- 374,377 ----
***************
*** 385,388 ****
--- 383,390 ----
);
+ $appname
= lang('attribute');
+ $function_msg =
lang('list '.$type.' attribute');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_attribute' => $data));
$this->save_sessiondata();
***************
*** 397,401 ****
//_debug_array($values);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_entity',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 399,403 ----
//_debug_array($values);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('standard_entity'));
if ($values['save'])
***************
*** 443,448 ****
$data = array
(
- 'appname'
=> lang($type),
- 'function_msg' =>
$function_msg,
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.list_attribute&type='.$type.'&type_id='.$type_id),
--- 445,448 ----
***************
*** 475,478 ****
--- 475,481 ----
//_debug_array($data);
+ $appname
= lang($type);
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_attrib' => $data));
}
Index: class.uitemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitemplate.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uitemplate.inc.php 7 Apr 2003 07:21:56 -0000 1.1
--- class.uitemplate.inc.php 23 Apr 2003 07:21:34 -0000 1.2
***************
*** 75,79 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 75,78 ----
***************
*** 207,212 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list template'),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
--- 206,209 ----
***************
*** 226,229 ****
--- 223,230 ----
);
+ $appname
= lang('tremplate');
+ $function_msg =
lang('list template');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 235,239 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 236,239 ----
***************
*** 424,429 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data_nextmatch),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list template'),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
--- 424,427 ----
***************
*** 438,441 ****
--- 436,443 ----
'table_done'
=> $table_done
);
+ $appname
= lang('template');
+ $function_msg =
lang('view template detail');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_template_hour' =>
$data));
***************
*** 449,453 ****
!
$GLOBALS['phpgw']->xslttpl->add_file(array('template',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 451,455 ----
! $GLOBALS['phpgw']->xslttpl->add_file(array('template'));
if ($values['save'])
***************
*** 486,491 ****
$data = array
(
- 'appname'
=> lang('Workorder template'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.index&template_id='
. $template_id),
--- 488,491 ----
***************
*** 521,524 ****
--- 521,528 ----
);
+ $appname
= lang('Workorder template');
+ $function_msg =
lang('view ticket detail');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_template' => $data));
}
***************
*** 533,537 ****
$values['ns3420_descr'] =
get_var('ns3420_descr',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('template',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 537,541 ----
$values['ns3420_descr'] =
get_var('ns3420_descr',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('template'));
if ($values['save'])
***************
*** 578,583 ****
$data = array
(
- 'appname'
=> lang('Template'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.hour&template_id='
. $template_id),
--- 582,585 ----
***************
*** 671,674 ****
--- 673,679 ----
);
+ $appname
= lang('Workorder template');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_hour' => $data));
}
***************
*** 690,700 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('property'),
- 'function_msg' => lang('delete
template'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.delete&id='
. $id),
--- 695,702 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.delete&id='
. $id),
***************
*** 706,709 ****
--- 708,715 ----
);
+ $appname
= lang('Workorder template');
+ $function_msg =
lang('delete template');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uitts.inc.php 12 Apr 2003 17:55:03 -0000 1.16
--- class.uitts.inc.php 23 Apr 2003 07:21:34 -0000 1.17
***************
*** 73,77 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 73,76 ----
***************
*** 218,223 ****
'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index'),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list ticket'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the ticket belongs to. To do not use a category
select NO CATEGORY'),
--- 217,220 ----
***************
*** 238,241 ****
--- 235,242 ----
);
+ $appname
= lang('helpdesk');
+ $function_msg =
lang('list ticket');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 245,249 ****
{
!
$GLOBALS['phpgw']->xslttpl->add_file(array('tts',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$values = get_var('values',array('POST'));
--- 246,250 ----
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('tts'));
$values = get_var('values',array('POST'));
***************
*** 336,342 ****
'priority_list'
=> $this->bo->get_priority_list($values['priority']),
- 'appname'
=> lang($this->currentapp),
-
- 'function_msg'
=> lang('add ticket'),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.index&sub='
. $sub),
--- 337,340 ----
***************
*** 365,368 ****
--- 363,370 ----
//_debug_array($data);
+ $appname
= lang('helpdesk');
+ $function_msg =
lang('add ticket');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('add'
=> $data));
}
***************
*** 385,395 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('building'),
- 'function_msg' => lang('delete
building'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.delete&property_id='
. $property_id.'&building_id=' . $building_id),
--- 387,394 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.delete&property_id='
. $property_id.'&building_id=' . $building_id),
***************
*** 401,404 ****
--- 400,407 ----
);
+ $appname
= lang('helpdesk');
+ $function_msg =
lang('delete ticket');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 410,414 ****
$values = get_var('values',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('tts',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if($values['save'])
--- 413,417 ----
$values = get_var('values',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('tts'));
if($values['save'])
***************
*** 562,567 ****
'lang_generate_order_statustext'
=> lang('Klick this to generate an order with this information'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('view ticket detail'),
'lang_save'
=> lang('save'),
'lang_name'
=> lang('name'),
--- 565,568 ----
***************
*** 569,572 ****
--- 570,577 ----
);
+ $appname
= lang('helpdesk');
+ $function_msg =
lang('view ticket detail');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uiwo_hour.inc.php 10 Apr 2003 10:14:27 -0000 1.12
--- class.uiwo_hour.inc.php 23 Apr 2003 07:21:34 -0000 1.13
***************
*** 216,221 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
!
'menu',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$values =
get_var('values',array('POST'));
--- 216,220 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
!
'menu'));
$values =
get_var('values',array('POST'));
***************
*** 239,244 ****
'error'
=> $receipt['error'],
'message'
=> $receipt['message'],
- 'appname'
=> lang('Workorder'),
- 'function_msg'
=> lang('Add template'),
'done_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'add_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.save_template&workorder_id='
. $workorder_id),
--- 238,241 ----
***************
*** 265,268 ****
--- 262,269 ----
);
+ $appname
= lang('Workorder');
+ $function_msg =
lang('Add template');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('add_template' => $data));
}
***************
*** 272,277 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
!
'menu',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
--- 273,277 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
!
'menu'));
***************
*** 333,338 ****
'lang_total_records' =>
lang('Total records'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list hours'),
'total_hours_records' =>
$common_data['total_hours_records'],
'lang_total_records' =>
lang('Total records'),
--- 333,336 ----
***************
*** 346,349 ****
--- 344,351 ----
//_debug_array($data);
+ $appname
= lang('Workorder');
+ $function_msg =
lang('list hours');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_hour' => $data));
$this->save_sessiondata();
***************
*** 355,360 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
'menu',
!
'headonly',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$show_cost =
get_var('show_cost',array('POST','GET'));
--- 357,361 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
'menu',
!
'headonly'));
$show_cost =
get_var('show_cost',array('POST','GET'));
***************
*** 581,586 ****
'error'
=> $receipt['error'],
'message'
=> $receipt['message'],
- 'appname'
=> lang(Workorder),
- 'function_msg'
=> lang('Send order'),
'lang_mail'
=> lang('E-Mail'),
'lang_update_email'
=> lang('Update email'),
--- 582,585 ----
***************
*** 605,608 ****
--- 604,611 ----
//_debug_array($data);
+ $appname
= lang('Workorder');
+ $function_msg =
lang('Send order');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
***************
*** 733,737 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 736,739 ----
***************
*** 895,900 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data_nextmatch),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list prizebook'),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
--- 897,900 ----
***************
*** 914,917 ****
--- 914,921 ----
);
+ $appname
= lang('pricebook');
+ $function_msg =
lang('list pricebook');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('prizebook' => $data));
$this->save_sessiondata();
***************
*** 924,928 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 928,931 ----
***************
*** 1116,1121 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data_nextmatch),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list template'),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
--- 1119,1122 ----
***************
*** 1136,1139 ****
--- 1137,1144 ----
//_debug_array($data);
+ $appname
= lang('Template');
+ $function_msg =
lang('list template');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_template_hour' =>
$data));
$this->save_sessiondata();
***************
*** 1155,1159 ****
!
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
if ($values['save'])
--- 1160,1164 ----
! $GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour'));
if ($values['save'])
***************
*** 1205,1210 ****
$data = array
(
- 'appname'
=> lang('Workorder'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.'
. $from . '&workorder_id=' . $workorder_id . '&template_id=' . $template_id),
--- 1210,1213 ----
***************
*** 1303,1306 ****
--- 1306,1312 ----
);
+ $appname
= lang('Workorder');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_hour' => $data));
}
***************
*** 1322,1332 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('workorder'),
- 'function_msg' => lang('delete
workorder'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.delete&id='
. $id),
--- 1328,1335 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.delete&id='
. $id),
***************
*** 1338,1341 ****
--- 1341,1348 ----
);
+ $appname
= lang('workorder');
+ $function_msg =
lang('delete workorder');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uiworkorder.inc.php 10 Apr 2003 10:14:27 -0000 1.12
--- class.uiworkorder.inc.php 23 Apr 2003 07:21:34 -0000 1.13
***************
*** 75,79 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 75,78 ----
***************
*** 215,220 ****
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('list workorder'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the workorder belongs to. To do not use a category
select NO CATEGORY'),
--- 214,217 ----
***************
*** 242,245 ****
--- 239,246 ----
);
+ $appname
= lang('Workorder');
+ $function_msg =
lang('list workorder');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_workorder' => $data));
$this->save_sessiondata();
***************
*** 252,256 ****
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$values['vendor_id'] =
get_var('vendor_id',array('POST'));
--- 253,257 ----
$values =
get_var('values',array('POST'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder'));
$values['vendor_id'] =
get_var('vendor_id',array('POST'));
***************
*** 505,510 ****
'location_data'
=> $location_data,
'location_type'
=> 'view',
- 'appname'
=> lang('workorder'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index'),
--- 506,509 ----
***************
*** 584,587 ****
--- 583,590 ----
);
+ $appname
= lang('Workorder');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
***************
*** 597,607 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder',
'menu',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
$data = array
(
- 'appname' =>
lang('Workorder'),
- 'function_msg' => lang('Add
workorder'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit'),
--- 600,607 ----
***************
*** 617,620 ****
--- 617,624 ----
);
+ $appname
= lang('Workorder');
+ $function_msg =
lang('Add workorder');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('add'
=> $data));
}
***************
*** 636,646 ****
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$data = array
(
- 'appname' =>
lang('workorder'),
- 'function_msg' => lang('delete
workorder'),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.delete&id='
. $id),
--- 640,647 ----
}
!
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.delete&id='
. $id),
***************
*** 652,655 ****
--- 653,660 ----
);
+ $appname
= lang('workorder');
+ $function_msg =
lang('delete workorder');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
***************
*** 659,663 ****
$id = get_var('id',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$this->config->read_repository();
--- 664,668 ----
$id = get_var('id',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder'));
$this->config->read_repository();
***************
*** 754,759 ****
'location_data'
=> $location_data,
'location_type'
=> 'view',
- 'appname'
=> lang('Workorder'),
- 'function_msg'
=> $function_msg,
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index'),
'lang_year'
=> lang('Year'),
--- 759,762 ----
***************
*** 805,809 ****
'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
);
! //_debug_array($this->bo->select_key_location_list($values['key_fetch']));
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
--- 808,815 ----
'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
);
!
! $appname
= lang('Workorder');
!
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uiXport.inc.php 31 Mar 2003 21:14:14 -0000 1.16
--- class.uiXport.inc.php 23 Apr 2003 07:21:34 -0000 1.17
***************
*** 259,269 ****
'message'
=> $message,
'error'
=> $error,
- 'appname'
=> lang('invoice'),
- 'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'cancel_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index&sub='.$sub),
'lang_cancel'
=> lang('Cancel'),
'lang_cancel_statustext' =>
lang('cancel the import'),
- 'function_msg'
=> lang('Import from CSV'),
'action_url'
=> $GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.import'),
'tsvfilename'
=> '',
--- 259,266 ----
***************
*** 359,365 ****
//_debug_array($data);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
!
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header'));
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('import' => $data));
}
--- 356,365 ----
//_debug_array($data);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu'));
!
! $appname
= lang('Invoice');
! $function_msg =
lang('Import from CSV');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('import' => $data));
}
***************
*** 463,467 ****
//_debug_array($data);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('debug' => $data));
--- 463,472 ----
//_debug_array($data);
! $GLOBALS['phpgw']->xslttpl->add_file(array('invoice'));
! $appname
= lang('Invoice');
! $function_msg =
lang('Debug');
!
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
!
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('debug' => $data));
***************
*** 471,475 ****
{
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 476,479 ----
***************
*** 518,523 ****
'links'
=> $links,
'error'
=> $receipt['error'],
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('Export invoice'),
'lang_select_conv'
=> lang('Select conversion'),
'conv_list'
=> $this->bo->select_export_conv($values['conv_type']),
--- 522,525 ----
***************
*** 542,545 ****
--- 544,551 ----
//_debug_array($data);
+ $appname
= lang('Invoice');
+ $function_msg =
lang('Export invoice');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('export' => $data));
***************
*** 549,553 ****
{
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 555,558 ----
***************
*** 610,615 ****
'lang_popup_calendar' =>
lang('Popup Calendar'),
'error'
=> $receipt['error'],
- 'appname'
=> lang($this->currentapp),
- 'function_msg'
=> lang('Rollback invoice'),
'lang_select_conv'
=> lang('Select conversion'),
'conv_list'
=> $this->bo->select_export_conv($values['conv_type']),
--- 615,618 ----
***************
*** 640,643 ****
--- 643,651 ----
//_debug_array($data);
+
+ $appname
= lang('Invoice');
+ $function_msg =
lang('Rollback invoice');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('rollback' => $data));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.36,1.37 class.boinvestment.inc.php,1.6,1.7 class.boinvoice.inc.php,1.11,1.12 class.uiadmin.inc.php,1.5,1.6 class.uiapartment.inc.php,1.3,1.4 class.uibuilding.inc.php,1.11,1.12 class.uidrawing.inc.php,1.4,1.5 class.uientrance.inc.php,1.4,1.5class.uiequipment.inc.php,1.12,1.13 class.uiinvestment.inc.php,1.11,1.12 class.uiinvoice.inc.php,1.15,1.16 class.uilookup.inc.php,1.12,1.13 class.uimeter.inc.php,1.1,1.2 class.uipricebook.inc.php,1.5,1.6 class.uiproject.inc.php,1.11,1.12 class.uiproperty.inc.php,1.15,1.16 class.uirequest.inc.php,1.3,1.4 class.uistandard_2.inc.php,1.5,1.6class.uistandard_3.inc.php,1.4,1.5 class.uistandard_entity.inc.php,1.7,1.8 class.uitemplate.inc.php,1.1,1.2 class.uitts.inc.php,1.16,1.17 class.uiwo_hour.inc.php,1.12,1.13 class.uiworkorder.inc.php,1.12,1.13 class.uiXport.inc.php,1.16,1.17,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default admin.xsl,1.4,1.5 apartment.xsl,1.2,1.3 building.xsl,1.6,1.7 drawing.xsl,1.3,1.4 entrance.xsl,1.2,1.3 equipment.xsl,1.8,1.9 investment.xsl,1.6,1.7 invoice.xsl,1.21,1.22 lookup.xsl,1.15,1.16 meter.xsl,1.1,1.2 pricebook.xsl,1.6,1.7 project.xsl,1.6,1.7 property.xsl,1.8,1.9 request.xsl,1.3,1.4 standard_2.xsl,1.3,1.4 standard_3.xsl,1.3,1.4 standard_entity.xsl,1.8,1.9 template.xsl,1.1,1.2 tts.xsl,1.5,1.6 wo_hour.xsl,1.10,1.11 workorder.xsl,1.11,1.12
- Next by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.61,1.62
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default admin.xsl,1.4,1.5 apartment.xsl,1.2,1.3 building.xsl,1.6,1.7 drawing.xsl,1.3,1.4 entrance.xsl,1.2,1.3 equipment.xsl,1.8,1.9 investment.xsl,1.6,1.7 invoice.xsl,1.21,1.22 lookup.xsl,1.15,1.16 meter.xsl,1.1,1.2 pricebook.xsl,1.6,1.7 project.xsl,1.6,1.7 property.xsl,1.8,1.9 request.xsl,1.3,1.4 standard_2.xsl,1.3,1.4 standard_3.xsl,1.3,1.4 standard_entity.xsl,1.8,1.9 template.xsl,1.1,1.2 tts.xsl,1.5,1.6 wo_hour.xsl,1.10,1.11 workorder.xsl,1.11,1.12
- Next by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.61,1.62
- Index(es):