phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: projects/templates/default list_budget.tpl,1.1,1


From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] CVS: projects/templates/default list_budget.tpl,1.1,1.2 list_pcosts.tpl,1.1,1.2 addressbook.tpl,1.15,1.16 archive.tpl,1.6,1.7 bill_list.tpl,1.14,1.15 bill_listhours.tpl,1.21,1.22 bill_listinvoice.tpl,1.11,1.12 del_listhours.tpl,1.17,1.18 delete.tpl,1.10,1.11 form.tpl,1.34,1.35 form_admin.tpl,1.4,1.5 formactivity.tpl,1.15,1.16 header.tpl,1.17,1.18 hours_formhours.tpl,1.21,1.22 hours_listhours.tpl,1.17,1.18 hours_view.tpl,1.6,1.7 list.tpl,1.27,1.28 list_admin.tpl,1.7,1.8 listactivities.tpl,1.17,1.18 preference_colspan.tpl,1.3,1.4 preferences.tpl,1.21,1.22 stats_projectlist.tpl,1.12,1.13 stats_projectstat.tpl,1.12,1.13 stats_userlist.tpl,1.10,1.11 stats_userstat.tpl,1.12,1.13 view.tpl,1.7,1.8
Date: Tue, 17 Jun 2003 08:39:19 -0400

Update of /cvsroot/phpgroupware/projects/templates/default
In directory subversions:/tmp/cvs-serv24216/templates/default

Modified Files:
        addressbook.tpl archive.tpl bill_list.tpl bill_listhours.tpl 
        bill_listinvoice.tpl del_listhours.tpl delete.tpl form.tpl 
        form_admin.tpl formactivity.tpl header.tpl hours_formhours.tpl 
        hours_listhours.tpl hours_view.tpl list.tpl list_admin.tpl 
        listactivities.tpl preference_colspan.tpl preferences.tpl 
        stats_projectlist.tpl stats_projectstat.tpl stats_userlist.tpl 
        stats_userstat.tpl view.tpl 
Added Files:
        list_budget.tpl list_pcosts.tpl 
Log Message:
update



Index: addressbook.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/addressbook.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** addressbook.tpl     18 Dec 2001 23:17:28 -0000      1.15
--- addressbook.tpl     17 Jun 2003 12:39:16 -0000      1.16
***************
*** 21,26 ****
        function ExchangeCustomer(thisform)
        {
!               opener.document.projects_form.abid.value = 
thisform.elements[0].value;
!               opener.document.projects_form.name.value = 
thisform.elements[1].value;
        }
  </script>
--- 21,26 ----
        function ExchangeCustomer(thisform)
        {
!               opener.document.app_form.abid.value = 
thisform.elements[0].value;
!               opener.document.app_form.name.value = 
thisform.elements[1].value;
        }
  </script>
***************
*** 71,75 ****
                <input type="hidden" size="25" name="hidden" value="{abid}">
                <input type="hidden" size="25" name="hidden" value="{company} 
{firstname} {lastname}">
!               <td align=center><font face="{font}"><input type="button" 
value="{lang_select}" onClick="ExchangeCustomer(this.form);" name="button"></td>
                </font></form>    
        </tr>
--- 71,75 ----
                <input type="hidden" size="25" name="hidden" value="{abid}">
                <input type="hidden" size="25" name="hidden" value="{company} 
{firstname} {lastname}">
!               <td align="center"><font face="{font}"><input type="button" 
value="{lang_select}" onClick="ExchangeCustomer(this.form);" name="button"></td>
                </font></form>    
        </tr>

Index: archive.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/archive.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7

Index: bill_list.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/bill_list.tpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** bill_list.tpl       26 Apr 2003 01:22:39 -0000      1.14
--- bill_list.tpl       17 Jun 2003 12:39:16 -0000      1.15
***************
*** 27,38 ****
        <tr bgcolor="{th_bg}">
                <td width="8%" bgcolor="{th_bg}">{sort_number}</td>
!               <td width="20%" bgcolor="{th_bg}">{sort_title}</td>
!               <td width="20%" bgcolor="{th_bg}">{sort_coordinator}</td>
!               <td width="8%" bgcolor="{th_bg}" 
align="center">{sort_status}</td>
          <td width="20%" bgcolor="{th_bg}">{sort_action}</td>
!               <td width="8%" bgcolor="{th_bg}" 
align="center">{sort_end_date}</td>
                {lang_action}
!               <td width="8%" align="center">{h_lang_part}</td>
!               <td width="8%" align="center">{h_lang_partlist}</td>
        </tr>
    
--- 27,38 ----
        <tr bgcolor="{th_bg}">
                <td width="8%" bgcolor="{th_bg}">{sort_number}</td>
