--- versionedFile/zpt/versionHistory.zpt	2004/03/22 15:46:07	1.1
+++ versionedFile/zpt/versionHistory.zpt	2005/03/21 08:12:46	1.6
@@ -1,13 +1,16 @@
 <html>
   <h2>Versioned File - <span tal:content="here/title"/></h2>
-  
-  <p><a tal:attributes="href python:here.REQUEST['URL2']">Back to the Folder</a></p>
-  <p><a target="_blank" tal:attributes="href python:here.REQUEST['URL2']+'/acl_users/manage_main'">add a new User</a></p>
-
-
-  <h3 tal:condition="not:python:here.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/addVersionedFileObjectForm'">No upload possible: File is locked by <span tal:replace="python:here.lockedBy"/></a>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/unlock'">unlock</a></h3>
-<h3 tal:condition="python:here.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/addVersionedFileObjectForm'">Upload New Version</a></h3>
-
+  <table>
+    <tr>
+      <td>
+	<a tal:attributes="href python:here.REQUEST['URL2']">Back to the Folder</a><br>
+	<a target="_blank" tal:attributes="href python:here.REQUEST['URL2']+'/acl_users/manage_main'">add a new User</a><br><br>
+	<font size="+1" tal:condition="not:python:here.lockedBy==''"><a>No upload possible: File is locked by <span tal:replace="python:here.lockedBy"/></a>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/unlock'">unlock</a></font>
+	<font size="+1" tal:condition="python:here.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/addVersionedFileObjectForm'">Upload New Version</a></font>
+     </td>
+    </tr>
+  </table>
+<h4><em>Download and lock</em> will lock the whole file not only the version!</h4>
   <table  width="100%" border=0 cellspacing=1 cellpadding=2>
     <tr>
       <th align=left bgcolor="#88ff88">File</th>
@@ -23,6 +26,9 @@
       <th align=left bgcolor="#cccccc">
 	<a href="">Log entry</a>
       </th>
+      <th align=left bgcolor="#cccccc" width="80">
+	<a href="?sortField=comment">Comment</a>
+      </th>
       <th align=left bgcolor="#cccccc">
 	<a href="">Download</a>
       </th>
@@ -31,14 +37,15 @@
       </th>
     </tr>
     <tr tal:repeat="version python:here.getVersions()">
-	<td tal:content="python:version[1].aq_parent.title"/>
+	<td tal:content="python:version[1].title"/>
 	<td tal:content="python:version[1].versionNumber"/>
-	<td tal:content="python:version[1].bobobase_modification_time()"/>
+	<td tal:content="python:version[1].getTime()"/>
 	<td tal:content="python:version[1].lastEditor()"/>
 	<td tal:content="python:version[1].versionComment"/>
-	<td><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[1].getId()">download</a></td>
-	<td><a tal:attributes="href python:here.REQUEST['URL1']+'/downloadLocked'">download and lock</a></td>
-	
+	<td><a tal:attributes="href python:version[1].absolute_url()+'/manageVCommentForm'"><small tal:content="python:version[1].getVComment()"/></a></td>
+	<td><a tal:attributes="href python:version[1].absolute_url()">download</a></td>
+	<td tal:condition="python:here.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[1].getId()+'/downloadLocked'">download and lock</a></td>
+	<td tal:condition="not:python:here.lockedBy==''"><a>locked</a></td>
 	
       </tr>
    </table>
