--- versionedFile/zpt/versionHistory.zpt	2004/03/22 15:46:07	1.1.1.1
+++ versionedFile/zpt/versionHistory.zpt	2004/07/08 15:55:27	1.3
@@ -5,9 +5,9 @@
   <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="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></h3>
 <h3 tal:condition="python:here.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/addVersionedFileObjectForm'">Upload New Version</a></h3>
-
+<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>
@@ -31,14 +31,14 @@
       </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].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:here.REQUEST['URL1']+'/'+version[1].getId()+'/download'">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>