[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/templates/default header.tpl,1.5,1.6 ad
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/templates/default header.tpl,1.5,1.6 add_st_hours.tpl,1.1.1.1,1.2 add_st_hours_list.tpl,1.1.1.1,1.2 event_equipment.tpl,1.1.1.1,1.2 form_template_hours.tpl,1.1.1.1,1.2 hours_formhours.tpl,1.1.1.1,1.2 list_wo_template.tpl,1.1.1.1,1.2 list_wo_template_hours.tpl,1.1.1.1,1.2 list_property_value.tpl,1.1,1.2 |
|
Date: |
Mon, 16 Sep 2002 12:05:46 -0400 |
Update of /cvsroot/phpgroupware/property/templates/default
In directory subversions:/tmp/cvs-serv12273/templates/default
Modified Files:
header.tpl add_st_hours.tpl add_st_hours_list.tpl
event_equipment.tpl form_template_hours.tpl
hours_formhours.tpl list_wo_template.tpl
list_wo_template_hours.tpl list_property_value.tpl
Log Message:
no message
Index: header.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/header.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** header.tpl 9 Sep 2002 17:45:18 -0000 1.5
--- header.tpl 16 Sep 2002 16:05:43 -0000 1.6
***************
*** 40,44 ****
! <a
href="{sublink_apartment}{sub_invoice_consume}">{sublang_apartment}{sublang_invoice_consume}</a>
--- 40,44 ----
! <a
href="{sublink_apartment}{sub_workorder_template}{sub_invoice_consume}">{sublang_apartment}{sublang_workorder_template}{sublang_invoice_consume}</a>
Index: add_st_hours.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/add_st_hours.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_st_hours.tpl 28 Aug 2002 16:43:19 -0000 1.1.1.1
--- add_st_hours.tpl 16 Sep 2002 16:05:43 -0000 1.2
***************
*** 52,55 ****
--- 52,56 ----
<td width="15%" bgcolor="{th_bg}" align="center"><font
face="{font}">{sort_template}</font></td>
<td width="15%" bgcolor="{th_bg}" align="center"><font
face="{font}">{sort_descr}</font></td>
+ <td width="8%" bgcolor="{th_bg}" align="center"><font
face="{font}">{lang_chapter}</font></td>
<td width="1%" bgcolor="{th_bg}" align="center"><font
face="{font}">{lang_select}</font></td>
</tr>
***************
*** 63,66 ****
--- 64,68 ----
<td><font face="{font}">{template}</font></td>
<td><font face="{font}">{descr}</font></td>
+ <td><font face="{font}">{chapter}</td>
<td align=left><font face="{font}"><input type="submit"
value="{lang_select}" name="add"></td>
</font></form>
***************
*** 68,72 ****
<!-- END st_hours_list -->
-
</table>
<table cellpadding="2" cellspacing="2">
--- 70,73 ----
Index: add_st_hours_list.tpl
===================================================================
RCS file:
/cvsroot/phpgroupware/property/templates/default/add_st_hours_list.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_st_hours_list.tpl 28 Aug 2002 16:43:19 -0000 1.1.1.1
--- add_st_hours_list.tpl 16 Sep 2002 16:05:43 -0000 1.2
***************
*** 8,11 ****
--- 8,31 ----
</script>-->
+ <script>
+ function check_all(which)
+ {
+ for (i=0; i<document.form.elements.length; i++)
+ {
+ if (document.form.elements[i].type == "checkbox" &&
document.form.elements[i].name.substring(0,which.length) == which)
+ {
+ if (document.form.elements[i].checked)
+ {
+ document.form.elements[i].checked = false;
+ }
+ else
+ {
+ document.form.elements[i].checked = true;
+ }
+ }
+ }
+ }
+ </script>
+
<p><b> {lang_action}</b><br>
<!--<hr noshade width="98%" align="center" size="1"> -->
***************
*** 13,17 ****
{error}{message}
<table width="75%" border="0" cellspacing="2" cellpadding="2">
! <form method="POST" name="wrkorders_form" action="{actionurl}">
{hidden_vars}
<tr>
--- 33,37 ----
{error}{message}
<table width="75%" border="0" cellspacing="2" cellpadding="2">
! <form method="POST" name="form" action="{actionurl}">
{hidden_vars}
<tr>
***************
*** 35,43 ****
<tr>
<td>{lang_chapter_list}:</td>
! <td><select
name="chapter">{chapter_list}</select> ({lang_if_tender})</td>
</tr>
<tr>
<td>{lang_grouping}:</td>
! <td><select
name="group_exist">{grouping_list}</select> ({lang_if_group_exists})</td>
</tr>
<tr>
--- 55,63 ----
<tr>
<td>{lang_chapter_list}:</td>
! <td><select name="chapter"><option value=
"">{lang_select}</option>{chapter_list}</select> ({lang_if_tender})</td>
</tr>
<tr>
<td>{lang_grouping}:</td>
! <td><select name="group_exist"><option value=
"">{lang_select}</option>{grouping_list}</select> ({lang_if_group_exists})</td>
</tr>
<tr>
***************
*** 92,104 ****
<!-- BEGIN wrkorderhours_list -->
!
<tr bgcolor="{tr_color}">
<td align="center">{select}{activity_id_h}</td>
<td>{building_part}{building_part_h}</td>
! <td>{ns3420_id}{st_hour_id_h}</td>
<td>{descr}{descr_h}{remark}</td>
<td align="center">{unit}{unit_h}</td>
<td align="center">{quantity}</td>
! <td>{billperae}{billperae_h}</td>
<!-- <td align="center">{account}{account_h}</td>
<td align="center"><a
href="{editactivity}">{lang_edit_activity}</a></td> -->
--- 112,124 ----
<!-- BEGIN wrkorderhours_list -->
! {grouping_descr_separator}
<tr bgcolor="{tr_color}">
<td align="center">{select}{activity_id_h}</td>
<td>{building_part}{building_part_h}</td>
! <td>{ns3420_id}{st_hour_id_h}{tolerance_h}</td>
<td>{descr}{descr_h}{remark}</td>
<td align="center">{unit}{unit_h}</td>
<td align="center">{quantity}</td>
! <td>{billperae}{billperae_h}{grouping_descr_h}{dim_d_h}</td>
<!-- <td align="center">{account}{account_h}</td>
<td align="center"><a
href="{editactivity}">{lang_edit_activity}</a></td> -->
***************
*** 106,109 ****
--- 126,133 ----
<!-- END wrkorderhours_list -->
+
+ <td bgcolor="{bg_color}" align="center">
+ <a href="javascript:check_all('select')"><img
src="templates/default/images/{check}" border="0" height="16" width="21"
alt="{select_all}"></a>
+ </td>
<!---------------------------- end calculate------------------>
Index: event_equipment.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/event_equipment.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** event_equipment.tpl 28 Aug 2002 16:43:19 -0000 1.1.1.1
--- event_equipment.tpl 16 Sep 2002 16:05:43 -0000 1.2
***************
*** 37,42 ****
<tr>
<td width="33%" align="left">
! <form action="{cats_action}" name="form" method="POST">
! {lang_category} <select name="cat_id"
onChange="this.form.submit();"><option
value="">{lang_all}</option>{cats_list}</select>
<noscript> <input type="submit" name="submit"
value="{lang_submit}"></noscript></form></td>
<td width="33%" align="center">{lang_showing}</td>
--- 37,42 ----
<tr>
<td width="33%" align="left">
! <form action="{equipmenturl}" name="form" method="POST">
! {lang_equipment_type} <select
name="equipment_type_id" onChange="this.form.submit();"><option
value="">{lang_all}</option>{equipment_type_list}</select>
<noscript> <input type="submit" name="submit"
value="{lang_submit}"></noscript></form></td>
<td width="33%" align="center">{lang_showing}</td>
Index: form_template_hours.tpl
===================================================================
RCS file:
/cvsroot/phpgroupware/property/templates/default/form_template_hours.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** form_template_hours.tpl 28 Aug 2002 16:43:20 -0000 1.1.1.1
--- form_template_hours.tpl 16 Sep 2002 16:05:43 -0000 1.2
***************
*** 16,19 ****
--- 16,36 ----
{hidden_vars}
<tr>
+ <td>{lang_template}:</td>
+ <td>{template_selected}</td>
+ </tr>
+ <tr>
+ <td>{lang_chapter_list}:</td>
+ <td><select name="chapter"><option value=
"">{lang_select}</option>{chapter_list}</select> ({lang_if_tender})</td>
+ </tr>
+ <tr>
+ <td>{lang_grouping}:</td>
+ <td><select name="group_exist"><option value=
"">{lang_select}</option>{grouping_list}</select> ({lang_if_group_exists})</td>
+ </tr>
+ <tr>
+ <td>{lang_new_grouping}:</td>
+ <td><input type="text" name="new_group_descr" size="50"
value="" ></td>
+ </tr>
+
+ <tr>
<td>{lang_building_part_list}:</td>
<td><select
name="building_part">{building_part_list}</select></td>
***************
*** 27,35 ****
--- 44,76 ----
<tr>
+ <td>{lang_tolerance}:</td>
+ <td><select name="tolerance">{tolerance_list}</select></td>
+ </tr>
+ <tr>
<td>{lang_unit}:</td>
<td><select name="unit">{unit_list}</select></td>
</tr>
+ <tr>
+ <td>{lang_dim_d_list}:</td>
+ <td><select name="dim_d"><option value=
"">{lang_select}</option>{dim_d_list}</select></td>
+ </tr>
+
+
+
+ <tr>
+ <td>{lang_quantity}:</td>
+ <td><input type="text" name="quantity" size="8"
value="{quantity}"></td>
+ </tr>
+
+ <tr>
+ <td>{lang_billperae} [{currency}]:</td>
+ <td><input type="text" name="billperae" size="8"
value="{billperae}"></td>
+ </tr>
+ <tr>
+ <td>{lang_cost}:</td>
+ <td><input type="text" name="cost" size="8"
value=""> ({lang_override_calculation})</td>
+ </tr>
<tr>
Index: hours_formhours.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/hours_formhours.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hours_formhours.tpl 28 Aug 2002 16:43:20 -0000 1.1.1.1
--- hours_formhours.tpl 16 Sep 2002 16:05:43 -0000 1.2
***************
*** 21,29 ****
<tr>
<td>{lang_chapter_list}:</td>
! <td><select
name="chapter">{chapter_list}</select> ({lang_if_tender})</td>
</tr>
<tr>
<td>{lang_grouping}:</td>
! <td><select
name="group_exist">{grouping_list}</select> ({lang_if_group_exists})</td>
</tr>
<tr>
--- 21,29 ----
<tr>
<td>{lang_chapter_list}:</td>
! <td><select name="chapter"><option value=
"">{lang_select}</option>{chapter_list}</select> ({lang_if_tender})</td>
</tr>
<tr>
<td>{lang_grouping}:</td>
! <td><select name="group_exist"><option value=
"">{lang_select}</option>{grouping_list}</select> ({lang_if_group_exists})</td>
</tr>
<tr>
***************
*** 33,37 ****
<tr>
<td>{lang_building_part_list}:</td>
! <td><select
name="building_part">{building_part_list}</select></td>
</tr>
--- 33,37 ----
<tr>
<td>{lang_building_part_list}:</td>
! <td><select name="building_part"><option value=
"">{lang_select}</option>{building_part_list}</select></td>
</tr>
***************
*** 42,46 ****
</tr>
<tr>
!
<td>{lang_unit}:</td>
<td><select name="unit">{unit_list}</select></td>
--- 42,49 ----
</tr>
<tr>
! <td>{lang_tolerance}:</td>
! <td><select name="tolerance">{tolerance_list}</select></td>
! </tr>
! <tr>
<td>{lang_unit}:</td>
<td><select name="unit">{unit_list}</select></td>
***************
*** 70,122 ****
<td colspan="2"><textarea name="remark" rows="5" cols="50"
wrap="VIRTUAL">{remark}</textarea></td>
</tr>
- <!-- <tr>
- <td height="35"><b>{lang_work_date}</b></td>
- <td> </td>
- </tr>
- <tr>
- <td>{lang_start_date}:</td>
- <td>{start_date_select}</td>
- </tr>
- <tr>
- <td>{lang_end_date}:</td>
- <td>{end_date_select}</td>
- </tr>
- <tr>
- <td height="35"><b>{lang_work_time}</b></td>
- <td> </td>
- </tr>
- <tr>
- <td>{lang_start_time}:</td>
- <td>
- <input type="text" name="shour" value="{shour}" size=3
maxlength=2>
- <input type="text" name="smin" value="{smin}" size=3
maxlength=2>
- {sradio}
- </td>
- </tr>
- <tr>
- <td>{lang_end_time}:</td>
- <td>
- <input type="text" name="ehour" value="{ehour}" size=3
maxlength=2>
- <input type="text" name="emin" value="{emin}" size=3
maxlength=2>
- {eradio}
- </td>
- </tr>
-
- <tr>
- <td>{lang_hours}:</td>
- <td>
- <input type="text" name="hours" value="{hours}" size=3
maxlength=2>
- <input type="text" name="minutes" value="{minutes}"
size=3 maxlength=2>
- </td>
- </tr>
- <tr>
- <td>{lang_status}:</td>
- <td><select name="status">{status_list}</select></td>
- </tr>
- <tr>
- <td>{lang_employee}:</td>
- <td><select name="employee">{employee_list}</select></td>
- </tr>
- -->
</table>
--- 73,76 ----
Index: list_wo_template.tpl
===================================================================
RCS file:
/cvsroot/phpgroupware/property/templates/default/list_wo_template.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** list_wo_template.tpl 28 Aug 2002 16:43:21 -0000 1.1.1.1
--- list_wo_template.tpl 16 Sep 2002 16:05:43 -0000 1.2
***************
*** 51,56 ****
{hidden_vars}
<input type="submit" name="Add"
value="{lang_add}"></form></td>
! <td><form method="POST" action="{done_url}">
! <input type="submit" name="Add"
value="{lang_done}"></form></td>
</tr>
</table>
--- 51,56 ----
{hidden_vars}
<input type="submit" name="Add"
value="{lang_add}"></form></td>
! <!-- <td><form method="POST" action="{done_url}">
! <input type="submit" name="Add"
value="{lang_done}"></form></td> -->
</tr>
</table>
Index: list_wo_template_hours.tpl
===================================================================
RCS file:
/cvsroot/phpgroupware/property/templates/default/list_wo_template_hours.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** list_wo_template_hours.tpl 28 Aug 2002 16:43:21 -0000 1.1.1.1
--- list_wo_template_hours.tpl 16 Sep 2002 16:05:43 -0000 1.2
***************
*** 1,4 ****
<!-- $Id$ -->
! <p><b> {lang_action}: {template}</b><br>
<hr noshade width="98%" align="center" size="1">
<center>
--- 1,4 ----
<!-- $Id$ -->
! <p><b> {lang_action}: {template} -
[{chapter}]</b><br>
<hr noshade width="98%" align="center" size="1">
<center>
***************
*** 29,32 ****
--- 29,35 ----
<td width="30%" bgcolor="{th_bg}">{lang_descr}</td>
<td width="3%" bgcolor="{th_bg}">{lang_unit}</td>
+ <td width="3%" bgcolor="{th_bg}">{lang_billperae}</td>
+ <td width="3%" bgcolor="{th_bg}">{lang_quantity}</td>
+ <td width="3%" bgcolor="{th_bg}">{lang_cost}</td>
<td width="30%" bgcolor="{th_bg}">{lang_remark}</td>
<td width="8%" bgcolor="{th_bg}"
align="center">{lang_edit}</td>
***************
*** 35,39 ****
<!-- BEGIN wo_template_hours_list -->
!
<tr bgcolor="{tr_color}">
<td>{building_part}</td>
--- 38,42 ----
<!-- BEGIN wo_template_hours_list -->
! {grouping_descr}
<tr bgcolor="{tr_color}">
<td>{building_part}</td>
***************
*** 41,44 ****
--- 44,50 ----
<td>{descr}</td>
<td>{unit}</td>
+ <td>{billperae}</td>
+ <td>{quantity}</td>
+ <td>{cost}</td>
<td>{remark}</td>
<td align="center"><a href="{edit}">{lang_edit}</a></td>
***************
*** 47,50 ****
--- 53,65 ----
<!-- END wo_template_hours_list -->
+ <tr>
+ <td>
</td><td></td><td>{lang_sum_calculation}</td><td></td><td></td><td></td><td
align="right">{sum_cost} </td>
+ <tr>
+ <td>
</td><td></td><td>{lang_sum_tax}<td></td></td><td></td><td></td><td
align="right">{sum_tax} <hr></td>
+ </tr>
+ <tr>
+ <td><b>
</b></td><td><td>{lang_sum_total}</td></td><td></td><td></td><td></td><td
align="right">
+ <p align="right"><b>{sum_total} </b></td>
+ </tr>
</table>
Index: list_property_value.tpl
===================================================================
RCS file:
/cvsroot/phpgroupware/property/templates/default/list_property_value.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** list_property_value.tpl 9 Sep 2002 17:46:09 -0000 1.1
--- list_property_value.tpl 16 Sep 2002 16:05:43 -0000 1.2
***************
*** 60,63 ****
--- 60,64 ----
<noscript> <input type="submit" name="submit"
value="{lang_submit}"></noscript></form></td>
</tr></table>
+
<form action="{actionurl}" name="form_vendor_activity" method="POST">
<tr bgcolor="{th_bg}">
***************
*** 70,73 ****
--- 71,75 ----
<td width="20%" bgcolor="{th_bg}"
align="left">{lang_objektnavn}</td>
<td width="4%" bgcolor="{th_bg}">{lang_value}</td>
+ <td width="8%" bgcolor="{th_bg}">{lang_date}</td>
<td width="5%" bgcolor="{th_bg}"
align="right">{lang_last_index}</td>
<td width="2%" bgcolor="{th_bg}"
align="right">{lang_index_count}</td>
***************
*** 77,81 ****
<!-- BEGIN property_list -->
! <tr bgcolor="{tr_color}">
<td>{omraade_id}</td>
<td>{bydel}</td>
--- 79,83 ----
<!-- BEGIN property_list -->
! <tr bgcolor="{tr_color}">
<td>{omraade_id}</td>
<td>{bydel}</td>
***************
*** 86,89 ****
--- 88,92 ----
<td align="left">{objektnavn}</td>
<td align="right">{value}{value_h}</td>
+ <td align="right"><font size=1>{date}</font></td>
<td align="right">{this_index}</td>
<td align="right">{index_count}</td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/templates/default header.tpl,1.5,1.6 add_st_hours.tpl,1.1.1.1,1.2 add_st_hours_list.tpl,1.1.1.1,1.2 event_equipment.tpl,1.1.1.1,1.2 form_template_hours.tpl,1.1.1.1,1.2 hours_formhours.tpl,1.1.1.1,1.2 list_wo_template.tpl,1.1.1.1,1.2 list_wo_template_hours.tpl,1.1.1.1,1.2 list_property_value.tpl,1.1,1.2,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.9,1.10 class.fm_wrkorder.inc.php,1.4,1.5
- Next by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.9,1.10 setup.inc.php,1.7,1.8 tables_update.inc.php,1.7,1.8 phpgw_no.lang,1.1.1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.9,1.10 class.fm_wrkorder.inc.php,1.4,1.5
- Next by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.9,1.10 setup.inc.php,1.7,1.8 tables_update.inc.php,1.7,1.8 phpgw_no.lang,1.1.1.1,1.2
- Index(es):