|
| From: | Ralf Becker <address@hidden> |
| Subject: | [Phpgroupware-cvs] CVS: infolog/templates/default delete.xet, NONE, 1.1.2.1 edit.xet, NONE, 1.6.2.1 index.xet, NONE, 1.3.2.1 admin.tpl, 1.1, 1.1.4.1 csv_import.tpl, 1.1.1.1, 1.1.1.1.4.1 preference_acl_row.tpl, 1.1.1.1.6.1, 1.1.1.1.6.2 preference_colspan.tpl, 1.1.1.1.2.1.2.1, 1.1.1.1.2.1.2.2 add_file.tpl, 1.2, NONE delete.tpl, 1.6, NONE form.tpl, 1.7.2.1.2.1, NONE info.css, 1.2.2.1, NONE list.tpl, 1.7.2.1, NONE |
| Date: | Mon, 11 Aug 2003 18:32:57 -0400 |
Update of /cvsroot/phpgroupware/infolog/templates/default
In directory subversions:/tmp/cvs-serv28071/templates/default
Modified Files:
Tag: Version-0_9_16-branch
admin.tpl csv_import.tpl preference_acl_row.tpl
preference_colspan.tpl
Added Files:
Tag: Version-0_9_16-branch
delete.xet edit.xet index.xet
Removed Files:
Tag: Version-0_9_16-branch
add_file.tpl delete.tpl form.tpl info.css list.tpl
Log Message:
merged the HEAD version of InfoLog into the .16 branch
jengos InfoLog version is now in a branch called "jengo"
***** Error reading new file: [Errno 2] No such file or directory: 'delete.xet'
***** Error reading new file: [Errno 2] No such file or directory: 'edit.xet'
***** Error reading new file: [Errno 2] No such file or directory: 'index.xet'
Index: admin.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/templates/default/admin.tpl,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -r1.1 -r1.1.4.1
*** admin.tpl 7 Oct 2001 20:15:59 -0000 1.1
--- admin.tpl 11 Aug 2003 22:32:55 -0000 1.1.4.1
***************
*** 1,10 ****
! <p><b>{title}:</b><hr><p>
<form action="{action_url}" method="POST">
<table border="0">
! <!-- BEGIN admin_header -->
! <tr bgcolor="{bg_h_color}">
<td colspan="4">{text}</td>
</tr>
! <tr bgcolor="{bg_h_color}">
<td>#</td>
<td>{lang_valid}</td>
--- 1,19 ----
! <!-- BEGIN admin_line -->
! <tr class="{tr_color}">
! <td>{num}:</td>
! <td>{val_valid}</td>
! <td>{val_trans}</td>
! <td>{val_ip}</td>
! </tr>
! <!-- END admin_line -->
!
! <!-- BEGIN info_admin -->
! <br>
<form action="{action_url}" method="POST">
<table border="0">
! <tr class="th">
<td colspan="4">{text}</td>
</tr>
! <tr class="th">
<td>#</td>
<td>{lang_valid}</td>
***************
*** 12,25 ****
<td>{lang_ip}</td>
</tr>
! <!-- END admin_header -->
! <!-- BEGIN admin_line -->
! <tr bgcolor="{bg_nm_color}">
! <td>{num}:</td>
! <td>{val_valid}</td>
! <td>{val_trans}</td>
! <td>{val_ip}</td>
</tr>
- <!-- END admin_line -->
</table>
- <p>{save_button} {done_button}
</form>
--- 21,31 ----
<td>{lang_ip}</td>
</tr>
! {admin_lines}
! <tr>
! <td colspan="4" align="left">
! {save_button} {done_button}
! </td>
</tr>
</table>
</form>
+ <!-- END info_admin -->
Index: csv_import.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/templates/default/csv_import.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -C2 -r1.1.1.1 -r1.1.1.1.4.1
*** csv_import.tpl 23 May 2001 19:07:46 -0000 1.1.1.1
--- csv_import.tpl 11 Aug 2003 22:32:55 -0000 1.1.1.1.4.1
***************
*** 1,65 ****
! {info_css}<p class=action>{lang_info_action}<br>
! <hr noshade width="98%" align="center" size="1">
! <center>
!
! <FORM {enctype} action="{action_url}" method="post">
! <TABLE>
!
! <!-- BEGIN filename -->
! <TR>
! <TD>{lang_csvfile}</td>
! <td><INPUT NAME="csvfile" SIZE=30 TYPE="file"
VALUE="{csvfile}"></td>
! </tr>
! <tr>
! <td>{lang_fieldsep}</td>
! <td><input name="fieldsep" size=1
value="{fieldsep}"></td>
! </tr>
! <tr><td> </td>
! <td><INPUT NAME="convert" TYPE="submit"
VALUE="{submit}"></TD>
! </TR>
! <!-- END filename -->
!
! <!-- BEGIN fheader -->
! <tr>
! <td><b>{lang_csv_fieldname}</b></td>
! <td><b>{lang_info_fieldname}</b></td>
! <td><b>{lang_translation}</b></td>
! </tr>
! <!-- END fheader -->
!
! <!-- BEGIN fields -->
! <tr>
! <td>{csv_field}</td>
! <td><SELECT
name="info_fields[{csv_idx}]">{info_fields}</select></td>
! <td><input name="trans[{csv_idx}]" size=60
value="{trans}"></td>
! </tr>
! <!-- END fields -->
!
! <!-- BEGIN ffooter -->
! <tr>
! <td rowspan=2 valign="middle"><br><INPUT
NAME="convert" TYPE="submit" VALUE="{submit}"></TD>
! <td colspan=2><br>
! {lang_start} <INPUT name="start"
type="text" size="5" value="{start}">
! {lang_max} <INPUT name="max"
type="text" size="3" value="{max}"><td>
! </tr>
! <tr>
! <td><INPUT name="debug" type="checkbox"
value="1" checked> {lang_debug}</td>
! </TR>
! <tr><td colspan=3> <p>
! {help_on_trans}
! </td></tr>
! <!-- END ffooter -->
!
! <!-- BEGIN imported -->
! <tr>
! <td colspan=2 align=center>
! {log}<p>
! {anz_imported}
! </td>
! </TR>
! <!-- END imported -->
!
! </TABLE>
! {hiddenvars}</form>
!
! </CENTER>
--- 1,67 ----
! <!-- BEGIN filename -->
! <TR>
! <TD>{lang_csvfile}</td>
! <td><INPUT NAME="csvfile" SIZE=30 TYPE="file"
VALUE="{csvfile}"></td>
! </tr>
! <tr>
! <td>{lang_fieldsep}</td>
! <td><input name="fieldsep" size=1
value="{fieldsep}"></td>
! </tr>
! <tr><td> </td>
! <td><INPUT NAME="convert" TYPE="submit"
VALUE="{submit}"></TD>
! </TR>
! <!-- END filename -->
!
! <!-- BEGIN fheader -->
! <tr>
! <td><b>{lang_csv_fieldname}</b></td>
! <td><b>{lang_info_fieldname}</b></td>
! <td><b>{lang_translation}</b></td>
! </tr>
! <!-- END fheader -->
!
! <!-- BEGIN fields -->
! <tr>
! <td>{csv_field}</td>
! <td><SELECT
name="info_fields[{csv_idx}]">{info_fields}</select></td>
! <td><input name="trans[{csv_idx}]" size=60
value="{trans}"></td>
! </tr>
! <!-- END fields -->
!
! <!-- BEGIN ffooter -->
! <tr>
! <td rowspan=2 valign="middle"><br><INPUT
NAME="convert" TYPE="submit" VALUE="{submit}"></TD>
! <td colspan=2><br>
! {lang_start} <INPUT name="start"
type="text" size="5" value="{start}">
! {lang_max} <INPUT name="max"
type="text" size="3" value="{max}"><td>
! </tr>
! <tr>
! <td><INPUT name="debug" type="checkbox"
value="1" checked> {lang_debug}</td>
! </TR>
! <tr><td colspan=3> <p>
! {help_on_trans}
! </td></tr>
! <!-- END ffooter -->
!
! <!-- BEGIN imported -->
! <tr>
! <td colspan=2 align=center>
! {log}<p>
! {anz_imported}
! </td>
! </TR>
! <!-- END imported -->
!
! <!-- BEGIN import -->
! <center>
! <FORM {enctype} action="{action_url}" method="post">
! <TABLE>
!
! {rows}
!
! </TABLE>
! {hiddenvars}
! </form>
!
! </CENTER>
! <!-- END import -->
Index: preference_acl_row.tpl
===================================================================
RCS file:
/cvsroot/phpgroupware/infolog/templates/default/preference_acl_row.tpl,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -C2 -r1.1.1.1.6.1 -r1.1.1.1.6.2
*** preference_acl_row.tpl 26 Mar 2003 23:00:03 -0000 1.1.1.1.6.1
--- preference_acl_row.tpl 11 Aug 2003 22:32:55 -0000 1.1.1.1.6.2
***************
*** 1,4 ****
<!-- $Id$ -->
! <tr bgcolor="{row_color}">
<td>{user}</td>
<td align="center"><input type="checkbox" name="{read}"
value="Y"{read_selected}></td>
--- 1,4 ----
<!-- $Id$ -->
! <tr class="{row_color}">
<td>{user}</td>
<td align="center"><input type="checkbox" name="{read}"
value="Y"{read_selected}></td>
***************
*** 7,11 ****
<td align="center"><input type="checkbox" name="{delete}"
value="Y"{delete_selected}></td>
<td align="center"><input type="checkbox" name="{private}"
value="Y"{private_selected}></td>
- <td align="center"><input type="checkbox" name="{custom_1}"
value="Y"{custom_1_selected}></td>
- <td align="center"><input type="checkbox" name="{custom_2}
value="Y"{custom_2_selected}></td>
</tr>
--- 7,9 ----
Index: preference_colspan.tpl
===================================================================
RCS file:
/cvsroot/phpgroupware/infolog/templates/default/preference_colspan.tpl,v
retrieving revision 1.1.1.1.2.1.2.1
retrieving revision 1.1.1.1.2.1.2.2
diff -C2 -r1.1.1.1.2.1.2.1 -r1.1.1.1.2.1.2.2
*** preference_colspan.tpl 26 Mar 2003 23:00:03 -0000 1.1.1.1.2.1.2.1
--- preference_colspan.tpl 11 Aug 2003 22:32:55 -0000 1.1.1.1.2.1.2.2
***************
*** 1,10 ****
! <tr bgcolor="{bg_color}">
! <td>{string}</td>
! <td align="center" width="8%">{lang_read}</td>
! <td align="center" width="8%">{lang_add}</td>
! <td align="center" width="8%">{lang_edit}</td>
! <td align="center" width="8%">{lang_delete}</td>
! <td align="center" width="8%">{lang_private}</td>
! <td align="center" width="20%">{lang_edit_assigned}</td>
! <td align="center" width="25%">{lang_delete_assigned}</td>
! </tr>
--- 1,8 ----
! <tr class="th">
! <td>{string}</td>
! <td align="center" width="8%">{read_lang}</td>
! <td align="center" width="8%">{add_lang}</td>
! <td align="center" width="8%">{edit_lang}</td>
! <td align="center" width="8%">{delete_lang}</td>
! <td align="center" width="8%">{private_lang}</td>
! </tr>
--- add_file.tpl DELETED ---
--- delete.tpl DELETED ---
--- form.tpl DELETED ---
--- info.css DELETED ---
--- list.tpl DELETED ---
| [Prev in Thread] | Current Thread | [Next in Thread] |