phpgroupware-cvs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] CVS: projects/templates/default form_mstone.tpl, 1.1, 1.2 addressbook.tpl, 1.16, 1.17 archive.tpl, 1.7, 1.8 bill_list.tpl, 1.15, 1.16 bill_listhours.tpl, 1.22, 1.23 bill_listinvoice.tpl, 1.12, 1.13 del_listhours.tpl, 1.18, 1.19 delete.tpl, 1.11, 1.12 form.tpl, 1.35, 1.36 formactivity.tpl, 1.16, 1.17 header.tpl, 1.18, 1.19 hours_formhours.tpl, 1.22, 1.23 hours_listhours.tpl, 1.18, 1.19 hours_view.tpl, 1.7, 1.8 list.tpl, 1.28, 1.29 list_admin.tpl, 1.8, 1.9 list_budget.tpl, 1.2, 1.3 list_pcosts.tpl, 1.2, 1.3 listactivities.tpl, 1.18, 1.19 preference_colspan.tpl, 1.4, 1.5 preferences.tpl, 1.22, 1.23 stats_projectlist.tpl, 1.13, 1.14 stats_projectstat.tpl, 1.13, 1.14 stats_userlist.tpl, 1.11, 1.12 stats_userstat.tpl, 1.13, 1.14 view.tpl, 1.8, 1.9
Date: Tue, 09 Sep 2003 20:29:00 -0400 
Update of /cvsroot/phpgroupware/projects/templates/default
In directory subversions:/tmp/cvs-serv16904/templates/default

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


Index: addressbook.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/addressbook.tpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17

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

Index: bill_list.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/bill_list.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16

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

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

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

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

Index: form.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/form.tpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** form.tpl    17 Jun 2003 12:39:16 -0000      1.35
--- form.tpl    10 Sep 2003 00:28:57 -0000      1.36
***************
*** 14,17 ****
--- 14,25 ----
        }
  </script>
