--- cdli/zpt/viewCDLIFile.zpt	2007/08/31 14:22:52	1.10
+++ cdli/zpt/viewCDLIFile.zpt	2008/10/29 12:10:05	1.12
@@ -4,18 +4,23 @@
                                               allVars python:map(lambda x: x.split('='), vars);
                                               allVarsF python:filter(lambda x: not x == [''], allVars);
                                               dictVars python:dict(allVarsF);
+                                              parent here/aq_parent;
+                                              gparent parent/aq_parent;
                                               p_no python:here.REQUEST.get('fileId',here.aq_parent.title.split('.')[0])">
   
+        <p tal:condition="not:python:dictVars.has_key('fromBasket')">
+             <a tal:attributes="href gparent/absolute_url" tal:content="string:up to folder ${gparent/getId}"/>
+        </p>
+
         <h2>Textdisplay</h2>
-      
+
         <p>
           <a tal:attributes="href string:http://cdli.mpiwg-berlin.mpg.de/ID/$p_no" target="_blank">View database entry</a>
         </p>
-    
-        <p tal:condition="not:python:dictVars.has_key('fromBasket')">
-             <a tal:content="python:'back(%s)'%here.aq_parent.aq_parent.title" tal:attributes="href python:here.aq_parent.aq_parent.absolute_url()"/>
-<!--            <a tal:content="string:back($p_no)" tal:attributes="href python:here.aq_parent.aq_parent.absolute_url()"/> -->
+        <p>
+          <a tal:attributes="href parent/absolute_url" >View file history</a>
         </p>
+    
         <tal:block condition="python:dictVars.has_key('fromBasket')">
             <tal:block define="basket python:here.getBasketFromId(dictVars['fromBasket'],context=here.cdliRoot.basketContainer)">
                 <p tal:condition="basket">
@@ -27,16 +32,16 @@
             </tal:block>
         </tal:block>
           
-        <p>File Name: <span tal:replace="here/title"/> (version <span tal:replace="here/versionNumber"/>)</p>
+        <p>File Name: <span tal:replace="here/getId"/> (version <span tal:replace="here/versionNumber"/>)</p>
         <p tal:condition="python:dictVars.has_key('fromBasket') and dictVars.has_key('filenr')">
             <tal:block define="basket python:here.getBasketFromId(dictVars['fromBasket'],context=here.cdliRoot.basketContainer).getLastVersion();
                        files python:basket.getLastVersion().getContent();
                        index python:dictVars['filenr'];">
                 <span tal:omit-tag="" tal:condition="python: int(index) > 0">
-                    <a tal:define="file python:files[int(index)-1]" tal:attributes="href python:basket.getObjUrl(file) + '/' + basket.getFileLastVersion(file).getId() + '/view?fromBasket='+dictVars['fromBasket']+'&filenr='+str(int(index)-1)">previous file</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                    <a tal:define="file python:files[int(index)-1]" tal:attributes="href python:basket.getObjUrl(file[0]) + '/' + basket.getFileObjectLastVersion(file[0]).getId() + '/view?fromBasket='+dictVars['fromBasket']+'&filenr='+str(int(index)-1)">previous file</a>&nbsp;&nbsp;&nbsp;&nbsp;
                 </span>
                 <span tal:omit-tag="" tal:condition="python: int(index) < len(files)-1">
-                    <a tal:define="file python:files[int(index)+1]" tal:attributes="href python:basket.getObjUrl(file) + '/' + basket.getFileLastVersion(file).getId() + '/view?fromBasket='+dictVars['fromBasket']+'&filenr='+str(int(index)+1)">next file</a>
+                    <a tal:define="file python:files[int(index)+1]" tal:attributes="href python:basket.getObjUrl(file[0]) + '/' + basket.getFileObjectLastVersion(file[0]).getId() + '/view?fromBasket='+dictVars['fromBasket']+'&filenr='+str(int(index)+1)">next file</a>
                 </span>
             
             </tal:block>
@@ -44,7 +49,8 @@
         <a tal:attributes="href python:here.absolute_url()">download</a>&nbsp;&nbsp;&nbsp;&nbsp;
         <a tal:condition="python:here.lockedBy==''" tal:attributes="href python:here.REQUEST['URL1']+'/downloadLocked'">download and lock</a>
         <a tal:condition="not:python:here.lockedBy==''">locked</a>&nbsp;&nbsp;&nbsp;&nbsp;
-        <a tal:condition="python:here.lockedBy==''" tal:attributes="href python:here.REQUEST['URL1']+'/'+'/addCDLIFileObjectForm'">Upload New Version</a>
+        <a tal:condition="python:here.lockedBy==''" tal:attributes="href python:here.REQUEST['URL1']+'/addCDLIFileObjectForm'">upload new version</a>&nbsp;&nbsp;&nbsp;&nbsp;
+        <a tal:condition="python:here.lockedBy==''" tal:attributes="href python:here.REQUEST['URL1']+'/editATF'">edit in browser</a>
         <tal:block tal:condition="not:python:here.lockedBy==''">
             <b tal:attributes="href python:here.REQUEST['URL1']+'/addCDLIFileObjectForm'">Locked by: <span tal:replace="here/lockedBy"/></b>&nbsp;&nbsp;&nbsp;&nbsp;<a tal:attributes="href python:here.REQUEST['URL2']+'/unlock'">unlock</a>
         </tal:block>