--- cdli/zpt/CDLIFileFolderMain.zpt	2006/02/02 19:19:24	1.2
+++ cdli/zpt/CDLIFileFolderMain.zpt	2006/05/04 14:40:09	1.7
@@ -1,6 +1,25 @@
 <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>
+ <tal:x condition="python:here.REQUEST.get('uploaded',None)">
+ <table width="100%" bgcolor="%FF0000">
+ <tr class="old">
+ 	<td>New version of <span tal:replace="python:here.REQUEST.get('uploaded',None)"/> added</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()"
@@ -17,7 +36,8 @@
   </table>
   <hr>
   </tal:block>
-<form>
+
+ <form>
   <script type="text/javascript">
 <!-- 
 
@@ -61,11 +81,17 @@ selectButton=document.getElementById('se
   <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">
       <a href="?sortField=title"> File</a>
       </th>
+        <th align=left bgcolor="#88ff88">
+      <a> Designation</a>
+      </th>
       <th align=left bgcolor="#00">
 	<a>Rev.</a>
       </th>
@@ -90,11 +116,17 @@ selectButton=document.getElementById('se
       <th align=left bgcolor="#cccccc">
 	<a>Upload</a>
       </th>
+      <th>
+       &nbsp;
+       </th>
     </tr>
     <span tal:omit-tag="" tal:define="sortField python:here.REQUEST.get('sortField','title')" tal:repeat="version versions">
       <tr tal:define="lastVersion python:version[1].getLastVersion()">
 	<td><input type="checkbox" tal:attributes="value python:version[1].getId()" name="ids"><a tal:content="python:version[1].title" tal:attributes="href python:lastVersion.absolute_url()+'/view'"/></td>
 	<td>
+		   <span tal:content="lastVersion/getDesignation|python:'ERROR'"/>
+    </td>
+	<td>
 	<span tal:replace="lastVersion/versionNumber"/>
 	<font size="-1"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/history'">(history)</a></font>
 	</td>
@@ -108,10 +140,17 @@ 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(context=here)" tal:content="collection/title"
+	 tal:attributes="href python:collection.getLastVersion().absolute_url()"/>	</td>
+  
+      <td>
+       <a tal:attributes="href python:here.absolute_url()+'/delete?ids='+version[0]">del</a>
+      </td>
       </tr>
     </span>
    </table>
