[Phpgroupware-cvs] CVS: property/templates/default header.tpl,1.2,1.3 form_equipment_attribute.tpl,1.1.1.1,1.2 formequipment.tpl,1.1.1.1,1.2 formequipment_type.tpl,1.1.1.1,1.2 formequipment_type_attribute.tpl,1.1.1.1,1.2 list_equipment_type.tpl,1.1.1.1,1.2 list_equipment_type_attribute.tpl,1.1.1.1,1.2 list_workorder.tpl,1.1.1.1,1.2

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/templates/default
In directory subversions:/tmp/cvs-serv30475/templates/default

Modified Files:
        header.tpl form_equipment_attribute.tpl formequipment.tpl 
        formequipment_type.tpl formequipment_type_attribute.tpl 
        list_equipment_type.tpl list_equipment_type_attribute.tpl 
        list_workorder.tpl 
Log Message:
no message

Index: header.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/header.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** header.tpl  2 Sep 2002 22:54:31 -0000       1.2
--- header.tpl  3 Sep 2002 22:15:39 -0000       1.3
***************
*** 31,38 ****
        <tr bgcolor="{tr_color2}" width="100%">
                <td width="100%" align="left">
!                       <a 
href="{sublink_property}{link_equipment_type}{sub_invoice_list}{sub_activities_list}{sub_workorder_list}">{sublang_property}{sublang_equipment_type}{sublang_invoice_list}{sublang_activities_list}{sublang_workorder_list}</a>
                        &nbsp;
                        &nbsp;
!                       <a 
href="{sublink_building}{link_equipment_type_attribute}{sub_invoice_paid}{sub_vendor_activities}{sub_workorder_request}">{sublang_building}{sublang_equipment_type_attribute}{sublang_invoice_paid}{sublang_vendor_activities}{sublang_workorder_request}</a>
                        &nbsp;
                        &nbsp;
--- 31,38 ----
        <tr bgcolor="{tr_color2}" width="100%">
                <td width="100%" align="left">
!                       <a 
href="{sublink_property}{sublink_equipment}{sub_invoice_list}{sub_activities_list}{sub_workorder_list}">{sublang_property}{sublang_equipment}{sublang_invoice_list}{sublang_activities_list}{sublang_workorder_list}</a>
                        &nbsp;
                        &nbsp;
!                       <a 
href="{sublink_building}{sublink_equipment_type}{sub_invoice_paid}{sub_vendor_activities}{sub_workorder_request}">{sublang_building}{sublang_equipment_type}{sublang_invoice_paid}{sublang_vendor_activities}{sublang_workorder_request}</a>
                        &nbsp;
                        &nbsp;

Index: form_equipment_attribute.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/property/templates/default/form_equipment_attribute.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** form_equipment_attribute.tpl        28 Aug 2002 16:43:20 -0000      1.1.1.1
--- form_equipment_attribute.tpl        3 Sep 2002 22:15:39 -0000       1.2
***************
*** 73,77 ****
        <tr bgcolor="{tr_color}">
                <td align="center">{select}</td>
!               <td 
>{e_type_attrib_id}{e_type_attrib_id_h}{equipment_type_id_h}</td>
        <!--    <td>{equipment_type_id}</td> -->
                <td>{attrib_descr}{attrib_descr_h}</td>
--- 73,77 ----
        <tr bgcolor="{tr_color}">
                <td align="center">{select}</td>
!               <td >{attrib_name}{attrib_id_h}{equipment_type_id_h}</td>
        <!--    <td>{equipment_type_id}</td> -->
                <td>{attrib_descr}{attrib_descr_h}</td>

Index: formequipment.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/formequipment.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** formequipment.tpl   28 Aug 2002 16:43:19 -0000      1.1.1.1
--- formequipment.tpl   3 Sep 2002 22:15:39 -0000       1.2
***************
*** 77,80 ****
--- 77,83 ----
                <td><input type="button" value="{lang_apartment}" 
onClick="leilighet();"></td>
                <td><input type="text" name="leie_id" size="4" 
value="{leie_id}" readonly>&nbsp;{lang_apartment}</td>
+               <input type="hidden" name="tenant_name">
+               <input type="hidden" name="tenant_id">
+               <input type="hidden" name="el_meter_id">
        </tr>
        <tr>

