--- versionedFile/zpt/versionFileFolderMain.zpt	2004/03/22 15:46:07	1.1
+++ versionedFile/zpt/versionFileFolderMain.zpt	2005/03/02 18:21:17	1.8
@@ -1,47 +1,58 @@
 <html>
   <h2>Versioned File Folder - <span tal:content="here/title"/></h2>
+  <span tal:replace="structure here/header_html"/>
   <p><a target="_blank" tal:attributes="href python:here.REQUEST['URL1']+'/acl_users/manage_main'">add a new User</a></p>
   <p><a tal:attributes="href python:here.REQUEST['URL1']+'/addFileForm'">add a new File</a></p>
   <table  width="100%" border=0 cellspacing=1 cellpadding=2>
     <tr>
-      <th align=left bgcolor="#88ff88">File</th>
+      <th align=left bgcolor="#88ff88">
+      <a href="?sortField=title"> File</a>
+      </th>
       <th align=left bgcolor="#cccccc">
-	<a href="">Rev.</a>
+	<a>Rev.</a>
       </th>
       <th align=left bgcolor="#cccccc">
-	<a href="">Date</a>
+	<a href="?sortField=date">Date</a>
       </th>
       <th align=left bgcolor="#cccccc">
-	<a href="">Author</a>
+	<a href="?sortField=author">Author</a>
       </th>
       <th align=left bgcolor="#cccccc">
-	<a href="">Last log entry</a>
+	<a >Last log entry</a>
+      </th>
+      <th align=left bgcolor="#cccccc" width="80">
+	<a >Comment</a>
       </th>
       <th align=left bgcolor="#cccccc">
-	<a href="">Download</a>
+	<a>Download<br><font size="-1"><a tal:attributes="href python:here.absolute_url()+'/helpDownload'" target="help">(help)</a></font></a>
       </th>
       <th align=left bgcolor="#cccccc">
-	<a href="">Downl. and lock</a>
+	<a>Downl. and lock</a>
       </th>
       <th align=left bgcolor="#cccccc">
-	<a href="">Upload</a>
+	<a>Upload</a>
       </th>
     </tr>
-    <span tal:omit-tag="" tal:repeat="version here/getVersionedFiles">
+    <span tal:omit-tag="" tal:define="sortField python:here.REQUEST.get('sortField','title')" tal:repeat="version python:here.getVersionedFiles(sortField=sortField)">
       <tr tal:define="lastVersion python:version[1].getLastVersion()">
 	<td tal:content="python:version[1].title"/>
 	<td>
 	<span tal:replace="lastVersion/versionNumber"/>
 	<font size="-1"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/history'">(history)</a></font>
 	</td>
-	<td tal:content="lastVersion/bobobase_modification_time"/>
+	<td tal:content="lastVersion/getTime"/>
 	<td tal:content="lastVersion/lastEditor"/>
 	<td tal:content="lastVersion/versionComment"/>
-	<td><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/'+lastVersion.getId()">download</a></td>
-	<td><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/downloadLocked'">download and lock</a></td>
+        <td><a tal:attributes="href python:version[1].absolute_url()+'/manageCommentForm'"><small tal:content="python:getattr(version[1],'comment','Add')"/></a></td>
+	<td><a tal:attributes="href python:lastVersion.absolute_url()">download</a></td>
+	
+	<td tal:condition="python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/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[0]+'/addVersionedFileObjectForm'">Upload New Version</a></td>
-	<td tal:condition="not:python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addVersionedFileObjectForm'">Locked by: <span tal:replace="lastVersion/lockedBy"/></a>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/unlock'">unlock</a></td>
+	<td tal:condition="not:python:lastVersion.lockedBy==''">
+	  <b tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addVersionedFileObjectForm'">Locked by: <span tal:replace="lastVersion/lockedBy"/></b>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/unlock'">unlock</a>
+	</td>
       </tr>
     </span>
    </table>
