--- cdli/zpt/CDLIFileFolderMain.zpt	2005/11/03 01:47:58	1.1
+++ cdli/zpt/CDLIFileFolderMain.zpt	2006/02/15 21:57:39	1.4
@@ -1,6 +1,18 @@
 <html metal:use-macro="here/main_template/macros/page">
-  <tal:block metal:fill-slot="body">
+  <tal:block metal:fill-slot="body" tal:define="options here/REQUEST">
   <h2>CDLI File Storage - <span tal:content="here/title"/></h2>
+
+  <tal:x tal:condition="python:options.get('basketName',None)">
+<table width="100%">
+  <tr class="old"> 
+    <td>
+      <span tal:replace="python:options['numberOfObjects']"/> Objects stored in
+      <span tal:replace="python:options['basketName']"/>.
+    </td>
+  </tr>
+</table>
+</tal:x>
+
   <span tal:replace="structure here/header_html"/>
   <a tal:condition="here/hasParent" 
   tal:attributes="href python:here.aq_parent.absolute_url()"
@@ -58,8 +70,12 @@ selectButton=document.getElementById('se
   <tal:block tal:define="sortField python:here.REQUEST.get('sortField','title');
   					    versions python:here.getVersionedFiles(sortField=sortField)">
   					   
-  <form id="addBasket" tal:condition="python:len(versions)>0"  action="basket/storeInBasketForm">
-
+  <form id="addBasket" tal:condition="python:len(versions)>0"  action="basketContainer/storeInBasket">
+  <input name="submit" type="submit" value="store in active basket">
+  <input name="submit" type="submit" value="store in new basket"><input name="newBasketName">
+  <input type="hidden" name="fromFileBrowser" value="1">
+  <input type="hidden" name="ids" value=" "><!-- make sure that ids is existing -->
+  
   <table  width="100%" border=0 cellspacing=1 cellpadding=2>
     <tr>
       <th align=left bgcolor="#88ff88">
@@ -107,14 +123,16 @@ selectButton=document.getElementById('se
 	<td tal:condition="python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/downloadLocked'">download and lock</a></td>
 	<td tal:condition="not:python:lastVersion.lockedBy==''"><a>locked</a></td>
 	
-	<td tal:condition="python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addVersionedFileObjectForm'">Upload New Version</a></td>
+	<td tal:condition="python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addCDLIFileObjectForm'">Upload New Version</a></td>
 	<td tal:condition="not:python:lastVersion.lockedBy==''">
-	  <b tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addVersionedFileObjectForm'">Locked by: <span tal:replace="lastVersion/lockedBy"/></b>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/unlock'">unlock</a>
+	  <b tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="lastVersion/lockedBy"/></b>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/unlock'">unlock</a>
 	</td>
+	<td>
+	 <a tal:repeat="collection python:version[1].isContainedInBaskets()" tal:content="collection/title"
+	 tal:attributes="href python:collection.getLastVersion().absolute_url()"/>	</td>
       </tr>
     </span>
    </table>
-   <input type="submit" value="store in basket">
    </form>
    </tal:block>
    </tal:block>
