--- cdli/zpt/BasketVersionMain.zpt	2006/02/02 19:19:24	1.1
+++ cdli/zpt/BasketVersionMain.zpt	2006/07/14 19:08:30	1.8
@@ -7,12 +7,15 @@
                     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:attributes="href python:here.basketContainer.absolute_url()+'/uploadBasket_html'"> upload a basket </a>
+ <p>red = basket refers not to the actual version</p>
+ <p>red and DEL = file has been deleted</p>
   <p>
     <a tal:condition="previous"
        tal:attributes="href string:${request/URL0}?start:int=${previous/first}"
@@ -21,14 +24,19 @@
        tal:attributes="href string:${request/URL0}?start:int=${next/first}"
        href="next_url">next <span tal:replace="next/length">20</span> results</a>
   </p>
- <form action="basket/deleteObjects">
+  <span tal:content="here/containsNonActualFiles"/>
+ <form action="changeBasket">
  <table  width="100%" border=0 cellspacing=1 cellpadding=2>
     <tr>
-      <th align=left bgcolor="#88ff88">
+      <th align=left bgcolor="#cccccc">
       <a href="?sortField=title"> File</a>
       </th>
-      <th align=left bgcolor="#00">
-	<a>Rev.</a>
+      <th align=left bgcolor="#cccccc">
+      <a> Designation</a>
+      </th>
+      
+      <th align=left bgcolor="#cccccc">
+	<a>Revisions</a>
       </th>
       <th align=left bgcolor="#cccccc">
 	<a href="?sortField=date">Date</a>
@@ -51,14 +59,24 @@
       <th align=left bgcolor="#cccccc">
 	<a>Upload</a>
       </th>
+      <th>
+      C
+      </th>
     </tr>
        
   <tal:x repeat="result batch">
-   <tal:x tal:define="version python:here.getFile(result);lastVersion python:here.getFileLastVersion(result)">
-    <tr tal:attributes="class python:test(here.isActual(result),'actual','old')">
+   <tal:x tal:define="version python:here.getFile(result);lastVersion python:here.getFileLastVersion(result);actual python:here.isActual(result)">
+    <tr tal:attributes="class python:test(actual[0],'actual','old')">
 	<td><input type="checkbox" tal:attributes="value version/getId" name="ids">
-		   <a tal:content="python:version.getTitle()" tal:attributes="href python:here.getObjUrl(result)+
-		   '/'+lastVersion.getId()+'/view'"/></td>
+		<tal:x condition="python:actual[1]==-1">DEL</tal:x>   <a tal:content="python:version.getTitle()" tal:attributes="href python:here.getObjUrl(result)+
+		   '/'+lastVersion.getId()+'/view'"/>
+    </td>
+    <td tal:condition="python:hasattr(lastVersion,'getDesignation')">
+		   <span tal:content="lastVersion/getDesignation"/>
+     </td>
+      <td tal:condition="not:python:hasattr(lastVersion,'getDesignation')">
+		   <span tal:content="python:'error'"/>
+     </td>
 	<td>
 	<span tal:replace="lastVersion/getVersionNumber"/>
 	<font size="-1"><a tal:attributes="href python:here.getObjUrl(result)+'/history'">(history)</a></font>
@@ -73,11 +91,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?come_from='+here.URLquote(here.absolute_url())">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>
@@ -91,6 +112,8 @@
        tal:attributes="href string:${request/URL0}?start:int=${next/first}"
        href="next_url">next <span tal:replace="next/length">20</span> results</a>
   </p>
-<input type="submit" value="delete from basket">
+<input type="submit" name="submit" value="update"> or
+<input type="submit" name="submit" value="delete">
+selected files
 </tal:block>
 </html>
\ No newline at end of file