--- cdli/zpt/BasketContainerMain.zpt	2006/08/24 09:28:29	1.5
+++ cdli/zpt/BasketContainerMain.zpt	2009/08/31 14:06:43	1.8
@@ -9,10 +9,25 @@
   <tal:block tal:define="sortField python:here.REQUEST.get('sortField','date');
   					    versions python:here.getBaskets(sortField=sortField)">
   					   
-  <form id="addBasket" tal:condition="python:len(versions)>0"  action="basketContainer/manageBaskets">
+  <form id="addBasket" tal:condition="python:len(versions)>0"  action="manageBaskets">
   <p>
   <input type="submit" name="submit" value="delete" class="button"> <!--or <input type="submit" name="submit" value="duplicate">--> selected basket(s).
   </p>
+  <p>
+  <input type="submit" name="submit" value="join" class="button"> <!--or <input type="submit" name="submit" value="duplicate">--> selected basket(s) into basket
+  to basket <input type="text" name="joinBasket">.
+  </p>
+   <p>
+  <input type="submit" name="submit" value="subtract" class="button"> 
+  	<select name="basket2">
+  		<option tal:repeat="version versions" tal:attributes="value python:version[0]" tal:content="python:here.unicodify(version[1].title)"/>
+  	</select>
+	from
+	<select name="basket1">
+  		<option tal:repeat="version versions" tal:attributes="value python:version[0]" tal:content="python:here.unicodify(version[1].title)"/>
+  	</select>
+  	and store in <input type="text" name="subtractBasket"> 
+  </p>
   <table  width="100%" border=0 cellspacing=1 cellpadding=2 class="filelist">
     <tr>
     	  <th align=left bgcolor="#222222">active</th>
@@ -64,7 +79,7 @@
 
 	<td tal:attributes="class python: active">
 	<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()"/></td>
+	<a tal:content="python:here.unicodify(version[1].title)" tal:attributes="href python:lastVersion.absolute_url()"/></td>
 	<td tal:attributes="class python: active">
 	<nobr><span tal:replace="lastVersion/getId"/>
 	<a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/history'">(history)</a></nobr>