[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] sync/templates/default/sync.tpl, 1.11
From: |
nomail |
Subject: |
[Phpgroupware-cvs] sync/templates/default/sync.tpl, 1.11 |
Date: |
Thu, 1 Jul 2004 10:47:40 +0200 |
Update of /sync/templates/default
Modified Files:
Branch:
sync.tpl
date: 2004/07/01 08:47:40; author: mleonhardt; state: Exp; lines: +13 -2
Log Message:
- handful new functions for conflict-view in UI
=====================================================================
Index: sync/templates/default/sync.tpl
diff -u sync/templates/default/sync.tpl:1.10
sync/templates/default/sync.tpl:1.11
--- sync/templates/default/sync.tpl:1.10 Wed May 26 13:02:49 2004
+++ sync/templates/default/sync.tpl Thu Jul 1 08:47:40 2004
@@ -13,6 +13,7 @@
<td width="20%" align="left"><font face="Arial, Helvetica, sans-serif"
size="2">{head_source}</font></td>
<td width="20%" align="left"><font face="Arial, Helvetica, sans-serif"
size="2">{head_lastsync}</font></td>
<td width="20%" align="left"><font face="Arial, Helvetica, sans-serif"
size="2">{head_fullsync}</font></td>
+ <td width="20%" align="left"><font face="Arial, Helvetica, sans-serif"
size="2">{head_conflicts}</font></td>
</tr>
<!-- END table_header -->
@@ -32,16 +33,26 @@
<input type="hidden" name="source" value="{lastsync_source}"/>
<input type="submit" name="name" value="{lastsync_fullsync}"/>
</form></font></td>
- </tr>
<!-- END lastsync_list -->
+<!-- BEGIN lastsync_conflictedit -->
+ <td align="left"><font face="Arial, Helvetica, sans-serif" size="2">
+ <form name="showconflictsform" method="post"
action="{showconflictsformaction}">
+ <input type="hidden" name="deviceid" value="{deviceid}"/>
+ <input type="hidden" name="source" value="{lastsync_source}"/>
+ <input type="submit" name="name" value="{lastsync_editconflicts}"/>
+ </form></font></td>
+ </tr>
+<!-- END lastsync_conflictedit -->
<!-- BEGIN table_footer -->
</table>
<!-- END table_footer -->
<!-- BEGIN navigation -->
+Navigation
<br>
<a href="{DeviceListLink}">{link_showdevicelist}</a><br>
+<a href="{SourceListLink}">{link_showsourcelist}</a><br>
<a href="{PreferencesLink}">{link_preferences}</a><br>
<!-- END navigation -->
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] sync/templates/default/sync.tpl, 1.11,
nomail <=