--- cdli/zpt/versionHistory.zpt	2006/06/17 14:53:35	1.1
+++ cdli/zpt/versionHistory.zpt	2008/01/07 16:54:46	1.1.2.1
@@ -1,17 +1,24 @@
 <html metal:use-macro="here/main_template/macros/page">
-  <tal:block metal:fill-slot="body" tal:define="options here/REQUEST">
+  <tal:block metal:fill-slot="body" 
+    tal:define="options here/REQUEST; parent python:here.aq_parent">
+  <p><a tal:attributes="href parent/absolute_url">Up to folder <span tal:content="parent/getId"/></a></p>
+
   <h2>Versioned File - <span tal:content="here/title"/></h2>
-  <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>
+
+  <p><a tal:attributes="href python:here.getContentObject().absolute_url()+'/view'">View file</a></p>
+
+  <p 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>
+  </p>
+  <p tal:condition="python:here.lockedBy==''">
+    <a tal:attributes="href python:here.REQUEST['URL1']+'/addVersionedFileObjectForm'">Upload New Version</a>
+  </p>
+  <p tal:condition="python:here.lockedBy==''">
+    <a tal:attributes="href python:here.REQUEST['URL1']+'/deleteFileForm'">Delete this file</a>
+  </p>
+
+  <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>
@@ -41,7 +48,7 @@
       </th>
     </tr>
     <tr tal:repeat="version python:here.getVersions()">
-	<td><a tal:content="python:version[1].title" tal:attributes="href python:version[1].absolute_url()+'/view'"/></td>
+	<td><a tal:content="python:version[1].getId()" tal:attributes="href python:version[1].absolute_url()+'/view'"/></td>
 	<td tal:content="python:version[1].versionNumber"/>
 	<td tal:content="python:version[1].getTime()"/>
 	<td tal:content="python:version[1].lastEditor()"/>
