--- cdli/zpt/BasketVersionMain.zpt	2006/02/02 19:19:24	1.1
+++ cdli/zpt/BasketVersionMain.zpt	2006/02/28 15:17:52	1.4
@@ -7,11 +7,12 @@
                     previous python:batch.previous;
                     next python:batch.next">
 
-  
-  <h2>CDLI File Storage</h2>
-  <p>Basket: <span tal:replace="python:here.getId()"/> contains <span tal:replace="here/numberOfItems"/> items</p>
+  <h2>Basket: <span tal:replace="python:here.aq_parent.title"/></h2>
+  <p>contains <span tal:replace="here/numberOfItems"/> items
+  <a tal:attributes="href python:here.aq_parent.absolute_url()+'/history'">View history</a>
+  </p>
   <p><a tal:attributes="href python:here.getId()+'/downloadObjectsAsOneFile'"> download basket (combined in one file)</a>
- <p><a tal:attributes="href python:here.getId()+'/downloadObjectsAsOneFile?lock=yes'"> download basket and lock (combined in one file)</a>
+ <p><a tal:attributes="href python:here.getId()+'/downloadObjectsAsOneFile?lock=yes'"> download basket and lock all files(combined in one file)</a>
  
   <p>
     <a tal:condition="previous"
@@ -51,6 +52,9 @@
       <th align=left bgcolor="#cccccc">
 	<a>Upload</a>
       </th>
+      <th>
+      C
+      </th>
     </tr>
        
   <tal:x repeat="result batch">
@@ -73,11 +77,14 @@
 	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result)+'/downloadLocked'">download and lock</a></td>
 	<td tal:condition="not:python:version.lockedBy==''"><a>locked</a></td>
 	
-	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result)+'/'+version.title+'/addVersionedFileObjectForm'">Upload New Version</a></td>
+	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result)+'/'+version.title+'/addCDLIFileObjectForm'">Upload New Version</a></td>
 	<td tal:condition="not:python:version.lockedBy==''">
-	  <b tal:attributes="href python:here.getObjUrl(result)+'/addVersionedFileObjectForm'">Locked by: <span tal:replace="version/lockedBy"/></b>&nbsp;
+	  <b tal:attributes="href python:here.getObjUrl(result)+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="version/lockedBy"/></b>&nbsp;
 	  <a tal:attributes="href python:here.getObjUrl(result)+'/unlock'">unlock</a>
 	</td>
+	<td>
+	 <a tal:repeat="collection python:version.isContainedInBaskets(context=here)" tal:content="collection/title"
+	 tal:attributes="href python:collection.getLastVersion().absolute_url()"/>	</td>
    </tr>
     </tal:x>
   </tal:x>