--- cdli/zpt/BasketVersionMain.zpt	2006/02/13 20:35:35	1.2
+++ cdli/zpt/BasketVersionMain.zpt	2008/10/29 12:10:05	1.13
@@ -8,76 +8,138 @@
                     next python:batch.next">
 
   
-  <h2>CDLI File Storage</h2>
-  <p>Basket: <span tal:replace="python:here.aq_parent.title"/> contains <span tal:replace="here/numberOfItems"/> items</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>
- 
+  <table width="100%" border=0 cellpadding=0 cellspacing=0>
+  <tr>
+  <td>
+ <h2>Basket: <span tal:replace="python:here.aq_parent.title"/></h2>
+  <p>Your basket contains <span tal:replace="here/numberOfItems"/> files(s).</p>
+  <p>You can now: </p>
+   <p><a tal:attributes="href python:here.getId()+'/downloadObjectsAsOneFile'"> download basket (combined in one file)</a></p>
+   <p>or</p>
+ <p><a tal:attributes="href python:here.getId()+'/downloadObjectsAsOneFile?lock=yes'"> download basket and lock all files (combined in one file)</a>
+ </p>
+ <p>or</p>
+<!-- <p><a tal:attributes="href python:here.basketContainer.absolute_url()+'/uploadBasket_html'"> upload a basket </a></p>-->
+  <p>
+  <a tal:attributes="href python:here.aq_parent.absolute_url()+'/history'">View the history of your basket</a>
+  </p>
+  <p>or</p>
+  <p>
+  <a tal:attributes="href python:here.absolute_url()+'/downloadListOfPnumbers'">Download list of p numbers</a>
+  </p>
+  <p>
+    <form action="searchInBasket">
+      Search in the basket:
+	<select name="indexName">
+	  <option value="graphemeSplitter">grapheme</option>
+	  <option value="wordSplitter">word</option>
+	</select>
+	<input name="searchStr"><input type="hidden" name="skip" value="50">
+	<input type="hidden" name="start" value="0"><input type="submit" value="search">
+	<input type="hidden" name="hl" value="yes">
+	<br> Use regexp (currently very slow):
+	<input type="radio" name="regExp" value="no" checked="true">No
+	<input type="radio" name="regExp" value="yes">Yes
+	<br>  
+    </form>
+  </p>
+  </td>
+  <td valign="top" align=right>
+  <div class="tip">
+Note that any file you download will have the extension "atf". You can open this file with any text editor including Microsoft Word. If you are not able to save your document with the extension atf, then save it as txt (text only), and send the file to <a href="mailto:cdli@ucla.edu">cdli@ucla.edu</a> instead of uploading directly on your own. A member of the cdli team will then upload the file for you.
+</div>
+  </td>
+  </tr>
+  <tr>
+  <td colspan="2">
+ <hr class="yellow">
+ <h3>Content of your basket</h3>
+ <p>note that</p>
+ <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}"
-       href="previous_url">previous <span tal:replace="previous/length">20</span> results</a>
-    <a tal:condition="next"
+       href="previous_url"><< previous <span tal:replace="previous/length">20</span> results</a>
+     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a tal:condition="next"
        tal:attributes="href string:${request/URL0}?start:int=${next/first}"
-       href="next_url">next <span tal:replace="next/length">20</span> results</a>
+       href="next_url">next <span tal:replace="next/length">20</span> results >></a>
   </p>
- <form action="basket/deleteObjects">
- <table  width="100%" border=0 cellspacing=1 cellpadding=2>
+ 
+ <form action="changeBasket">
+ <table  width="100%" border=0 cellspacing=1 cellpadding=2 class="filelist">
     <tr>
-      <th align=left bgcolor="#88ff88">
+      <th align=left>
       <a href="?sortField=title"> File</a>
       </th>
-      <th align=left bgcolor="#00">
-	<a>Rev.</a>
+      <th align=left>
+      Designation
+      </th>
+      
+      <th align=left>
+	Revisions
       </th>
-      <th align=left bgcolor="#cccccc">
+      <th align=left>
 	<a href="?sortField=date">Date</a>
       </th>
-      <th align=left bgcolor="#cccccc">
+      <th align=left>
 	<a href="?sortField=author">Author</a>
       </th>
