Changeset 537:ad6f97fd3944 in documentViewer


Ignore:
Timestamp:
Jul 27, 2012, 3:09:59 PM (12 years ago)
Author:
casties
Branch:
default
Message:

fixes closing tickets concerning tocs.

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • css/docuviewer.css

    r536 r537  
    118118    display: table-cell;
    119119    border: 1px solid silver;
     120    border-radius: 5px;
    120121    padding: 0.5em; 
    121122    background-color: white;   
     123}
     124
     125div.tocbody h4 {
     126        margin-top: 0;
     127        margin-bottom: 0.5em;
     128}
     129div.tocbody div.ruler {
     130        text-align: center;
     131        margin-bottom: 0.5em;
    122132}
    123133
    … …  
    152162div.tocbody table.thumbs .thumbcap {
    153163    color: black;
     164}
     165
     166div.tocbody table.concordance {
     167        border-collapse: collapse;
     168}
     169div.tocbody table.concordance td {
     170    border: 1px solid silver;
     171    text-align: center;
    154172}
    155173
    … …  
    206224div.col.buttons h4 {
    207225    margin-top: 0;
    208     margin-bottom: 0;
     226    margin-bottom: 0.5em;
    209227}
    210228div.col.buttons ul {
    211229    list-style-type: none;
    212230    padding-left: 0;
    213     margin-top: 0.5em;
     231    margin-top: 0;
    214232    margin-bottom: 0.5em;
    215233}
    … …  
    257275}
    258276div.col.main div.content-images table {
    259         border-collapse:collapse; /* for tight digilib */
     277        border-collapse: collapse; /* for tight digilib */
    260278}
    261279

  • zpt/layer_text_dict.zpt

    r526 r537  
    2424  <metal:block metal:define-macro="options_box" tal:condition="python:'dict' in viewLayers">
    2525    <!--"BEGIN DICTIONARY OVERVIEW"-->
    26     <div class="options">
     26    <!-- <div class="options">
    2727      <h4>Dictionary view</h4>
    2828      <form name="f3" action="">
     29      <div>Open dictionary definition</div>
    2930        <ul>
    3031          <li>
    31             <input type="radio" name="r3" /> Tab
     32            <input type="radio" name="r3" /> in new Tab
    3233          </li>
    3334          <li>
    34             <input type="radio" name="r3" /> Window
     35            <input type="radio" name="r3" /> in new Window
    3536          </li>
    3637        </ul>
    3738      </form>
    38     </div>
     39    </div> -->
    3940    <!--"END DICTIONARY OVERVIEW"-->
    4041  </metal:block>

  • zpt/toc_concordance.zpt

    r535 r537  
    1313                pageNumbers docinfo/pageNumbers | nothing;
    1414                batch python:here.getBatch(start=start,size=grpsize,end=tocsize,data=pageNumbers);">
     15      <h4>Page concordance</h4>             
    1516      <div class="ruler">
    1617        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
    1718      </div>
    1819      <div class="content">
    19         <table tal:condition="pageNumbers">
     20        <table class="concordance" tal:condition="pageNumbers">
    2021          <tr>
    2122            <th>Scan</th>

  • zpt/toc_figures.zpt

    r535 r537  
    1212      tal:define="start pageinfo/start; tocsize docinfo/numFigureEntries; grpsize pageinfo/tocPageSize;
    1313                batch python:here.getBatch(start=start,size=grpsize,end=tocsize);">
     14      <h4>Table of figures</h4>
    1415      <div class="ruler">
    1516        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />

  • zpt/toc_text.zpt

    r532 r537  
    66</head>
    77<body>
    8   <div class="toc-container" metal:define-macro="main">
     8  <div class="toc-container" metal:define-macro="main"
     9    tal:define="start pageinfo/start; tocsize docinfo/numTocEntries; grpsize pageinfo/tocPageSize;
     10                batch python:here.getBatch(start=start,size=grpsize,end=tocsize);">
    911    <div metal:use-macro="here/template/common_template/macros/toc_switcher" />
    1012    <!-- block used for main content area -->
    11     <div class="tocbody text"
    12       tal:define="start pageinfo/start; tocsize docinfo/numTocEntries; grpsize pageinfo/tocPageSize;
    13                 batch python:here.getBatch(start=start,size=grpsize,end=tocsize);">
     13    <div class="tocbody text">
     14      <h4>Table of contents</h4>
    1415      <div class="ruler">
    1516        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
    … …  
    1819    </div>
    1920  </div>
    20     <!-- toc -->
     21  <!-- toc -->
    2122</body>
    2223</html>

  • zpt/toc_thumbs.zpt

    r534 r537  
    1919
    2020      <div class="content">
     21        <h4>List of thumbnails</h4>
    2122        <div class="ruler">
    2223          <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler_thumbs" />
    2324        </div>
    24 
    2525        <table class="thumbs">
    2626          <tr tal:repeat="row pageBatch/pages">

  • zpt/viewer_index.zpt

    r536 r537  
    7777  <div class="index-actions">
    7878    <div class="action">
    79       <a class="openbutton" tal:attributes="href python:context.getLink('viewMode','auto')">&#8594;Access Book</a>
     79      <a class="openbutton" tal:attributes="href python:context.getLink('viewMode','auto')">&#8594;Browse document</a>
    8080    </div>
    8181    <div class="action" tal:condition="docpath">
    82       Download as <a
     82      Download full document as <a
    8383        tal:attributes="href python:'http://mpdl-system.mpiwg-berlin.mpg.de/mpdl/getDoc?doc=%s'%(docpath.replace('.xml','.html'))"
    8484        target="_blank">&#8594;HTML</a> or <a
Note: See TracChangeset for help on using the changeset viewer.