[BACK]Return to viewCDLIFile.zpt CVS log [TXT] [DIR] Up to [Repository] / cdli / zpt

Diff for /cdli/zpt/viewCDLIFile.zpt between versions 1.10 and 1.11

version 1.10, 2007/08/31 14:22:52 version 1.11, 2008/01/21 17:19:01
Line 4 Line 4
                                               allVars python:map(lambda x: x.split('='), vars);                                                allVars python:map(lambda x: x.split('='), vars);
                                               allVarsF python:filter(lambda x: not x == [''], allVars);                                                allVarsF python:filter(lambda x: not x == [''], allVars);
                                               dictVars python:dict(allVarsF);                                                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_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>          <h2>Textdisplay</h2>
               
         <p>          <p>
           <a tal:attributes="href string:http://cdli.mpiwg-berlin.mpg.de/ID/$p_no" target="_blank">View database entry</a>            <a tal:attributes="href string:http://cdli.mpiwg-berlin.mpg.de/ID/$p_no" target="_blank">View database entry</a>
         </p>          </p>
               <p>
         <p tal:condition="not:python:dictVars.has_key('fromBasket')">            <a tal:attributes="href parent/absolute_url" >View file history</a>
              <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>          </p>
       
         <tal:block condition="python:dictVars.has_key('fromBasket')">          <tal:block condition="python:dictVars.has_key('fromBasket')">
             <tal:block define="basket python:here.getBasketFromId(dictVars['fromBasket'],context=here.cdliRoot.basketContainer)">              <tal:block define="basket python:here.getBasketFromId(dictVars['fromBasket'],context=here.cdliRoot.basketContainer)">
                 <p tal:condition="basket">                  <p tal:condition="basket">
Line 27 Line 32
             </tal:block>              </tal:block>
         </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')">          <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();              <tal:block define="basket python:here.getBasketFromId(dictVars['fromBasket'],context=here.cdliRoot.basketContainer).getLastVersion();
                        files python:basket.getLastVersion().getContent();                         files python:basket.getLastVersion().getContent();
Line 44 Line 49
         <a tal:attributes="href python:here.absolute_url()">download</a>&nbsp;&nbsp;&nbsp;&nbsp;          <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="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="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==''">          <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>              <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>          </tal:block>
Removed from v.1.10  
changed lines
  Added in v.1.11

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>