+ 
+ <script language="JavaScript">
+       self.name="third_Window";
+       function e_accounts_popup()
+       {
+               
Window3=window.open('{e_accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
+       }
+ </script>
  {app_header}
  
***************
*** 21,26 ****
  <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>
--- 29,38 ----
  <table width="98%" border="0" cellspacing="2" cellpadding="2">
        <tr>
!               <td width="35%" colspan"2">{lang_main}</td>
!               <td colspan"2">{pro_main}</td>
!       </tr>
!       <tr>
!               <td colspan"2">{lang_parent}</td>
!               <td colspan"2">{parent_select}</td>
        </tr>
        <tr>
***************
*** 86,89 ****
--- 98,128 ----
                </td>
        </tr>
+ 
+       <tr>
+               <td colspan"2" valign="top">{lang_employees}:</td>
+               <td colspan"2">
+ 
+ <!-- BEGIN elist -->
+ 
+               <select name="employees[]" multiple>{employee_list}</select>
+ 
+ <!-- END elist -->
+ 
+ <!-- BEGIN efield -->
+ 
+                       <table>
+                               <tr>
+                                       <td>
+                                               <select name="employees[]" 
multiple>{employee_list}</select>
+                                       </td>
+                                       <td valign="top"><input type="button" 
value="{lang_open_popup}" onClick="e_accounts_popup();"></td>
+                               </tr>
+                       </table>
+ 
+ <!-- END efield -->
+ 
+               </td>
+       </tr>
+ 
        <tr>
                <td colspan"2">{lang_status}:</td>
***************
*** 142,147 ****
                <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>
--- 181,215 ----
                <td colspan"2"><select name="bill_activities[]" 
multiple>{bill_activities_list}</select></td>
        </tr>
+       <tr height="15">
+               <td>&nbsp;</td>
+       </tr>
+ <!-- BEGIN msfield1 -->
+ 
+       <tr>
+               <td colspan"2" valign="top">{lang_milestones}:</td>
+               <td>
+                       <table width="100%" border="0" cellspacing="2" 
cellpadding="2">
+ 
+ <!-- END msfield1 -->
+ <!-- BEGIN mslist -->
+ 
+                               <tr>
+                                       <td width="50%"><a 
href="{mstone_edit_url}">{s_title}</a></td>
+                                       <td width="50%">{s_edateout}</td>
+                               </tr>
+ 
+ <!-- END mslist -->
+ 
+ <!-- BEGIN msfield2 -->
+                       </table>
+               </td>
+               <td valign="top"><input type="submit" name="mstone" 
value="{lang_add_milestone}"></td>
+       </tr>
+ <!-- END msfield2 -->
+ 
        <tr valign="bottom" height="50">
!               <td><input type="hidden" name="values[old_status]" 
value="{old_status}">
!                       <input type="hidden" name="values[old_parent]" 
value="{old_parent}">
!                       <input type="submit" name="save" 
value="{lang_save}"></td>
                <td><input type="submit" name="apply" value="{lang_apply}"></td>
                <td>{delete}</td>

Index: formactivity.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/formactivity.tpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17

Index: header.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/header.tpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19

Index: hours_formhours.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/hours_formhours.tpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** hours_formhours.tpl 17 Jun 2003 12:39:16 -0000      1.22
--- hours_formhours.tpl 10 Sep 2003 00:28:57 -0000      1.23
***************
*** 71,78 ****
--- 71,83 ----
                <td><select name="values[status]">{status_list}</select></td>
        </tr>
+ 
+ <!-- BEGIN emp -->
        <tr>
                <td>{lang_employee}:</td>
                <td><select 
name="values[employee]">{employee_list}</select></td>
        </tr>
+ 
+ <!-- END emp -->
+ 
  </table>
  

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

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

Index: list.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/list.tpl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** list.tpl    17 Jun 2003 12:39:16 -0000      1.28
--- list.tpl    10 Sep 2003 00:28:57 -0000      1.29
***************
*** 32,36 ****
                <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>
--- 32,36 ----
                <td width="20%">{sort_title}</td>
                <td width="20%">{sort_coordinator}</td>
!         <td width="20%" align="center">{lang_milestones}</td>
                <td width="10%" align="center">{sort_end_date}</td>
                <td width="10%" align="center">{lang_action}</td>
***************
*** 42,53 ****
  
        <tr bgcolor="{tr_color}">
!               <td>{number}</td>
!               <td>{title}</td>
!               <td>{coordinator}</td>
!         <td>{td_action}</td>
!               <td align="center">{end_date}</td>
!               <td align="center"><a 
href="{action_entry}">{lang_action_entry}</a></td>
!               <td align="center"><a href="{view}">{lang_view_entry}</a></td>
!               <td align="center"><a href="{edit}">{lang_edit_entry}</a></td>
        </tr>
  
--- 42,53 ----
  
        <tr bgcolor="{tr_color}">
!               <td valign="top">{number}</td>
!               <td valign="top">{title}</td>
!               <td valign="top">{coordinator}</td>
!         <td>{milestones}</td>
!               <td align="center" valign="top">{end_date}</td>
!               <td align="center" valign="top"><a 
href="{action_entry}">{lang_action_entry}</a></td>
!               <td align="center" valign="top"><a 
href="{view}">{lang_view_entry}</a></td>
!               <td align="center" valign="top"><a 
href="{edit}">{lang_edit_entry}</a></td>
        </tr>
  

Index: list_admin.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/list_admin.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9

Index: list_budget.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/list_budget.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: list_pcosts.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/list_pcosts.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3

Index: listactivities.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/listactivities.tpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19

Index: preference_colspan.tpl
===================================================================
RCS file: 
/cvsroot/phpgroupware/projects/templates/default/preference_colspan.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** preference_colspan.tpl      17 Jun 2003 12:39:16 -0000      1.4
--- preference_colspan.tpl      10 Sep 2003 00:28:57 -0000      1.5
***************
*** 2,8 ****
  <tr bgcolor="{bg_color}">
        <td>{string}</td>
!       <td align="center">{read_lang}</td>
!       <td align="center">{add_lang}</td>
!       <td align="center">{edit_lang}</td>
!       <td align="center">{delete_lang}</td>
  </tr>
--- 2,8 ----
  <tr bgcolor="{bg_color}">
        <td>{string}</td>
!       <td align="center">{lang_read}</td>
!       <td align="center">{lang_add}</td>
!       <td align="center">{lang_edit}</td>
!       <td align="center">{lang_delete}</td>
  </tr>

Index: preferences.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/preferences.tpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** preferences.tpl     17 Jun 2003 12:39:16 -0000      1.22
--- preferences.tpl     10 Sep 2003 00:28:57 -0000      1.23
***************
*** 12,27 ****
  <form method="POST" name="app_form" action="{actionurl}">
  <table width="97%" border="0" cellspacing="2" cellpadding="2">
-       <tr bgcolor="{row_on}">
  
  <!-- BEGIN book -->
! 
                <td><input type="button" value="{lang_address}" 
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>&nbsp;</td>
        </tr>
!       <tr bgcolor="{row_off}">
                <td>{lang_select_tax}:</td>
                <td><input type="text" name="prefs[tax]" value="{tax}" size="6" 
maxlength="6">&nbsp;%</td>
--- 12,26 ----
  <form method="POST" name="app_form" action="{actionurl}">
  <table width="97%" border="0" cellspacing="2" cellpadding="2">
  
  <!-- BEGIN book -->
!       <tr bgcolor="{row_off}">
                <td><input type="button" value="{lang_address}" 
onClick="abook();"></td>
                <td><input type="hidden" name="abid" value="{abid}">
!                       <input type="text" name="name" size="50" value="{name}" 
readonly></td>
        </tr>
!       <tr height="5">
                <td>&nbsp;</td>
        </tr>
!       <tr bgcolor="{row_on}">
                <td>{lang_select_tax}:</td>
                <td><input type="text" name="prefs[tax]" value="{tax}" size="6" 
maxlength="6">&nbsp;%</td>
***************
*** 29,40 ****
        <tr bgcolor="{row_off}">
                <td valign="top">{lang_bill}:</td>
!               <td>{bill}</td>
        </tr>
!       <tr>
                <td>&nbsp;</td>
        </tr>
!       <tr bgcolor="{row_on}">
!               <td><b>{lang_layout}</b></td>
!               <td>&nbsp;</td>
        </tr>
        <tr bgcolor="{row_on}">
--- 28,38 ----
        <tr bgcolor="{row_off}">
                <td valign="top">{lang_bill}:</td>
!               <td><input type="hidden" name="prefs[oldbill]" 
value="{oldbill}">{bill}</td>
        </tr>
!       <tr height="5">
                <td>&nbsp;</td>
        </tr>
!       <tr bgcolor="{th_bg}">
!               <td colspan="2"><b>{lang_layout}</b></td>
        </tr>
        <tr bgcolor="{row_on}">
***************
*** 42,46 ****
                <td><select name="prefs[ifont]">{ifont}</select></td>
        </tr>
!       <tr bgcolor="{row_on}">
                <td>{lang_select_mysize}:</td>
                <td><select name="prefs[mysize]">{mysize}</select></td>
--- 40,44 ----
                <td><select name="prefs[ifont]">{ifont}</select></td>
        </tr>
!       <tr bgcolor="{row_off}">
                <td>{lang_select_mysize}:</td>
                <td><select name="prefs[mysize]">{mysize}</select></td>
***************
*** 50,81 ****
                <td><select name="prefs[allsize]">{allsize}</select></td>
        </tr>
! </table>
! <table width="80%" border="0" cellspacing="2" cellpadding="2">
!       <tr valign="bottom">
!               <td height="50" align="left">
!                       <input type="submit" name="save" value="{lang_save}">
!                       </form>
!               </td>
!               <td height="50" align="left">
!                       <form method="POST" action="{doneurl}">
!                       <input type="submit" name="done" 
value="{lang_done}"></form></td>
        </tr>
- </table>
- </center>
- 
  <!-- END book -->
  
! <!-- BEGIN no -->
! 
!               <td>{lang_no_prefs}</td>
        </tr>
!       <tr valign="bottom">
!               <td height="50" align="left">
!                       <input type="submit" name="done" value="{lang_done}">
!                       </form>
                </td>
        </tr>
  </table>
  </center>
! 
! <!-- END no -->
--- 48,81 ----
                <td><select name="prefs[allsize]">{allsize}</select></td>
        </tr>
!       <tr height="5">
!               <td>&nbsp;</td>
        </tr>
  <!-- END book -->
  
! <!-- BEGIN all -->
!       <tr bgcolor="{th_bg}">
!               <td colspan="2"><b>{lang_notifications}</b></td>
!       </tr>
!       <tr bgcolor="{row_off}">
!               <td>{lang_notify_mstone}:</td>
!               <td><input type="checkbox" name="prefs[notify_mstone]" 
value="True" {notify_mstone_selected}></td>
        </tr>
!       <tr bgcolor="{row_on}">
!               <td>{lang_notify_task}:</td>
!               <td><input type="checkbox" name="prefs[notify_task]" 
value="True" {notify_task_selected}></td>
!       </tr>
!       <tr bgcolor="{row_off}">
!               <td>{lang_notify_assign}:</td>
!               <td><input type="checkbox" name="prefs[notify_assign]" 
value="True" {notify_assign_selected}></td>
!       </tr>
!       <tr valign="bottom" height="50">
!               <td align="left">
!                       <input type="submit" name="save" value="{lang_save}">
                </td>
+               <td align="right">
+                       <input type="submit" name="done" 
value="{lang_done}"></td>
        </tr>
  </table>
+ </form>
  </center>
! <!-- END all -->

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

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

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

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

Index: view.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/projects/templates/default/view.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** view.tpl    17 Jun 2003 12:39:17 -0000      1.8
--- view.tpl    10 Sep 2003 00:28:58 -0000      1.9
***************
*** 6,17 ****
  <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>
--- 6,21 ----
  <table width="85%" border="0" cellspacing="3" cellpadding="3">
  
        <tr bgcolor="{row_on}">
+               <td><b>{lang_main}</b></td>
+               <td>{pro_main}</td>
+       </tr>
+       <tr bgcolor="{row_off}">
                <td><b>{lang_investment_nr}</b></td>
                <td>{investment_nr}</td>
        </tr>
+       <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>
***************
*** 43,51 ****
        </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>
--- 47,55 ----
        </tr>
        <tr bgcolor="{row_on}">
!               <td valign="top"><b>{lang_bookable_activities}:</b></td>
                <td>{book_activities_list}&nbsp;</td>
        </tr>
        <tr bgcolor="{row_off}">
!               <td valign="top"><b>{lang_billable_activities}:</b></td>
                <td>{bill_activities_list}&nbsp;</td>
        </tr>
***************
*** 104,107 ****
--- 108,129 ----
                <td><b>{lang_last_update}:</b></td>
                <td>{udate}</td>
+       </tr>
+ 
+       <tr bgcolor="{row_on}">
+               <td valign="top"><b>{lang_milestones}:</b></td>
+               <td>
+                       <table width="100%" border="0" cellspacing="2" 
cellpadding="2">
+ 
+ <!-- BEGIN mslist -->
+ 
+                               <tr>
+                                       <td width="50%">{s_title}</td>
+                                       <td width="50%">{s_edateout}</td>
+                               </tr>
+ 
+ <!-- END mslist -->
+ 
+                       </table>
+               </td>
        </tr>
  </table>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]