--- cdli/zpt/CDLIFileFolderMain.zpt	2006/02/15 21:57:39	1.4
+++ cdli/zpt/CDLIFileFolderMain.zpt	2007/10/06 13:44:46	1.9.2.1
@@ -11,13 +11,20 @@
     </td>
   </tr>
 </table>
-</tal:x>
 
+</tal:x>
+ <tal:x condition="python:here.REQUEST.get('uploaded',None)">
+ <table width="100%" bgcolor="%FF0000">
+ <tr class="old">
+ 	<td>New version of <span tal:replace="python:here.REQUEST.get('uploaded',None)"/> added</td>
+ </tr>
+ </table>
+ </tal:x>
   <span tal:replace="structure here/header_html"/>
   <a tal:condition="here/hasParent" 
   tal:attributes="href python:here.aq_parent.absolute_url()"
   tal:content="python:'back (%s)'%here.aq_parent.title">back</a>
-  <hr>
+  <hr class="yellow">
   <tal:block tal:define="folders python:here.getFolders()" tal:condition="python:len(folders)>0">
   <h3>Subfolder</h3>
   <table>
@@ -27,9 +34,11 @@
   <td tal:content="python:'( files: %s)'% folder[2]"/>
   </tr>
   </table>
-  <hr>
+  <hr class="yellow">
+  <br><br>
   </tal:block>
-<form>
+
+ <form>
   <script type="text/javascript">
 <!-- 
 
@@ -65,53 +74,66 @@ selectButton=document.getElementById('se
 
 //-->
 </script>
-  <input class="space_right" type="submit" id="selectButton" value="Select All" onClick="toggleSelect(); return false">
+  <input class="button" type="submit" id="selectButton" value="Select All" onClick="toggleSelect(); return false">
+  <br><br>
 </form>
   <tal:block tal:define="sortField python:here.REQUEST.get('sortField','title');
   					    versions python:here.getVersionedFiles(sortField=sortField)">
   					   
   <form id="addBasket" tal:condition="python:len(versions)>0"  action="basketContainer/storeInBasket">
-  <input name="submit" type="submit" value="store in active basket">
-  <input name="submit" type="submit" value="store in new basket"><input name="newBasketName">
+  <input name="submit" class="button" type="submit" value="store in active basket">
+  <input name="submit" class="button" type="submit" value="store in new basket"> <input name="newBasketName">
   <input type="hidden" name="fromFileBrowser" value="1">
   <input type="hidden" name="ids" value=" "><!-- make sure that ids is existing -->
   
-  <table  width="100%" border=0 cellspacing=1 cellpadding=2>
+  <table class="filelist"  width="100%" border=0 cellspacing=1 cellpadding=2>
     <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 bgcolor="#cccccc">
-	<a>Downl. and lock</a>
+      <th align=left>
+	Downl. and lock
       </th>
-      <th align=left bgcolor="#cccccc">
-	<a>Upload</a>
+      <th align=left>
+	Upload
       </th>
+      <th>
+       &nbsp;
+       </th>
+        <th>
+       &nbsp;
+       </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><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()+'/view'"/></td>
+      <tr tal:define="lastVersion python:version[1].getContentObject()">
+	<td><nobr><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()+'/view'"/></nobr></td>
+	<td>
+		   <span tal:content="lastVersion/getDesignation|python:'ERROR'"/>
+    </td>
 	<td>
 	<span tal:replace="lastVersion/versionNumber"/>
-	<font size="-1"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/history'">(history)</a></font>
+	<nobr><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/history'">(history)</a></nobr>
 	</td>
 	<td tal:content="lastVersion/getTime"/>
 	<td tal:content="lastVersion/lastEditor"/>
@@ -128,8 +150,12 @@ selectButton=document.getElementById('se
 	  <b tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="lastVersion/lockedBy"/></b>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/unlock'">unlock</a>
 	</td>
 	<td>
-	 <a tal:repeat="collection python:version[1].isContainedInBaskets()" tal:content="collection/title"
+	 <a tal:repeat="collection python:version[1].isContainedInBaskets(context=here)" tal:content="collection/title"
 	 tal:attributes="href python:collection.getLastVersion().absolute_url()"/>	</td>
+  
+      <td>
+       <a tal:attributes="href python:here.absolute_url()+'/delete?ids='+version[0]">del</a>
+      </td>
       </tr>
     </span>
    </table>