Index: formequipment_type.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/property/templates/default/formequipment_type.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** formequipment_type.tpl      28 Aug 2002 16:43:19 -0000      1.1.1.1
--- formequipment_type.tpl      3 Sep 2002 22:15:39 -0000       1.2
***************
*** 9,14 ****
        
        <tr>
!               <td>{lang_equipment_type_id}:</td>
!               <td><input type="text" name="num" 
value="{equipment_type_id}"></td>
        </tr>
        <tr>
--- 9,14 ----
        
        <tr>
!               <td>{lang_name}:</td>
!               <td><input type="text" name="name" value="{name}"></td>
        </tr>
        <tr>

Index: formequipment_type_attribute.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/property/templates/default/formequipment_type_attribute.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** formequipment_type_attribute.tpl    28 Aug 2002 16:43:19 -0000      1.1.1.1
--- formequipment_type_attribute.tpl    3 Sep 2002 22:15:39 -0000       1.2
***************
*** 9,14 ****
        
        <tr>
!               <td>{lang_e_type_attrib_id}:</td>
!               <td><input type="text" name="e_type_attrib_id" 
value="{e_type_attrib_id}"></td>
        </tr>
        <tr>
--- 9,14 ----
        
        <tr>
!               <td>{lang_name}:</td>
!               <td><input type="text" name="name" value="{name}"></td>
        </tr>
        <tr>
***************
*** 32,38 ****
        <tr valign="bottom">
                <td height="50" align="center"><input type="submit" 
name="submit" value="{lang_add}"></td>
!               <td height="50" align="center"><input type="reset" name="reset" 
value="{lang_reset}"></form></td>
                <td height="50" align="center">
                        <form method="POST" action="{done_url}">
                        <input type="submit" name="done" 
value="{lang_done}"></form></td>
        </tr>
--- 32,40 ----
        <tr valign="bottom">
                <td height="50" align="center"><input type="submit" 
name="submit" value="{lang_add}"></td>
!               <td height="50" align="center"><input type="reset" name="reset" 
value="{lang_reset}">
!               </form></td>
                <td height="50" align="center">
                        <form method="POST" action="{done_url}">
+                       {hidden_vars}
                        <input type="submit" name="done" 
value="{lang_done}"></form></td>
        </tr>
***************
*** 54,57 ****
--- 56,60 ----
                <td height="50" align="center">
                        <form method="POST" action="{done_url}">
+                       {hidden_vars}
                        <input type="submit" name="done" 
value="{lang_done}"></form></td>
        </tr>

Index: list_equipment_type.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/property/templates/default/list_equipment_type.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** list_equipment_type.tpl     28 Aug 2002 16:43:20 -0000      1.1.1.1
--- list_equipment_type.tpl     3 Sep 2002 22:15:39 -0000       1.2
***************
*** 24,29 ****
        </tr>
        <tr bgcolor="{th_bg}">
!               <td width="8%" bgcolor="{th_bg}">{sort_equipment_type_id}</td>
                <td width="30%" bgcolor="{th_bg}">{sort_type_descr}</td>
                <td width="8%" bgcolor="{th_bg}" align="center">{lang_edit}</td>
                <td width="8%" bgcolor="{th_bg}" 
align="center">{lang_delete}</td>
--- 24,30 ----
        </tr>
        <tr bgcolor="{th_bg}">
!               <td width="8%" bgcolor="{th_bg}">{sort_name}</td>
                <td width="30%" bgcolor="{th_bg}">{sort_type_descr}</td>
+               <td width="8%" bgcolor="{th_bg}">{lang_attributes}</td>
                <td width="8%" bgcolor="{th_bg}" align="center">{lang_edit}</td>
                <td width="8%" bgcolor="{th_bg}" 
align="center">{lang_delete}</td>
***************
*** 33,40 ****
  
        <tr bgcolor="{tr_color}">
!               <td>{equipment_type_id}</td>
                <td>{type_descr}</td>
                <td align="center"><a href="{edit}">{lang_edit}</a></td>
                <td align="center"><a href="{delete}">{lang_delete}</a></td>
        </tr>
  
--- 34,44 ----
  
        <tr bgcolor="{tr_color}">
!               <td>{name}</td>
                <td>{type_descr}</td>
