--- cdli/zpt/viewCDLIFile.zpt	2006/07/25 07:51:49	1.5
+++ cdli/zpt/viewCDLIFile.zpt	2006/08/24 09:28:29	1.6
@@ -1,18 +1,51 @@
 <html metal:use-macro="here/main_template/macros/page">
-  <tal:block metal:fill-slot="body">
-  <h2>Textdisplay</h2>
-  <p>
-  <a tal:attributes="href python:'http://cdli.ucla.edu/'+here.getPNumber()" target="_blank">View database entry</a>
-  </p>
-  <p><a tal:content="python:'back(%s)'%here.aq_parent.aq_parent.title" tal:attributes="href python:here.aq_parent.aq_parent.absolute_url()"/></p>
-  <p>File Name: <span tal:replace="here/title"/> (version <span tal:replace="here/versionNumber"/>)</p>
-  <a tal:attributes="href python:here.absolute_url()">download</a>
-  <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>
-  <a tal:condition="python:here.lockedBy==''" tal:attributes="href python:here.REQUEST['URL1']+'/'+'/addCDLIFileObjectForm'">Upload New Version</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;<a tal:attributes="href python:here.REQUEST['URL2']+'/unlock'">unlock</a>
- </tal:block>
-  <pre tal:content="here/data"/>
-  </tal:block>
+    <tal:block metal:fill-slot="body" define="query python:here.REQUEST.QUERY_STRING;
+                                              vars python:query.split('&');
+                                              allVars python:map(lambda x: x.split('='), vars);
+                                              allVarsF python:filter(lambda x: not x == [''], allVars);
+                                              dictVars python:dict(allVarsF);">
+  
+        <h2>Textdisplay</h2>
+      
+        <p>
+            <a tal:attributes="href python:'http://cdli.ucla.edu/'+here.aq_parent.aq_parent.title.split('.')[0]" 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()"/>
+        </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">
+                    <a tal:content="python:'back to basket ('+basket.title+')'" tal:attributes="href python:basket.getLastVersion().absolute_url()"/>
+                </p>
+                <p tal:condition="not:basket">
+                    <a tal:content="python:'back(%s)'%here.aq_parent.aq_parent.title" tal:attributes="href python:here.aq_parent.aq_parent.absolute_url()"/>
+                </p>
+            </tal:block>
+        </tal:block>
+          
+        <p>File Name: <span tal:replace="here/title"/> (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;
+                </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>
+                </span>
+            
+            </tal:block>
+        </p>
+        <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>
+        <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>
+        <pre class="atf_file" tal:content="here/data"/>
+    </tal:block>
  </html>
\ No newline at end of file
