[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sync/templates/default/listconflicts.tpl, 1.2
From: |
nomail |
Subject: |
[Phpgroupware-cvs] sync/templates/default/listconflicts.tpl, 1.2 |
Date: |
Tue, 6 Jul 2004 12:14:41 +0200 |
Update of /sync/templates/default
Modified Files:
Branch:
listconflicts.tpl
date: 2004/07/06 10:14:41; author: mleonhardt; state: Exp; lines: +5 -1
Log Message:
- save conflictsolution implementation
=====================================================================
Index: sync/templates/default/listconflicts.tpl
diff -u sync/templates/default/listconflicts.tpl:1.1
sync/templates/default/listconflicts.tpl:1.2
--- sync/templates/default/listconflicts.tpl:1.1 Thu Jul 1 08:47:40 2004
+++ sync/templates/default/listconflicts.tpl Tue Jul 6 10:14:41 2004
@@ -54,6 +54,8 @@
<td></td>
<td>
<form name="conflictform" method="post" action="{conflictformaction}">
+<input type="hidden" name="deviceid" value="{deviceid}"/>
+<input type="hidden" name="source" value="{source}"/>
<input type="hidden" name="conflictid" value="{conflictid}"/>
<input type="hidden" name="conflictaction" value="server"/>
<input type="submit" name="saveserver" value="{link_apply}"></input>
@@ -61,6 +63,8 @@
</td>
<td>
<form name="conflictform" method="post" action="{conflictformaction}">
+<input type="hidden" name="deviceid" value="{deviceid}"/>
+<input type="hidden" name="source" value="{source}"/>
<input type="hidden" name="conflictid" value="{conflictid}"/>
<input type="hidden" name="conflictaction" value="client"/>
<input type="submit" name="saveserver" value="{link_apply}"></input>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sync/templates/default/listconflicts.tpl, 1.2,
nomail <=