[Phpgroupware-cvs] sync/templates/probusiness/sync.tpl, 1.3

[nomail]

Update of /sync/templates/probusiness
Modified Files:
        Branch: 
          sync.tpl

date: 2004/11/26 12:34:57;  author: fipsfuchs;  state: Exp;  lines: +21 -11

Log Message:
new version from internal CVS moved to original project
=====================================================================
Index: sync/templates/probusiness/sync.tpl
diff -u sync/templates/probusiness/sync.tpl:1.2 
sync/templates/probusiness/sync.tpl:1.3
--- sync/templates/probusiness/sync.tpl:1.2     Mon Jul 12 21:13:11 2004
+++ sync/templates/probusiness/sync.tpl Fri Nov 26 12:34:57 2004
@@ -8,11 +8,12 @@
   
 <!-- BEGIN table_header -->
   <table class="basic" cellpadding="2" cellspacing="2">
-    <tr><td class="header" colspan="3" 
align="center">{last_sync_status}</td></tr>
-    <tr class="bg_color1">
-      <td width="20%" align="left" 
style="white-space:nowrap">{head_source}</td>
-      <td width="20%" align="left" 
style="white-space:nowrap">{head_lastsync}</td>
-      <td width="20%" align="left" 
style="white-space:nowrap">{head_fullsync}</td>
+    <tr><td class="header" colspan="4">{last_sync_status}</td></tr>
+    <tr class="bg_color1" valign="top">
+      <td width="20%" align="left" style="white-space">{head_source}</td>
+      <td width="20%" align="left" style="white-space">{head_lastsync}</td>
+      <td width="20%" align="left" style="white-space">{head_fullsync}</td>
+      <td width="20%" align="left" style="white-space">{head_conflicts}</td>
     </tr>
 <!-- END table_header -->
   
@@ -32,8 +33,16 @@
        <input type="hidden" name="source" value="{lastsync_source}" />
        <input type="submit" name="name" value="{lastsync_fullsync}" />
       </form></td>
-    </tr>
 <!-- END lastsync_list -->
+<!-- BEGIN lastsync_conflictedit -->
+      <td align="left">
+      <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></td>
+    </tr>
+<!-- END lastsync_conflictedit -->
 
 <!-- BEGIN table_footer -->
   </table>
@@ -42,10 +51,10 @@
 <!-- BEGIN navigation -->
 <br />
 <table class="basic" style="border-collapse: collapse; border-spacing:0px">
-       <tr><td class="header">&nbsp;</td></tr>
-       <tr><td><div class="bg_color1"><a 
href="{DeviceListLink}">{link_showdevicelist}</a></div></td></tr>
-       <tr><td><div class="bg_color1"><a 
href="{RunOutlookLink}">{link_outlook_import}</a></td></tr>
-       <tr><td><div class="bg_color1"><a 
href="{PreferencesLink}">{link_preferences}</a></div></tr></td>
+       <tr><td class="header">Navigation</td></tr>
+       <tr><td class="bg_color1"><a 
href="{DeviceListLink}">{link_showdevicelist}</a></td></tr>
+       <tr><td class="bg_color1"><a 
href="{SourceListLink}">{link_showsourcelist}</a></td></tr>
+       <tr><td class="bg_color1"><a 
href="{PreferencesLink}">{link_preferences}</a></tr></td>
 </table>
 <!-- END navigation -->
 
@@ -54,6 +63,7 @@
 <table class="basic" style="border-collapse: collapse; border-spacing:0px">
        <tr><td class="header">debuglinks</td></tr>
        <tr><td class="bg_color1"><a 
href="{RunTestLink}">{link_testcase}</a></td></tr>
+       <tr><td class="bg_color1"><a 
href="{RunOutlookLink}">{link_outlook_import}</a></td></tr>
        <tr><td class="bg_color1"><a 
href="{RunClearLink}">{link_cleartables}</a></td></tr>
 </table>
 <!-- END debug -->