Changeset 502:daf36d0fcfee in documentViewer for zpt


Ignore:
Timestamp:
Feb 16, 2012, 12:53:27 PM (12 years ago)
Author:
casties
Branch:
elementtree
Message:

more cleanup.

Location:
zpt
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • zpt/common_template.zpt

    r501 r502  
    1616      tal:content="string:[no bibliographical information for this document (type ${bibType})]" />
    1717    <div tal:condition="formattedLabel" tal:content="structure formattedLabel" />
     18    <div class="doclinks">
     19      <a tal:attributes="href python:here.getLink('viewMode','index')">Bibliographical information</a>
     20    </div>
    1821  </metal:block>
    1922  <!-- /head -->
     
    2730              leftest python:test(flowLtr,first,last); rightest python:test(flowLtr,last,first);">
    2831    <form class="autosubmit" tal:attributes="action viewerUrl">
    29       <input type="hidden" tal:define="params python:here.getParams('pn', None)"
    30         tal:repeat="param params" tal:attributes="name param; value python:params[param]" />
    31       page <a tal:condition="leftest"
    32         tal:attributes="href python:here.getLink('pn',leftest)">|&lt;</a> <span
    33         tal:condition="not:leftest">|&lt;</span> <a tal:condition="left"
    34         tal:attributes="href python:here.getLink('pn',left)">&lt;</a> <span
    35         tal:condition="not:left">&lt;</span> <input class="autosubmit" size="3"
    36         type="text" name="pn" tal:attributes="value pn" /> <span class="originalPage"
    37         title="Original page number"
    38         tal:define="originalPage pageinfo/pageNumberOrig | nothing"
    39         tal:condition="python:originalPage!=None"> (<span
    40         tal:replace="originalPage" /><span
    41         tal:define="originalPageNorm pageinfo/pageNumberOrigNorm | nothing"
    42         tal:condition="python:originalPageNorm!=None"> [<span
     32      <input type="hidden" tal:define="params python:here.getParams('pn', None)" tal:repeat="param params"
     33        tal:attributes="name param; value python:params[param]" /> page <a tal:condition="leftest"
     34        tal:attributes="href python:here.getLink('pn',leftest)">|&lt;</a> <span tal:condition="not:leftest">|&lt;</span> <a
     35        tal:condition="left" tal:attributes="href python:here.getLink('pn',left)">&lt;</a> <span tal:condition="not:left">&lt;</span>
     36      <input class="autosubmit" size="3" type="text" name="pn" tal:attributes="value pn" /> <span class="originalPage"
     37        title="Original page number" tal:define="originalPage pageinfo/pageNumberOrig | nothing"
     38        tal:condition="python:originalPage!=None"> (<span tal:replace="originalPage" /><span
     39        tal:define="originalPageNorm pageinfo/pageNumberOrigNorm | nothing" tal:condition="python:originalPageNorm!=None"> [<span
    4340          tal:replace="originalPageNorm" />]
    4441      </span>)
    45       </span> <input type="submit" value="Go" /> of <span tal:replace="numPages" /> <a
    46         tal:condition="right" tal:attributes="href python:here.getLink('pn',right)">&gt;</a>
    47       <span tal:condition="not:right">&gt;</span> <a tal:condition="rightest"
    48         tal:attributes="href python:here.getLink('pn',rightest)">&gt;|</a> <span
     42      </span> <input type="submit" value="Go" /> of <span tal:replace="numPages" /> <a tal:condition="right"
     43        tal:attributes="href python:here.getLink('pn',right)">&gt;</a> <span tal:condition="not:right">&gt;</span> <a
     44        tal:condition="rightest" tal:attributes="href python:here.getLink('pn',rightest)">&gt;|</a> <span
    4945        tal:condition="not:rightest">&gt;|</span>
    5046    </form>
     
    5551  <metal:block metal:define-macro="toc_ruler">
    5652    <form class="autosubmit" tal:attributes="action viewerUrl">
    57       <input type="hidden" tal:define="params python:here.getParams('start', None)"
    58         tal:repeat="param params" tal:attributes="name param; value python:params[param]" />
    59       <a tal:condition="batch/prevStart"
    60         tal:attributes="href python:here.getLink('start',batch['prevStart'])">&lt;</a> <span
    61         tal:condition="not:batch/prevStart">&lt;</span>
     53      <input type="hidden" tal:define="params python:here.getParams('start', None)" tal:repeat="param params"
     54        tal:attributes="name param; value python:params[param]" /> <a tal:condition="batch/prevStart"
     55        tal:attributes="href python:here.getLink('start',batch['prevStart'])">&lt;</a> <span tal:condition="not:batch/prevStart">&lt;</span>
    6256      <select class="autosubmit" name="start">
    63         <option tal:repeat="grp batch/batches"
    64           tal:attributes="selected python:(start==grp['start']); value grp/start"
     57        <option tal:repeat="grp batch/batches" tal:attributes="selected python:(start==grp['start']); value grp/start"
    6558          tal:content="string:${grp/start} - ${grp/end}" />
    66       </select>
    67       <input type="submit" value="Go" /> <a tal:condition="batch/nextStart"
    68         tal:attributes="href python:here.getLink('start',batch['nextStart'])">&gt;</a> <span
    69         tal:condition="not:batch/nextStart">&gt;</span>
     59      </select> <input type="submit" value="Go" /> <a tal:condition="batch/nextStart"
     60        tal:attributes="href python:here.getLink('start',batch['nextStart'])">&gt;</a> <span tal:condition="not:batch/nextStart">&gt;</span>
    7061    </form>
    7162  </metal:block>
  • zpt/viewer_index.zpt

    r501 r502  
    3232      </tal:x>
    3333
    34       <tal:x condition="python:formattedData==None">
     34      <tal:x condition="not:formattedData">
    3535        <!-- kein template fuer die daten -->
    3636        <tal:x condition="exists:docinfo/bib">
     
    7676    </div>
    7777    <div tal:condition="docpath">
    78       Download: <a
     78      Download as <a
    7979        tal:attributes="href python:'http://mpdl-system.mpiwg-berlin.mpg.de/mpdl/getDoc?doc=%s'%(docpath.replace('.xml','.html'))"
    8080        target="_blank">html</a> / <a
  • zpt/viewer_text.zpt

    r501 r502  
    3030                               flowLtr python:pageinfo.get('pageFlow','ltr')!='rtl';
    3131                               textPage python:here.getTextPage(mode=viewType, pn=pn, docinfo=docinfo, pageinfo=pageinfo) or '[no text here]';">
     32    <!-- header -->
    3233    <div class="page-head">
    3334      <metal:block metal:use-macro="here/template/common_template/macros/head" />
Note: See TracChangeset for help on using the changeset viewer.