--- cdli/zpt/BasketVersionMain.zpt	2008/10/29 12:10:05	1.13
+++ cdli/zpt/BasketVersionMain.zpt	2011/07/21 21:58:50	1.15
@@ -11,7 +11,7 @@
   <table width="100%" border=0 cellpadding=0 cellspacing=0>
   <tr>
   <td>
- <h2>Basket: <span tal:replace="python:here.aq_parent.title"/></h2>
+ <h2>Basket: <span tal:replace="python:here.unicodify(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>
@@ -125,14 +125,14 @@ Note that any file you download will hav
 	<td tal:content="lastVersion/getTime"/>
 	<td tal:content="lastVersion/lastEditor"/>
 	<td tal:content="lastVersion/getVersionComment"/>
-        <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:here.getObjUrl(result[0])+'/'+lastVersion.getId()+'/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><a tal:attributes="href python:here.getObjUrl(result[0])+'/'+lastVersion.getId()+'/download'">download</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="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result[0])+'/'+lastVersion.getId()+'/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[0])+'/'+version.title+'/addCDLIFileObjectForm?come_from='+here.URLquote(here.absolute_url())">Upload New Version</a> </td>
+	<td tal:condition="python:version.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(result[0])+'/'+'/'+lastVersion.getId()+'/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[0])+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="version/lockedBy"/></b>&nbsp;
 	  <a tal:attributes="href python:here.getObjUrl(result[0])+'/unlock'">unlock</a>
@@ -161,4 +161,4 @@ selected files
 </table>
 </tal:block>
 
-</html>
\ No newline at end of file
+</html>