!               <td width="18%" bgcolor="{th_bg}">{sort_title}</td>
!               <td width="18%" bgcolor="{th_bg}">{sort_coordinator}</td>
!               <td width="5%" bgcolor="{th_bg}" 
align="center">{sort_status}</td>
          <td width="20%" bgcolor="{th_bg}">{sort_action}</td>
!               <td width="5%" bgcolor="{th_bg}" 
align="center">{sort_end_date}</td>
                {lang_action}
!               <td width="10%" align="center">{h_lang_part}</td>
!               <td width="14%" align="center">{h_lang_partlist}</td>
        </tr>
    

Index: bill_listhours.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/bill_listhours.tpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22

Index: bill_listinvoice.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/projects/templates/default/bill_listinvoice.tpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12

Index: del_listhours.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/del_listhours.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18

Index: delete.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/delete.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** delete.tpl  20 Dec 2001 03:38:15 -0000      1.10
--- delete.tpl  17 Jun 2003 12:39:16 -0000      1.11
***************
*** 5,9 ****
  <center>
  <table border="0" with="65%">
! <form method="POST" action="{actionurl}">
        <tr colspan="2">
                <td align="center">{deleteheader}</td>
--- 5,9 ----
  <center>
  <table border="0" with="65%">
! <form method="POST" action="{action_url}">
        <tr colspan="2">
                <td align="center">{deleteheader}</td>
***************
*** 14,24 ****
        </tr>
        <tr>
!               <td>
!                       <input type="submit" name="confirm" 
value="{lang_yes}"></form>
!               </td>
!               <td>
!                       <a href="{nolink}">{lang_no}</a>
!               </td>
        </tr>
  </table>
  </center>
--- 14,21 ----
        </tr>
        <tr>
!               <td><input type="submit" name="yes" value="{lang_yes}"></td>
!               <td><input type="submit" name="no" value="{lang_no}"></td>
        </tr>
+ </form>
  </table>
  </center>

Index: form.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/form.tpl,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** form.tpl    26 Apr 2003 01:22:39 -0000      1.34
--- form.tpl    17 Jun 2003 12:39:16 -0000      1.35
***************
*** 7,110 ****
        }
  </script>
! 
  {app_header}
  
  <center>
! <form method="POST" name="projects_form" action="{actionurl}">
  {pref_message}<br>{message}
! <table width="85%" border="0" cellspacing="2" cellpadding="2">
        <tr>
!               <td>{lang_parent}</td>
!               <td>{pro_parent}</td>
        </tr>
        <tr>
!               <td>{lang_choose}</td>
!               <td>{choose}</td>
        </tr>
        <tr>
!               <td>{lang_number}:</td>
!               <td><input type="text" name="values[number]" value="{number}" 
size="25" maxlength="20"></td>
        </tr>
        <tr>
!               <td>{lang_title}:</font></td>
!               <td><input type="text" name="values[title]" size="50" 
value="{title}"></td>
        </tr>
        <tr>
!               <td valign="top">{lang_descr}:</td>
!               <td colspan="2"><textarea name="values[descr]" rows="4" 
cols="50" wrap="VIRTUAL">{descr}</textarea></td>
        </tr>
        <tr>
!               <td>{lang_category}:</td>
!               <td>{cat}</td>
        </tr>
        <tr>
!               <td><input type="button" value="{lang_customer}" 
onClick="abook();"></td>
!               <td><input type="hidden" name="abid" value="{abid}">
!               <input type="text" name="name" size="50" value="{name}" 
readonly>&nbsp;&nbsp;&nbsp;{lang_select}</td>
        </tr>
        <tr>
!               <td>{lang_coordinator}:</td>
!               <td><select 
name="values[coordinator]">{coordinator_list}</select></td>
        </tr>
        <tr>
!               <td>{lang_status}:</td>
!               <td><select name="values[status]">{status_list}</select></td>
        </tr>
        <tr>
!               <td>{lang_budget}:&nbsp;{currency}</td>
!               <td><input type="text" name="values[budget]" 
value="{budget}"></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>{lang_bookable_activities}:</td>
!               <td><select name="book_activities[]" 
multiple>{book_activities_list}</select></td>
        </tr>
        <tr>
!               <td>{lang_billable_activities}:</td>
!               <td><select name="bill_activities[]" 
multiple>{bill_activities_list}</select></td>
        </tr>
        <tr>
!               <td>{lang_access}:</td>
!               <td>{access}</td>
        </tr>
