--- cdli/zpt/basketObject_index_html.zpt	2005/11/03 01:47:58	1.1
+++ cdli/zpt/basketObject_index_html.zpt	2005/12/08 17:11:31	1.3
@@ -11,6 +11,8 @@
   <h2>CDLI File Storage</h2>
   <p>Basket: <span tal:replace="here/getId"/> 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>
+ 
   <p>
     <a tal:condition="previous"
        tal:attributes="href string:${request/URL0}?start:int=${previous/first}"
@@ -54,24 +56,25 @@
   <tal:x repeat="result batch">
    <tr tal:define="version result;lastVersion python:version.getLastVersion()">
 	<td><input type="checkbox" tal:attributes="value version/getId" name="ids">
-		   <a tal:content="python:version.title" tal:attributes="href python:lastVersion.absolute_url()+'/view'"/></td>
+		   <a tal:content="python:version.title" tal:attributes="href python:here.getObjUrl(lastVersion.getId())+'/view'"/></td>
 	<td>
 	<span tal:replace="lastVersion/getVersionNumber"/>
-	<font size="-1"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version.title+'/history'">(history)</a></font>
+	<font size="-1"><a tal:attributes="href python:here.getObjUrl(version.getId())+'/history'">(history)</a></font>
 	</td>
 	<td tal:content="lastVersion/getTime"/>
 	<td tal:content="lastVersion/lastEditor"/>
 	<td tal:content="lastVersion/getVersionComment"/>
-        <td><a tal:attributes="href python:lastVersion.absolute_url()+'/manageVCommentForm'"><small tal:content="python:lastVersion.getVComment()"/></a></td>
+        <td><a tal:attributes="href python:here.getObjUrl(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:lastVersion.absolute_url()">download</a></td>
+	<td><a tal:attributes="href python:here.getObjUrl(lastVersion.getId())">download</a></td>
 	
-	<td tal:condition="python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version.title+'/downloadLocked'">download and lock</a></td>
+	<td tal:condition="python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(version.getId())+'/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.title+'/addVersionedFileObjectForm'">Upload New Version</a></td>
+	<td tal:condition="python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.getObjUrl(version.getId())+'/'+version.title+'/addVersionedFileObjectForm'">Upload New Version</a></td>
 	<td tal:condition="not:python:lastVersion.lockedBy==''">
-	  <b tal:attributes="href python:here.REQUEST['URL1']+'/'+version.title+'/addVersionedFileObjectForm'">Locked by: <span tal:replace="lastVersion/lockedBy"/></b>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/'+version.title+'/unlock'">unlock</a>
+	  <b tal:attributes="href python:here.getObjUrl(version.getId())+'/addVersionedFileObjectForm'">Locked by: <span tal:replace="lastVersion/lockedBy"/></b>&nbsp;
+	  <a tal:attributes="href python:here.getObjUrl(version.getId())+'/unlock'">unlock</a>
 	</td>
       </tr>