--- cdli/zpt/BasketContainerMain.zpt	2006/02/15 21:57:39	1.2
+++ cdli/zpt/BasketContainerMain.zpt	2007/03/23 13:58:11	1.7
@@ -4,78 +4,99 @@
   <h3>Manage Baskets</h3>
   
   <p><a href="basketContainer/uploadBasket_html">Upload an atf file / basket</p>
-  
-  <h4>Baket overview</h4>
-  <tal:block tal:define="sortField python:here.REQUEST.get('sortField','title');
+  <hr class="yellow">
+  <h4>Basket overview</h4>
+  <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" value="delete"> or <input type="submit" value="duplicate"> selected basket(s).
+  <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>
-  <table  width="100%" border=0 cellspacing=1 cellpadding=2>
+   <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:version[1].title"/>
+  	</select>
+	from
+	<select name="basket1">
+  		<option tal:repeat="version versions" tal:attributes="value python:version[0]" tal:content="python: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>active</th>
-    	  <th>&nbsp;</th>
-    	  <th align=left bgcolor="#00">
+    	  <th align=left bgcolor="#222222">active</th>
+    	  <th align=left bgcolor="#222222">
       <a href="?sortField=title"> Basket Name</a>
       </th>
-      <th align=left bgcolor="#00">
-	<a>Rev.</a>
+      <th align=left bgcolor="#777777">
+	Rev.
       </th>
-      <th align=left bgcolor="#cccccc">
+      <th align=left bgcolor="#777777">
 	<a href="?sortField=date">Date</a>
       </th>
-      <th align=left bgcolor="#cccccc">
+      <th align=left bgcolor="#777777">
 	<a href="?sortField=author">Author</a>
       </th>
-      <th align=left bgcolor="#cccccc">
-	<a >Last log entry</a>
+      <th align=left bgcolor="#777777">
+	Last log entry
       </th>
-      <th align=left bgcolor="#cccccc" width="80">
+      <th align=left bgcolor="#777777" 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 bgcolor="#777777">
+	Download<br><a tal:attributes="href python:here.absolute_url()+'/helpDownload'" target="help">(help)</a>
       </th>
-     <th align=left bgcolor="#cccccc">
-	<a>Downl. and lock</a>
+     <th align=left bgcolor="#777777">
+	Downl. and lock
       </th>
-      <th align=left bgcolor="#cccccc">
-	<a>Upload</a>
+      <th align=left bgcolor="#777777">
+	Upload
       </th>
     </tr>
-    <span tal:omit-tag="" tal:define="sortField python:here.REQUEST.get('sortField','title')" tal:repeat="version versions">
-      <tr tal:define="lastVersion python:version[1].getLastVersion()">
-    <td tal:condition="python:here.getActiveBasket() and (here.getActiveBasket().getId()==version[1].getId())">
+
+    <span tal:omit-tag="" tal:define="sortField python:here.REQUEST.get('sortField','date')" tal:repeat="version versions">
+    
+    <tr tal:define="lastVersion python:version[1].getLastVersion(); global active python:''">
+        <span tal:omit-tag="" tal:condition="python:here.getActiveBasket() and (here.getActiveBasket().getId()==version[1].getId())">
+            <span tal:omit-tag="" tal:define="global active python:'active_b'"/>
+        </span>
+    <td tal:condition="python:here.getActiveBasket() and (here.getActiveBasket().getId()==version[1].getId())" class="active_b">
+
     	<input type="radio" checked name="active=" tal:attributes="value python:version[1].getId();
     															onselect python:'location.href=\'setActiveBasket?basketId='+version[1].getId()+'\''
     															">
     	</td>
     	<td tal:condition="not:python:here.getActiveBasket() and (here.getActiveBasket().getId()==version[1].getId())">
     	<input type="radio" name="active=" tal:attributes="value python:version[1].getId();
-    													onchange python:'location.href=\'setActiveBasket?basketId='+version[1].getId()+'\''">
+    													onchange python:'location.href=\'setActiveBasket?basketId='+version[1].getId()+'&'+here.REQUEST['QUERY_STRING']+'\''">
     	</td>  
-	<td><input type="checkbox" tal:attributes="value python:version[1].getId()" name="ids"></td>
-	<td>
+
+	<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>
-	<td>
-	<span tal:replace="lastVersion/getId"/>
-	<font size="-1"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/history'">(history)</a></font>
+	<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>
 	</td>
-	<td tal:content="lastVersion/getTime"/>
-	<td tal:content="lastVersion/getUser"/>
-	<td tal:content="lastVersion/getComment"/>
-        <td><a tal:attributes="href python:lastVersion.absolute_url()+'/manageVCommentForm'"><small tal:content="python:lastVersion.getComment()"/></a></td>
+
+	<td tal:attributes="class python: active" tal:content="lastVersion/getTime"/>
+	<td tal:attributes="class python: active" tal:content="lastVersion/getUser"/>
+	<td tal:attributes="class python: active" tal:content="lastVersion/getComment"> </td>
+    <td tal:attributes="class python: active"><a tal:attributes="href python:lastVersion.absolute_url()+'/manageVCommentForm'"><small tal:content="python:lastVersion.getComment()"/></a> </td>
         <!--<td><a tal:attributes="href python:version[1].absolute_url()+'/manageCommentForm'"><small tal:content="python:version[1].getComment()"/></a></td>-->
-	<td><a tal:attributes="href python:lastVersion.absolute_url()+'/downloadObjectsAsOneFile'">download</a></td>
-	<td><a tal:attributes="href python:lastVersion.absolute_url()+'/downloadObjectsAsOneFile?lock=yes'"> download with locking</a>
-	<td><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/uploadBasket_html?basketId='+version[0]">Upload New Version</a></td>
-
- 	
- 
-	
+	<td tal:attributes="class python: active"><a tal:attributes="href python:lastVersion.absolute_url()+'/downloadObjectsAsOneFile'">download</a></td>
+	<td tal:attributes="class python: active"><a tal:attributes="href python:lastVersion.absolute_url()+'/downloadObjectsAsOneFile?lock=yes'"> download with locking</a></td>
+	<td tal:attributes="class python: active"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/uploadBasket_html?basketId='+version[0]">Upload New Version</a></td>
       </tr>
+
+
+
     </span>
    </table>
    </form>