[Phpgroupware-cvs] sync/templates/default/preferences.tpl, 1.2

[nomail]

Update of /sync/templates/default
Modified Files:
        Branch: 
          preferences.tpl

date: 2004/04/30 13:58:35;  author: mleonhardt;  state: Exp;  lines: +9 -4

Log Message:
- extended sync ui
  - conflicthandling for devices
  - lastsync overview
=====================================================================
Index: sync/templates/default/preferences.tpl
diff -u sync/templates/default/preferences.tpl:1.1 
sync/templates/default/preferences.tpl:1.2
--- sync/templates/default/preferences.tpl:1.1  Thu Apr 29 12:21:36 2004
+++ sync/templates/default/preferences.tpl      Fri Apr 30 13:58:35 2004
@@ -7,10 +7,8 @@
 <p>{last_operation_status}</p>
 <!-- END status -->
   
-<!-- BEGIN conflicthandling -->
-<h4>{conflicthandling}</h4>
-<!-- END conflicthandling -->
 <!-- BEGIN table_header -->
+<h4>{conflicthandling}</h4>
   <form name="conflicthandlingform" method="post" 
action="{conflicthandlingformaction}">
   <table width="60%" border="1" cellpadding="2" cellspacing="2">
     <tr bgcolor="{th_bg}">
@@ -19,6 +17,12 @@
     </tr>
 <!-- END table_header -->
   
+<!-- BEGIN conflicthandling_device -->
+    <tr>
+      <td align="left" colspan="3"><font face="Arial, Helvetica, sans-serif" 
size="2">{conflicthandling_devicelabel}:{conflicthandling_devicename}</font></td>
+    </tr>
+<!-- END conflicthandling_device -->
+
 <!-- BEGIN conflicthandling_list -->
     <tr bgcolor="{tr_color}">
       <td align="left"><font face="Arial, Helvetica, sans-serif" 
size="2">{source}</font></td>
@@ -39,4 +43,5 @@
 <!-- END table_footer -->
 
 <!-- BEGIN page_footer -->
+<a href="{syncmoduleLink}">{link_syncmodule}</a><br>
 <!-- END page_footer -->