Changeset 540:4b43a57ad9b3 in documentViewer for zpt


Ignore:
Timestamp:
Aug 16, 2012, 5:09:49 PM (12 years ago)
Author:
casties
Branch:
default
Message:

more nicer

Location:
zpt
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • zpt/layer_text_search.zpt

    r532 r540  
    1717      <metal:block metal:define-macro="layer_select_li">
    1818        <li tal:condition="python:query"><input type="checkbox" class="autosubmit" name="viewLayer" value="search"
    19           tal:attributes="checked python:'search' in viewLayers" /> Search hits</li>
     19          tal:attributes="checked python:'search' in viewLayers" /> Search results</li>
    2020      </metal:block>
    2121    </ul>
    … …  
    2525    <!-- right-side search results -->
    2626    <div class="col results" tal:condition="query">
    27       <!--"BEGIN SEARCH RESULTS"  -->
    28       <div class="options">
     27      <div class="result">
    2928        <h4>Search results</h4>
    3029        <div
    … …  
    3332          <div class="ruler" tal:define="startParam string:resultStart">
    3433            <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
     34          </div>
     35          <div class="query">
     36            Searching "<span tal:content="query" />" (<span tal:content="queryType" />)
    3537          </div>
    3638          <div class="content"
    … …  
    4244
    4345  <metal:block metal:define-macro="options_box">
    44     <!--"BEGIN SEARCH"-->
     46    <!-- search options -->
    4547    <div class="options">
    4648      <h4>Search</h4>
    … …  
    5557        <!-- query text -->
    5658        <input type="text" name="query" tal:attributes="value query" /> <br /> <input type="submit" value="Search" /> <a
    57           tal:attributes="href python:here.getLink('query',None)">Clear</a>
     59          tal:condition="query" tal:attributes="href python:here.getLink('query',None)">Clear</a>
    5860        <ul>
    5961          <li><input type="radio" name="queryType" value="fulltext" tal:attributes="checked python:queryType=='fulltext'" />
    … …  
    6870      </form>
    6971    </div>
    70     <!--"END SEARCH"-->
     72    <!-- end search options-->
    7173  </metal:block>
    7274

  • zpt/toc_concordance.zpt

    r539 r540  
    1414                batch python:here.getBatch(start=start,size=grpsize,end=tocsize,data=pageNumbers);">
    1515      <h4>Page concordance</h4>             
    16       <div class="ruler">
     16      <div class="ruler top">
    1717        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
    1818      </div>
    … …  
    3636        </table>
    3737      </div>
    38       <div class="ruler">
     38      <div class="ruler bottom">
    3939        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
    4040      </div>

  • zpt/toc_figures.zpt

    r539 r540  
    1313                batch python:here.getBatch(start=start,size=grpsize,end=tocsize);">
    1414      <h4>Table of figures</h4>
    15       <div class="ruler">
     15      <div class="ruler top">
    1616        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
    1717      </div>
    1818      <div class="content"
    1919        tal:content="structure python:here.getTocPage(mode='figures',start=start,pageinfo=pageinfo,docinfo=docinfo)" />
    20       <div class="ruler">
     20      <div class="ruler bottom">
    2121        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
    2222      </div>

  • zpt/toc_text.zpt

    r539 r540  
    1313    <div class="tocbody text">
    1414      <h4>Table of contents</h4>
    15       <div class="ruler">
     15      <div class="ruler top">
    1616        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
    1717      </div>
    1818      <div class="content" tal:content="structure python:here.getTocPage(mode='text',start=start,pageinfo=pageinfo,docinfo=docinfo)" />
    19       <div class="ruler">
     19      <div class="ruler bottom">
    2020        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
    2121      </div>

  • zpt/toc_thumbs.zpt

    r539 r540  
    2020      <div class="content">
    2121        <h4>List of thumbnails</h4>
    22         <div class="ruler">
     22        <div class="ruler top">
    2323          <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler_thumbs" />
    2424        </div>
    … …  
    3535          </tr>
    3636        </table>
    37         <div class="ruler">
     37        <div class="ruler bottom">
    3838          <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler_thumbs" />
    3939        </div>

  • zpt/viewer_images.zpt

    r538 r540  
    5959      <!-- col-main: text page -->
    6060      <div class="col main">
    61         <div class="ruler">
     61        <div class="ruler top">
    6262          <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" />
    6363        </div>
    64         <div class="content-images">
     64        <div class="content images">
    6565          <div id="scaler">
    6666            <img tal:attributes="src string:${docinfo/imageURL}&pn=${pageinfo/pn}&dw=500&dh=500" />

  • zpt/viewer_index.zpt

    r539 r540  
    2323    <div class="col index-image">
    2424      <!-- image -->
    25       <a tal:define="tp docinfo/titlePage | nothing"
     25      <a tal:define="tp docinfo/titlePage | string:1"
    2626        tal:attributes="href python:context.getLink(params={'viewMode':'auto','pn':tp})"><img tal:condition="tp" border="0"
    2727        tal:attributes="src string:${docinfo/imageURL}&pn=$tp&dw=300&dh=500" /><img
    … …  
    6868
    6969        <tal:block tal:define="dri docinfo/DRI | nothing" tal:condition="dri">
    70         <h2>Permanent URL</h2>
    71         <table>
    72           <tr>
    73             <td class="type">Document ID:</td>
    74             <td class="content" tal:content="dri" />
    75           </tr>
    76           <tr>
    77             <td class="type">Permanent URL:</td>
    78             <td class="content"><a tal:attributes="href string:http://echo.mpiwg-berlin.mpg.de/$dri"
    79               tal:content="string:http://echo.mpiwg-berlin.mpg.de/$dri" /></td>
    80           </tr>
    81         </table>
     70          <h2>Permanent URL</h2>
     71          <table>
     72            <tr>
     73              <td class="type">Document ID:</td>
     74              <td class="content" tal:content="dri" />
     75            </tr>
     76            <tr>
     77              <td class="type">Permanent URL:</td>
     78              <td class="content"><a tal:attributes="href string:http://echo.mpiwg-berlin.mpg.de/$dri"
     79                tal:content="string:http://echo.mpiwg-berlin.mpg.de/$dri" /></td>
     80            </tr>
     81          </table>
    8282        </tal:block>
    8383
    8484        <tal:block tal:define="attribution docinfo/attribution | nothing; copyright docinfo/copyright | nothing">
    85         <h2>Copyright information</h2>
    86         <table border="0" tal:condition="attribution | copyright">
    87           <!-- attribution -->
    88           <tr tal:condition="attribution"
    89             tal:replace="structure python:here.metadataService.getAttributionFormatted('metadata_template', data=attribution)" />
    90           <!-- copyright -->
    91           <tr tal:condition="copyright"
    92             tal:replace="structure python:here.metadataService.getCopyrightFormatted('metadata_template', data=copyright)" />
    93         </table>
    94         <table border="0" tal:condition="not:attribution | copyright">
    95           <tr><td></td></tr>
    96         </table>       
     85          <h2>Copyright information</h2>
     86          <table border="0" tal:condition="attribution | copyright">
     87            <!-- attribution -->
     88            <tr tal:condition="attribution"
     89              tal:replace="structure python:here.metadataService.getAttributionFormatted('metadata_template', data=attribution)" />
     90            <!-- copyright -->
     91            <tr tal:condition="copyright"
     92              tal:replace="structure python:here.metadataService.getCopyrightFormatted('metadata_template', data=copyright)" />
     93          </table>
     94          <table border="0" tal:condition="not:attribution | copyright">
     95            <tr>
     96              <td class="type">Copyright:</td>
     97              <td class="content"><a target="_blank" href="http://www.mpiwg-berlin.mpg.de">Max Planck Institute for the
     98                  History of Science</a> (unless otherwise stated)</td>
     99            </tr>
     100            <tr>
     101              <td class="type">License:</td>
     102              <td class="content"><a href="http://creativecommons.org/licenses/by-sa/3.0/de/">CC-BY-SA</a></td>
     103            </tr>
     104          </table>
    97105        </tal:block>
    98106      </div>
    … …  
    107115            target="_blank">&#8594;HTML</a> or <a
    108116            tal:attributes="href python:'http://mpdl-system.mpiwg-berlin.mpg.de/mpdl/getDoc?doc=%s'%(docpath)" target="_blank">&#8594;XML</a>
     117          (copyright and license see above)
    109118        </div>
    110119        <div class="action">
    111120          <!--BEGIN search -->
    112           <form tal:condition="docpath" tal:attributes="action python:here.getLink()">
     121          <form tal:define="queryType string:fulltextMorph" tal:condition="docpath" tal:attributes="action python:here.getLink()">
    113122            <input type="hidden" tal:define="params python:here.getParams('viewMode', None)" tal:repeat="param params"
    114               tal:attributes="name param; value python:params[param]" /> <input class="textMain" name="query"
    115               onfocus="this.select();" type="text" tal:attributes="value query" /> <input type="submit" class="buttonMain"
    116               value="Search in Book" />
     123              tal:attributes="name param; value python:params[param]" /> <input type="hidden" name="viewLayer" value="search" />
     124            <!-- query text -->
     125            <input type="text" name="query" tal:attributes="value query" /> <input type="submit" value="Search full document" /> <a
     126              tal:condition="query" tal:attributes="href python:here.getLink('query',None)">Clear</a><br /> <input type="radio"
     127              name="queryType" value="fulltext" tal:attributes="checked python:queryType=='fulltext'" /> Exact <input type="radio"
     128              name="queryType" value="fulltextMorph" tal:attributes="checked python:queryType=='fulltextMorph'" /> All forms <input
     129              type="radio" name="queryType" value="ftIndex" tal:attributes="checked python:queryType=='ftIndex'" /> Fulltext index
     130            <input type="radio" name="queryType" value="ftIndexMorph" tal:attributes="checked python:queryType=='ftIndexMorph'" />
     131            Morphological index
    117132          </form>
    118133          <!-- END search-->

  • zpt/viewer_text.zpt

    r536 r540  
    5252      <!-- text page -->
    5353      <div class="col main">
    54         <div class="ruler">
     54        <div class="ruler top">
    5555          <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" />
    5656        </div>
    57         <div class="content">
     57        <div class="content text">
    5858          <div class="pageHeaderTitle" tal:condition="exists:pageinfo/pageHeaderTitle"
    5959            tal:content="structure pageinfo/pageHeaderTitle" />

  • zpt/viewer_thumbs.zpt

    r536 r540  
    5959          </table>
    6060        </div>
    61         <div class="ruler down">
     61        <div class="ruler bottom">
    6262          <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler_thumbs" />
    6363        </div>
    64 
    6564      </div>
    6665      <!-- /col-main -->

  • zpt/viewer_xml.zpt

    r532 r540  
    4343      <!-- text page -->
    4444      <div class="col main">
    45         <div class="ruler">
     45        <div class="ruler top">
    4646          <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" />
    4747        </div>
    48         <div class="content">
     48        <div class="content xml">
    4949          <div class="pageHeaderTitle" tal:condition="exists:pageinfo/pageHeaderTitle"
    5050            tal:content="structure pageinfo/pageHeaderTitle" />
Note: See TracChangeset for help on using the changeset viewer.