! </table>
! 
! <!-- BEGIN add -->
! 
! <table width="50%" border="0" cellspacing="2" cellpadding="2">
!       <tr valign="bottom">
!               <td height="50">
!                       <input type="submit" name="values[submit]" 
value="{lang_save}"></td>
!               <td height="50"><input type="reset" name="reset" 
value="{lang_reset}"></form></td>
!               <td height="50">
!                       <form method="POST" action="{done_url}">
!                       <input type="submit" name="values[done]" 
value="{lang_done}"></form></td>
        </tr>
! </table>
! </center>
!          
! <!-- END add -->
!         
! <!-- BEGIN edit -->
! 
! <table width="50%" border="0" cellspacing="2" cellpadding="2">
!       <tr valign="bottom">
!               <td height="50">
!                       <input type="submit" name="values[submit]" 
value="{lang_save}"></form></td>
!               <td height="50">
!                       {delete}</td>
!               <td height="50">
!                       <form method="POST" action="{done_url}">
!                       <input type="submit" name="values[done]" 
value="{lang_done}"></form></td>
        </tr>
  </table>
  </center>
- 
- <!-- END edit -->
--- 7,152 ----
        }
  </script>
! <script language="JavaScript">
!       self.name="second_Window";
!       function accounts_popup()
!       {
!               
Window2=window.open('{accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
!       }
! </script>
  {app_header}
  
  <center>
! <form method="POST" name="app_form" action="{action_url}">
  {pref_message}<br>{message}
! <table width="98%" border="0" cellspacing="2" cellpadding="2">
        <tr>
!               <td width="35%" colspan"2">{lang_parent}</td>
!               <td colspan"2">{pro_parent}</td>
        </tr>
        <tr>
!               <td colspan"2">{lang_investment_nr}</td>
!               <td colspan"2">{investment_nr}</td>
        </tr>
        <tr>
!               <td colspan"2">{lang_choose}</td>
!               <td colspan"2">{choose}</td>
        </tr>
        <tr>
!               <td colspan"2">{lang_number}:</td>
!               <td colspan"2"><input type="text" name="values[number]" 
value="{number}" size="25" maxlength="20"></td>
        </tr>
        <tr>
!               <td colspan"2">{lang_title}:</font></td>
!               <td colspan"2"><input type="text" name="values[title]" 
size="50" value="{title}"></td>
        </tr>
        <tr>
!               <td valign="top" colspan"2">{lang_descr}:</td>
!               <td colspan"2"><textarea name="values[descr]" rows="4" 
cols="50" wrap="VIRTUAL">{descr}</textarea></td>
        </tr>
        <tr>
!               <td colspan"2">{lang_category}:</td>
!               <td colspan"2">{cat}</td>
        </tr>
        <tr>
!               <td colspan"2">{lang_customer}:</td>
!               <td colspan"2">
!                       <table>
!                               <tr>
!                                       <td><input type="hidden" name="abid" 
value="{abid}">
!                                       <input type="text" name="name" 
size="50" value="{name}" readonly></td>
!                                       <td><input type="button" 
value="{lang_open_popup}" onClick="abook();"></td>
!                               </tr>
!                       </table>
!               </td>
        </tr>
        <tr>
!               <td colspan"2">{lang_coordinator}:</td>
!               <td colspan"2">
! 
! <!-- BEGIN clist -->
! 
!               <select name="accountid">{coordinator_list}</select>
! 
! <!-- END clist -->
! 
! <!-- BEGIN cfield -->
! 
!                       <table>
!                               <tr>
!                                       <td>
!                                               <input type="hidden" 
name="accountid" value="{accountid}">
!                                               <input type="text" 
name="accountname" size="50" value="{accountname}" readonly>
!                                       </td>
!                                       <td><input type="button" 
value="{lang_open_popup}" onClick="accounts_popup();"></td>
!                               </tr>
!                       </table>
! 
! <!-- END cfield -->
! 
!               </td>
        </tr>
        <tr>
!               <td colspan"2">{lang_status}:</td>
!               <td colspan"2"><select 
name="values[status]">{status_list}</select></td>
        </tr>
        <tr>
!               <td colspan"2">{lang_access}:</td>
!               <td colspan"2">{access}</td>
!       </tr>
!       <tr height="15">
!               <td>&nbsp;</td>
        </tr>
        <tr>
!               <td colspan"2">{lang_budget_main}</td>
!               <td colspan"2">{budget_main}</td>
        </tr>
        <tr>
!               <td colspan"2">{lang_budget}:&nbsp;{currency}</td>
!               <td colspan"2"><input type="text" name="values[budget]" 
value="{budget}"></td>
        </tr>
        <tr>
!               <td colspan"2">{lang_pcosts}&nbsp;{month}:&nbsp;{currency}</td>
!               <td colspan"2">{pcosts}</td>
!       </tr>
!       <tr height="15">
!               <td>&nbsp;</td>
        </tr>
        <tr>
!               <td colspan"2">{lang_ptime_main}</td>
!               <td colspan"2">{ptime_main}</td>
        </tr>
!       <tr>
!               <td colspan"2">{lang_ptime}:&nbsp;{lang_hours}</td>
!               <td colspan"2"><input type="text" name="values[ptime]" 
value="{phours}"></td>
        </tr>
!       <tr height="15">
!               <td>&nbsp;</td>
!       </tr>
!       <tr>
!               <td colspan"2">{lang_start_date}:</td>
!               <td colspan"2">{start_date_select}</td>
!       </tr>
!       <tr>
!               <td colspan"2">{lang_end_date}:</td>
!               <td colspan"2">{end_date_select}</td>
!       </tr>
!       <tr height="15">
!               <td>&nbsp;</td>
!       </tr>
!       <tr>
!               <td colspan"2">{lang_bookable_activities}:</td>
!               <td colspan"2"><select name="book_activities[]" 
multiple>{book_activities_list}</select></td>
!       </tr>
!       <tr>
!               <td colspan"2">{lang_billable_activities}:</td>
!               <td colspan"2"><select name="bill_activities[]" 
multiple>{bill_activities_list}</select></td>
!       </tr>
!       <tr valign="bottom" height="50">
!               <td><input type="submit" name="save" value="{lang_save}"></td>
!               <td><input type="submit" name="apply" value="{lang_apply}"></td>
!               <td>{delete}</td>
!               <td><input type="submit" name="cancel" 
value="{lang_cancel}"></form></td>
        </tr>
  </table>
+ </form>
  </center>

Index: form_admin.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/form_admin.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** form_admin.tpl      30 Nov 2001 01:14:57 -0000      1.4
--- form_admin.tpl      17 Jun 2003 12:39:16 -0000      1.5
***************
*** 1,23 ****
  <center>
  <table border="0" width="80%" cellpadding="2" cellspacing="2">
! <form method="POST" action="{actionurl}">
        <tr>
!               <td colspan="2" align="center" 
bgcolor="{th_bg}"><b>{lang_action}</b></td>
!       </tr>
!       <tr>
!               <td colspan="2" height="30">&nbsp;</td>
!       </tr>
!       <tr>
!               <td>{lang_users_list}:</td>
                <td><select name="users[]" multiple>{users_list}</select></td>
        </tr>
        <tr>
!               <td>{lang_groups_list}:</td>
                <td><select name="groups[]" multiple>{groups_list}</select></td>
        </tr>
!     <tr>
!               <td>
!                       <input type="submit" name="submit" value="{lang_save}">
!               </td>
        </tr>
  </form>
--- 1,16 ----
  <center>
  <table border="0" width="80%" cellpadding="2" cellspacing="2">
! <form method="POST" action="{action_url}">
        <tr>
!               <td valign="top">{lang_users_list}:</td>
                <td><select name="users[]" multiple>{users_list}</select></td>
        </tr>
        <tr>
!               <td valign="top">{lang_groups_list}:</td>
                <td><select name="groups[]" multiple>{groups_list}</select></td>
        </tr>
!     <tr height="50" valign="bottom">
!               <td><input type="submit" name="save" value="{lang_save}"></td>
!               <td align="right"><input type="submit" name="cancel" 
value="{lang_cancel}"></td>
        </tr>
  </form>

Index: formactivity.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/formactivity.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** formactivity.tpl    26 Apr 2003 01:22:39 -0000      1.15
--- formactivity.tpl    17 Jun 2003 12:39:16 -0000      1.16
***************
*** 14,23 ****
        </tr>
        <tr>
!               <td>{lang_descr}:</td>
                <td colspan="2"><textarea name="values[descr]" rows=4 cols=50 
wrap="VIRTUAL">{descr}</textarea></td>
        </tr>
        <tr>
                <td>{lang_category}:</td>
!               <td><select name="new_cat"><option 
value="">{lang_none}</option>{cats_list}</select></td>
        </tr>
        <tr>
--- 14,23 ----
        </tr>
        <tr>
!               <td valign="top">{lang_descr}:</td>
                <td colspan="2"><textarea name="values[descr]" rows=4 cols=50 
wrap="VIRTUAL">{descr}</textarea></td>
        </tr>
        <tr>
                <td>{lang_category}:</td>
!               <td><select name="values[cat]"><option 
value="">{lang_none}</option>{cats_list}</select></td>
        </tr>
        <tr>
***************
*** 26,30 ****
        </tr>
        <tr>
!               <td>{currency}&nbsp;{lang_billperae}:</td>
                <td><input type="text" name="values[billperae]" 
value="{billperae}"></td>
        </tr>
--- 26,30 ----
        </tr>
        <tr>
!               <td>{lang_billperae}:&nbsp;{currency}</td>
                <td><input type="text" name="values[billperae]" 
value="{billperae}"></td>
        </tr>
***************
*** 33,67 ****
                <td>{minperae}</td>
        </tr>
! </table>
! 
! <!-- BEGIN add -->
!          
! <table width="50%" border="0" cellspacing="2" cellpadding="2">
!       <tr valign="bottom">
!               <td height="50" align="center"><input type="submit" 
name="values[submit]" value="{lang_save}"></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>
! </table>
! </center>
! 
! <!-- END add -->
! 
! <!-- BEGIN edit -->
! 
! <table width="50%" border="0" cellspacing="2" cellpadding="2">
!       <tr valign="bottom">
!               <td height="50" align="center">
!                       <input type="submit" name="values[submit]" 
value="{lang_save}"></form></td>
!               <td height="50" align="center">
!                       <form method="POST" action="{deleteurl}">
!                       <input type="submit" name="delete" 
value="{lang_delete}"></form></td>
!               <td height="50" align="center">
!                       <form method="POST" action="{done_url}">
!                       <input type="submit" name="done" 
value="{lang_done}"></form></td>
        </tr>
  </table>
  </center>
  
--- 33,42 ----
                <td>{minperae}</td>
        </tr>
!       <tr valign="bottom" height="50">
!               <td><input type="submit" name="save" value="{lang_save}"></td>
!               <td align="right"><input type="submit" name="cancel" 
value="{lang_cancel}"></td>
        </tr>
  </table>
+ </form>
  </center>
  

Index: header.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/header.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** header.tpl  3 Jan 2002 23:32:36 -0000       1.17
--- header.tpl  17 Jun 2003 12:39:16 -0000      1.18
***************
*** 18,27 ****
                        <a href="{link_hours}"><b>{lang_hours}</b></a>
                        &nbsp;|&nbsp;
-                       <a href="{link_statistics}"><b>{lang_statistics}</b></a>
-                       &nbsp;|&nbsp;
                        <a href="{link_archiv}"><b>{lang_archiv}</b></a>
                        &nbsp;|&nbsp;
                        <a href="{link_delivery}"><b>{lang_delivery}</b></a>
!                       {break}
                        <a href="{link_billing}"><b>{lang_billing}</b></a>
                </td>
--- 18,29 ----
                        <a href="{link_hours}"><b>{lang_hours}</b></a>
                        &nbsp;|&nbsp;
                        <a href="{link_archiv}"><b>{lang_archiv}</b></a>
                        &nbsp;|&nbsp;
+                       <a href="{link_statistics}"><b>{lang_statistics}</b></a>
+                       &nbsp;|&nbsp;
+                       <a href="{link_budget}"><b>{lang_budget}</b></a>
+                       {break1}
                        <a href="{link_delivery}"><b>{lang_delivery}</b></a>
!                       {break2}
                        <a href="{link_billing}"><b>{lang_billing}</b></a>
                </td>

Index: hours_formhours.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/hours_formhours.tpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** hours_formhours.tpl 26 Apr 2003 01:22:39 -0000      1.21
--- hours_formhours.tpl 17 Jun 2003 12:39:16 -0000      1.22
***************
*** 21,29 ****
        </tr>
        <tr>
!               <td>{lang_descr}:</td>
                <td><input type="text" name="values[hours_descr]" size="50" 
value="{hours_descr}"></td>
        </tr>
        <tr>
!               <td>{lang_remark}:</td>
                <td colspan="2"><textarea name="values[remark]" rows="5" 
cols="50" wrap="VIRTUAL">{remark}</textarea></td>
        </tr>
--- 21,29 ----
        </tr>
        <tr>
!               <td valign="top">{lang_descr}:</td>
                <td><input type="text" name="values[hours_descr]" size="50" 
value="{hours_descr}"></td>
        </tr>
        <tr>
!               <td valign="top">{lang_remark}:</td>
                <td colspan="2"><textarea name="values[remark]" rows="5" 
cols="50" wrap="VIRTUAL">{remark}</textarea></td>
        </tr>
***************
*** 80,88 ****
           
  <table width="75%" border="0" cellspacing="2" cellpadding="2">
!       <tr valign="bottom">
!               <td height="50"><input type="submit" name="values[submit]" 
value="{lang_save}"></td>
!               <td height="50"><input type="reset" name="reset" 
value="{lang_reset}"></form></td>
!               <td height="50"><form method="POST" action="{doneurl}"> 
!                       <input type="submit" name="done" 
value="{lang_done}"></form></td>
        </tr>
  </table>
--- 80,88 ----
           
  <table width="75%" border="0" cellspacing="2" cellpadding="2">
!       <tr valign="bottom" height="50">
!               <td><input type="submit" name="values[submit]" 
value="{lang_save}"></td>
!               <td>&nbsp;</form></td>
!               <td align="right"><form method="POST" action="{cancel_url}">
!                       <input type="submit" name="cancel" 
value="{lang_cancel}"></form></td>
        </tr>
  </table>
***************
*** 94,104 ****
  
  <table width="75%" border="0" cellspacing="2" cellpadding="2">
!       <tr valign="bottom">
!               <td height="50"><input type="submit" name="values[submit]" 
value="{lang_save}">
                        </form></td>
!               <td height="50">{delete}</td>
!               <td height="50">
!                       <form method="POST" action="{doneurl}">
!                       <input type="submit" name="done" 
value="{lang_done}"></form></td>
        </tr>
  </table>
--- 94,104 ----
  
  <table width="75%" border="0" cellspacing="2" cellpadding="2">
!       <tr valign="bottom" height="50">
!               <td><input type="submit" name="values[submit]" 
value="{lang_save}">
                        </form></td>
!               <td>{delete}</td>
!               <td align="right">
!                       <form method="POST" action="{cancel_url}">
!                       <input type="submit" name="cancel" 
value="{lang_cancel}"></form></td>
        </tr>
  </table>

Index: hours_listhours.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/hours_listhours.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18

Index: hours_view.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/hours_view.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7

Index: list.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/list.tpl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** list.tpl    26 Apr 2003 01:22:39 -0000      1.27
--- list.tpl    17 Jun 2003 12:39:16 -0000      1.28
***************
*** 5,10 ****
  <center>
  <table border="0" width="98%" cellpadding="2" cellspacing="2">
!       <tr colspan="8">
!               <td colspan="9">
                        <table border="0" width="100%">
                                <tr>
--- 5,10 ----
  <center>
  <table border="0" width="98%" cellpadding="2" cellspacing="2">
!       <tr colspan="9">
!               <td colspan="8" width="100%">
                        <table border="0" width="100%">
                                <tr>
***************
*** 16,40 ****
                </td>
        </tr>
!       <tr colspan="8">
!               <td width="25%" align="left">
                        {action_list}
                        <noscript>&nbsp;<input type="submit" name="submit" 
value="{lang_submit}"></noscript></form></td>
!               <td width="25%" align="center"><form method="POST" 
name="status" action="{status_action}">
                        <select name="status" 
onChange="this.form.submit();">{status_list}</select><noscript>
                        &nbsp;<input type="submit" name="submit" 
value="Submit"></noscript></form></td>
!               <td width="25%" align="center"><form method="POST" 
name="filter" action="{filter_action}">{filter_list}</form></td>
!               <td width="25%" align="right"><form method="POST" name="query" 
action="{search_action}">{search_list}</form></td>
        </tr>
  </table>
  <table border="0" width="98%" cellpadding="2" cellspacing="2">
        <tr bgcolor="{th_bg}">
!               <td width="10%" bgcolor="{th_bg}">{sort_number}</td>
!               <td width="20%" bgcolor="{th_bg}">{sort_title}</td>
!               <td width="20%" bgcolor="{th_bg}">{sort_coordinator}</td>
!         <td width="20%" bgcolor="{th_bg}">{sort_action}</td>
!               <td width="10%" bgcolor="{th_bg}" 
align="center">{sort_end_date}</td>
!               <td width="8%" bgcolor="{th_bg}" 
align="center">{lang_action}</td>
!               <td width="5%" bgcolor="{th_bg}" align="center">{lang_view}</td>
!               <td width="5%" bgcolor="{th_bg}" align="center">{lang_edit}</td>
        </tr>
  
--- 16,40 ----
                </td>
        </tr>
!       <tr>
!               <td colspan="2" width="25%" align="left">
                        {action_list}
                        <noscript>&nbsp;<input type="submit" name="submit" 
value="{lang_submit}"></noscript></form></td>
!               <td colspan="2" width="20%" align="center"><form method="POST" 
name="status" action="{status_action}">
                        <select name="status" 
onChange="this.form.submit();">{status_list}</select><noscript>
                        &nbsp;<input type="submit" name="submit" 
value="Submit"></noscript></form></td>
!               <td colspan="2" width="20%" align="center"><form method="POST" 
name="filter" action="{filter_action}">{filter_list}</form></td>
!               <td colspan="2" width="35%" align="right"><form method="POST" 
name="query" action="{search_action}">{search_list}</form></td>
        </tr>
  </table>
  <table border="0" width="98%" cellpadding="2" cellspacing="2">
        <tr bgcolor="{th_bg}">
!               <td width="10%">{sort_number}</td>
!               <td width="20%">{sort_title}</td>
!               <td width="20%">{sort_coordinator}</td>
!         <td width="20%">{sort_action}</td>
!               <td width="10%" align="center">{sort_end_date}</td>
!               <td width="10%" align="center">{lang_action}</td>
!               <td width="5%" align="center">{lang_view}</td>
!               <td width="5%" align="center">{lang_edit}</td>
        </tr>
  

Index: list_admin.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/list_admin.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** list_admin.tpl      9 Jan 2002 01:06:53 -0000       1.7
--- list_admin.tpl      17 Jun 2003 12:39:16 -0000      1.8
***************
*** 3,9 ****
  <table width="80%" border="0" cellpadding="2" cellspacing="2">
        <tr>
-               <td colspan="4" align="center" 
bgcolor="{th_bg}"><b>{lang_action}&nbsp;{lang_admin}</b></td>
-       </tr>
-       <tr>
                <td colspan="4" align="left">
                        <table border="0" width="100%">
--- 3,6 ----
***************
*** 39,53 ****
  <!-- END admin_list -->
  
!       <tr valign="bottom">
!               <td>
!                       <form method="POST" action="{addurl}">
!                       <input type="submit" name="add" 
value="{lang_edit}"></form>
!               </td>
!       </tr>
!       <tr valign="bottom">
!               <td>
!                       <form method="POST" action="{doneurl}">
!                       <input type="submit" name="done" 
value="{lang_done}"></form>
!               </td>
        </tr>
  </table>
--- 36,44 ----
  <!-- END admin_list -->
  
!       <tr valign="bottom" height="50">
!       <form method="POST" action="{action_url}">
!               <td colspan="2"><input type="submit" name="add" 
value="{lang_edit}"></td>
!               <td colspan="2" align="right"><input type="submit" name="done" 
value="{lang_done}"></td>
!       </form>
        </tr>
  </table>

Index: listactivities.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/listactivities.tpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** listactivities.tpl  26 Apr 2003 01:22:39 -0000      1.17
--- listactivities.tpl  17 Jun 2003 12:39:16 -0000      1.18
***************
*** 18,28 ****
        <tr colspan="6">
                <td width="33%" align="left">
!                               <form method="POST" name="cat" 
action="{cat_action}">
!                               {lang_category}&nbsp;&nbsp;<select 
name="cat_id" onChange="this.form.submit();">
!                               <option value="">{lang_none}</option>
                                {categories_list}
                                </select>
                                <noscript><input type="submit" name="cats" 
value="{lang_select}"></noscript>
!                               </form>
                </td>
                <td width="33%" align="center">&nbsp;</td>
--- 18,28 ----
        <tr colspan="6">
                <td width="33%" align="left">
!                       <form method="POST" name="cat" action="{cat_action}">
!                               <select name="cat_id" 
onChange="this.form.submit();">
!                               <option value="">{lang_select_category}</option>
                                {categories_list}
                                </select>
                                <noscript><input type="submit" name="cats" 
value="{lang_select}"></noscript>
!                       </form>
                </td>
                <td width="33%" align="center">&nbsp;</td>

Index: preference_colspan.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/projects/templates/default/preference_colspan.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4

Index: preferences.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/preferences.tpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** preferences.tpl     26 Apr 2003 01:22:39 -0000      1.21
--- preferences.tpl     17 Jun 2003 12:39:16 -0000      1.22
***************
*** 10,14 ****
  <center>
  {bill_message}
! <form method="POST" name="projects_form" action="{actionurl}">
  <table width="97%" border="0" cellspacing="2" cellpadding="2">
        <tr bgcolor="{row_on}">
--- 10,14 ----
  <center>
  {bill_message}
! <form method="POST" name="app_form" action="{actionurl}">
  <table width="97%" border="0" cellspacing="2" cellpadding="2">
        <tr bgcolor="{row_on}">
***************
*** 54,58 ****
        <tr valign="bottom">
                <td height="50" align="left">
!                       <input type="submit" name="submit" value="{lang_save}">
                        </form>
                </td>
--- 54,58 ----
        <tr valign="bottom">
                <td height="50" align="left">
!                       <input type="submit" name="save" value="{lang_save}">
                        </form>
                </td>

Index: stats_projectlist.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/projects/templates/default/stats_projectlist.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13

Index: stats_projectstat.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/projects/templates/default/stats_projectstat.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13

Index: stats_userlist.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/stats_userlist.tpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11

Index: stats_userstat.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/stats_userstat.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13

Index: view.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/view.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** view.tpl    26 Apr 2003 01:22:39 -0000      1.7
--- view.tpl    17 Jun 2003 12:39:17 -0000      1.8
***************
*** 5,12 ****
  <center>
  <table width="85%" border="0" cellspacing="3" cellpadding="3">
!       <tr bgcolor="{row_on}">
                <td><b>{lang_parent}</b></td>
                <td>{pro_parent}</td>
        </tr>
        <tr bgcolor="{row_off}">
                <td><b>{lang_number}:</b></td>
--- 5,17 ----
  <center>
  <table width="85%" border="0" cellspacing="3" cellpadding="3">
! 
!       <tr bgcolor="{row_off}">
                <td><b>{lang_parent}</b></td>
                <td>{pro_parent}</td>
        </tr>
+       <tr bgcolor="{row_on}">
+               <td><b>{lang_investment_nr}</b></td>
+               <td>{investment_nr}</td>
+       </tr>
        <tr bgcolor="{row_off}">
                <td><b>{lang_number}:</b></td>
***************
*** 38,62 ****
        </tr>
        <tr bgcolor="{row_on}">
!               <td><b>{lang_budget}:</b></td>
!               <td>{currency}&nbsp;{budget}</td>
        </tr>
        <tr bgcolor="{row_off}">
                <td><b>{lang_start_date}:</b></td>
                <td>{sdate}</td>
        </tr>
!       <tr bgcolor="{row_on}">
                <td><b>{lang_end_date}:</b></td>
                <td>{edate}</td>
        </tr>
        <tr bgcolor="{row_off}">
!               <td><b>{lang_bookable_activities}:</b></td>
!               <td>{book_activities_list}&nbsp;</td>
        </tr>
        <tr bgcolor="{row_on}">
!               <td><b>{lang_billable_activities}:</b></td>
!               <td>{bill_activities_list}&nbsp;</td>
        </tr>
  </table>
!          
  <!-- BEGIN done -->
           
--- 43,110 ----
        </tr>
        <tr bgcolor="{row_on}">
!               <td><b>{lang_bookable_activities}:</b></td>
!               <td>{book_activities_list}&nbsp;</td>
!       </tr>
!       <tr bgcolor="{row_off}">
!               <td><b>{lang_billable_activities}:</b></td>
!               <td>{bill_activities_list}&nbsp;</td>
!       </tr>
!       <tr height="15">
!               <td>&nbsp;</td>
!       </tr>
!       <tr bgcolor="{row_on}">
!               <td><b>{lang_budget}:&nbsp;{currency}</b></td>
!               <td>{budget}</td>
!       </tr>
!       <tr bgcolor="{row_off}">
!               <td><b>{lang_pcosts}&nbsp;{month}:&nbsp;{currency}</b></td>
!               <td>{pcosts}</td>
!       </tr>
!       <tr height="15">
!               <td>&nbsp;</td>
!       </tr>
!       <tr bgcolor="{row_on}">
!               <td><b>{lang_ptime}:&nbsp;{lang_hours}</b></td>
!               <td>{phours}</td>
        </tr>
        <tr bgcolor="{row_off}">
+               <td><b>{lang_utime}:&nbsp;{lang_hours}</b></td>
+               <td>{uhours}</td>
+       </tr>
+       <tr height="15">
+               <td>&nbsp;</td>
+       </tr>
+       <tr bgcolor="{row_on}">
                <td><b>{lang_start_date}:</b></td>
                <td>{sdate}</td>
        </tr>
!       <tr bgcolor="{row_off}">
                <td><b>{lang_end_date}:</b></td>
                <td>{edate}</td>
        </tr>
+       <tr height="15">
+               <td>&nbsp;</td>
+       </tr>
+       <tr bgcolor="{row_on}">
+               <td><b>{lang_creator}:</b></td>
+               <td>{owner}</td>
+       </tr>
        <tr bgcolor="{row_off}">
!               <td><b>{lang_cdate}:</b></td>
!               <td>{cdate}</td>
!       </tr>
!       <tr height="15">
!               <td>&nbsp;</td>
        </tr>
        <tr bgcolor="{row_on}">
!               <td><b>{lang_processor}:</b></td>
!               <td>{processor}</td>
!       </tr>
!       <tr bgcolor="{row_off}">
!               <td><b>{lang_last_update}:</b></td>
!               <td>{udate}</td>
        </tr>
  </table>
! 
  <!-- BEGIN done -->
           
***************
*** 65,69 ****
                <td height="50">
                        <form method="POST" action="{done_action}">
!                       <input type="submit" name="submit" value="{lang_done}">
                        </form></td>
        </tr>
--- 113,117 ----
                <td height="50">
                        <form method="POST" action="{done_action}">
!                       <input type="submit" name="done" value="{lang_done}">
                        </form></td>
        </tr>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]