+               <td align="center"><a 
href="{attributes}">{lang_attributes}</a></td>
                <td align="center"><a href="{edit}">{lang_edit}</a></td>
                <td align="center"><a href="{delete}">{lang_delete}</a></td>
+               
+               
        </tr>
  
***************
*** 47,52 ****
                        {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,57 ----
                        {hidden_vars}
                        <input type="submit" name="Add" 
value="{lang_add}"></form></td>
!               <!-- <td><form method="POST" action="{done_url}"> 
!                                       {hidden_vars}
!                       <input type="submit" name="Add" 
value="{lang_done}"></form></td>-->
        </tr>
  </table>

Index: list_equipment_type_attribute.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/property/templates/default/list_equipment_type_attribute.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** list_equipment_type_attribute.tpl   28 Aug 2002 16:43:20 -0000      1.1.1.1
--- list_equipment_type_attribute.tpl   3 Sep 2002 22:15:39 -0000       1.2
***************
*** 24,29 ****
        </tr>
        <tr bgcolor="{th_bg}">
!               <td width="8%" bgcolor="{th_bg}">{sort_equipment_type_id}</td>
!               <td width="8%" bgcolor="{th_bg}">{sort_e_type_attrib_id}</td>
                <td width="30%" bgcolor="{th_bg}">{sort_attrib_descr}</td>
                <td width="3%" bgcolor="{th_bg}">{lang_datatype}</td>
--- 24,29 ----
        </tr>
        <tr bgcolor="{th_bg}">
!               <td width="8%" bgcolor="{th_bg}">{sort_equipment_type}</td>
!               <td width="8%" bgcolor="{th_bg}">{sort_attribute_name}</td>
                <td width="30%" bgcolor="{th_bg}">{sort_attrib_descr}</td>
                <td width="3%" bgcolor="{th_bg}">{lang_datatype}</td>
***************
*** 35,40 ****
  
        <tr bgcolor="{tr_color}">
!               <td>{equipment_type_id}</td>
!               <td>{e_type_attrib_id}</td>
                <td>{attrib_descr}</td>
                <td>{datatype}</td>
--- 35,40 ----
  
        <tr bgcolor="{tr_color}">
!               <td>{equipment_type}</td>
!               <td>{attrib_name}</td>
                <td>{attrib_descr}</td>
                <td>{datatype}</td>

Index: list_workorder.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/list_workorder.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** list_workorder.tpl  28 Aug 2002 16:43:21 -0000      1.1.1.1
--- list_workorder.tpl  3 Sep 2002 22:15:39 -0000       1.2
***************
*** 11,20 ****
                <td width="33%" align="left">
                        <form action="{cat_url}" name="form" method="POST">
                        {lang_category}&nbsp;&nbsp;<select name="cat_id" 
onChange="this.form.submit();"><option 
value="">{lang_all}</option>{category_list}</select>
!                       <noscript>&nbsp;<input type="submit" name="submit" 
value="{lang_submit}"></noscript></form></td>
                <td width="33%" align="left">
                        <form action="{coordinator_url}" 
name="form_coordiantor" method="POST">
                        {lang_coordinator}&nbsp;&nbsp;<select 
name="coordinator_id" onChange="this.form.submit();"><option 
value="">{lang_none}</option>{coordinator_list}</select>
!                       <noscript>&nbsp;<input type="submit" name="submit" 
value="{lang_submit}"></noscript></form></td>
                
                <td width="33%" align="left">
--- 11,24 ----
                <td width="33%" align="left">
                        <form action="{cat_url}" name="form" method="POST">
+                       {hidden_vars}
                        {lang_category}&nbsp;&nbsp;<select name="cat_id" 
onChange="this.form.submit();"><option 
value="">{lang_all}</option>{category_list}</select>
!                       <noscript>&nbsp;<input type="submit" name="submit" 
value="{lang_submit}"></noscript>
!                       </form></td>
                <td width="33%" align="left">
                        <form action="{coordinator_url}" 
name="form_coordiantor" method="POST">
+                       {hidden_vars}
                        {lang_coordinator}&nbsp;&nbsp;<select 
name="coordinator_id" onChange="this.form.submit();"><option 
value="">{lang_none}</option>{coordinator_list}</select>
!                       <noscript>&nbsp;<input type="submit" name="submit" 
value="{lang_submit}"></noscript>
!                       </form></td>
                
                <td width="33%" align="left">