-      <th align=left bgcolor="#cccccc">
-	<a >Last log entry</a>
+      <th align=left>
+	Last log entry
       </th>
-      <th align=left bgcolor="#cccccc" width="80">
+      <th align=left width="80">
 	<a href="?sortField=comment">Comment</a>
       </th>
-      <th align=left bgcolor="#cccccc">
-	<a>Download<br><font size="-1"><a tal:attributes="href python:here.absolute_url()+'/helpDownload'" target="help">(help)</a></font></a>
+      <th align=left>
+	Download<br><a tal:attributes="href python:here.absolute_url()+'/helpDownload'" target="help">(help)</a>
+      </th>
+      <th align=left>
+	Downl. and lock
       </th>
-      <th align=left bgcolor="#cccccc">
-	<a>Downl. and lock</a>
+      <th align=left>
+	Upload
       </th>
-      <th align=left bgcolor="#cccccc">
-	<a>Upload</a>
+      <th>
+      Contained in: 
       </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')">
-	<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 tal:define="version python:here.getFileObject(result[0]);lastVersion python:version.getVersionNr(result[1]);actual python:here.isActual(version,result[1]);">
+    <tr tal:attributes="class python:test(actual[0],'actual','old')">
+	<td><nobr><input type="checkbox" tal:attributes="value version/getId" name="ids">
+		<tal:x condition="python:actual[1]==-1">DEL</tal:x>   <a tal:content="python:version.getTitle()" tal:attributes="href python:here.getObjUrl(result[0])+'/'+lastVersion.getId()+'/view?fromBasket='+here.aq_parent.id+'&filenr='+str(results.index(result))"/></nobr>
+    </td>
+    <td tal:condition="python:hasattr(lastVersion,'getDesignation')">
+		   <span tal:content="python:here.unicodify(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>
+	<nobr><a tal:attributes="href python:here.getObjUrl(result[0])+'/history'">(history)</a></nobr>
 	</td>
 	<td tal:content="lastVersion/getTime"/>
 	<td tal:content="lastVersion/lastEditor"/>
 	<td tal:content="lastVersion/getVersionComment"/>
-        <td><a tal:attributes="href python:here.getObjUrl(result)+'/manageVCommentForm'"><small tal:content="python:lastVersion.getVComment()"/></a></td>
-        <!--<td><a tal:attributes="href python:version.absolute_url()+'/manageCommentForm'"><small tal:content="python:version.getComment()"/></a></td>-->
-	<td><a tal:attributes="href python:here.getObjUrl(result)">download</a></td>
+        <td><a tal:attributes="href python:here.getObjUrl(result[0])+'/manageVCommentForm'"><small tal:content="python:lastVersion.getVComment()"/></a></td>
+       <!-- <td><a tal:attributes="href python:version.absolute_url()+'/manageCommentForm'"><small tal:content="python:version.getComment()"/></a></td>-->
+	<td><a tal:attributes="href python:here.getObjUrl(result[0])">download</a></td>
 	
-	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result)+'/downloadLocked'">download and lock</a></td>
+	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result[0])+'/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+'/addCDLIFileObjectForm'">Upload New Version</a></td>
+	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result[0])+'/'+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)+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="version/lockedBy"/></b>&nbsp;
-	  <a tal:attributes="href python:here.getObjUrl(result)+'/unlock'">unlock</a>
+	  <b tal:attributes="href python:here.getObjUrl(result[0])+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="version/lockedBy"/></b>&nbsp;
+	  <a tal:attributes="href python:here.getObjUrl(result[0])+'/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>
@@ -86,11 +148,17 @@
   <p>
     <a tal:condition="previous"
        tal:attributes="href string:${request/URL0}?start:int=${previous/first}"
-       href="previous_url">previous <span tal:replace="previous/length">20</span> results</a>
-    <a tal:condition="next"
+       href="previous_url"><< previous <span tal:replace="previous/length">20</span> results</a>
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a tal:condition="next"
        tal:attributes="href string:${request/URL0}?start:int=${next/first}"
-       href="next_url">next <span tal:replace="next/length">20</span> results</a>
+       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" class="button"> or
+<input type="submit" name="submit" value="delete" class="button">
+selected files
+</td>
+</tr>
+</table>
 </tal:block>
+
 </html>
\ No newline at end of file