Changeset 503:030251fe9dbc in documentViewer for zpt


Ignore:
Timestamp:
Feb 16, 2012, 1:30:01 PM (12 years ago)
Author:
casties
Branch:
elementtree
Message:

more cleanup.
made viewType into viewLayer and viewType=xml into viewMode=xml.

Location:
zpt
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • zpt/viewer_images.zpt

    r501 r503  
    33<html xmlns="http://www.w3.org/1999/xhtml"
    44  tal:define="docinfo options/docinfo; pageinfo options/pageinfo; viewMode pageinfo/viewMode;
    5               tocMode pageinfo/tocMode; viewType pageinfo/viewType; viewerUrl docinfo/viewerUrl;
     5              tocMode pageinfo/tocMode; viewerUrl docinfo/viewerUrl;
    66              numPages docinfo/numPages | nothing; dlBaseUrl docinfo/digilibBaseUrl | nothing;">
    77<head>

  • zpt/viewer_text.zpt

    r502 r503  
    33<html xmlns="http://www.w3.org/1999/xhtml"
    44  tal:define="docinfo options/docinfo; pageinfo options/pageinfo; viewMode pageinfo/viewMode;
    5               tocMode pageinfo/tocMode; viewType pageinfo/viewType; viewerUrl docinfo/viewerUrl;
     5              tocMode pageinfo/tocMode; viewLayer pageinfo/viewLayer; viewerUrl docinfo/viewerUrl;
    66              rootUrl here/getDocumentViewerURL;
    77              numPages docinfo/numPages | nothing;">
    … …  
    2929                               pn pageinfo/pn;
    3030                               flowLtr python:pageinfo.get('pageFlow','ltr')!='rtl';
    31                                textPage python:here.getTextPage(mode=viewType, pn=pn, docinfo=docinfo, pageinfo=pageinfo) or '[no text here]';">
     31                               textPage python:here.getTextPage(mode=viewLayer, pn=pn, docinfo=docinfo, pageinfo=pageinfo) or '[no text here]';">
    3232    <!-- header -->
    3333    <div class="page-head">
    … …  
    6767          <form tal:attributes="action viewerUrl" class="autosubmit">
    6868            <input type="hidden"
    69               tal:define="params python:here.getParams(params={'viewType':None})"
     69              tal:define="params python:here.getParams(params={'viewLayer':None,'viewMode':None})"
    7070              tal:repeat="param params"
    71               tal:attributes="name param; value python:params[param]" /> <input
    72               class="autosubmit" type="radio" name="viewType" value=""
    73               tal:attributes="checked python:viewType!='xml'" /> Text<br /> <span
    74               class="optionsText" tal:condition="python:viewType!='xml'">
    75               &nbsp;&nbsp;<input type="checkbox" class="autosubmit" name="viewType"
    76               value="dict" tal:attributes="checked python:viewType=='dict'" /> Dictionary<br />
    77             </span> <span class="optionsText"
    78               tal:condition="python:viewType!='xml' and docinfo.get('numPlaces',0)">
    79               &nbsp;&nbsp;<input type="checkbox" class="autosubmit" name="viewType"
    80               value="gis" tal:attributes="checked python:viewType=='gis'" /> Places<br />
    81             </span> <input type="radio" class="autosubmit" name="viewType"
    82               tal:attributes="value string:xml; checked python:viewType=='xml'" /> XML<br />
     71              tal:attributes="name param; value python:params[param]" />
     72            <input class="autosubmit" type="radio" name="viewMode" value="text"
     73              tal:attributes="checked python:viewMode=='text'" /> Text<br />
     74            <span class="optionsText">
     75              &nbsp;&nbsp;<input type="checkbox" class="autosubmit" name="viewLayer"
     76              value="dict" tal:attributes="checked python:viewLayer=='dict'" /> Dictionary<br />
     77            </span>
     78            <span class="optionsText" tal:condition="python:docinfo.get('numPlaces',0)">
     79              &nbsp;&nbsp;<input type="checkbox" class="autosubmit" name="viewLayer"
     80              value="gis" tal:attributes="checked python:viewLayer=='gis'" /> Places<br />
     81            </span>
     82            <input type="radio" class="autosubmit" name="viewMode" value="xml"
     83              tal:attributes="checked python:viewMode=='xml'" /> XML<br />
    8384            <input type="submit" value="Go!" />
    8485          </form>
    … …  
    9899
    99100        <!--"BEGIN DICTIONARY OVERVIEW"-->
    100         <div class="options" tal:condition="python:viewType=='dict'">
     101        <div class="options" tal:condition="python:viewLayer=='dict'">
    101102          <h4>Dictionary view</h4>
    102103          <form name="f3" action="">
    … …  
    107108
    108109        <!--"BEGIN TEXT NORMALIZATION"-->
    109         <div class="options" tal:condition="python:viewType!='xml'">
     110        <div class="options" tal:condition="python:viewLayer!='xml'">
    110111          <h4>Text normalization</h4>
    111112          <form tal:attributes="action viewerUrl" class="autosubmit"
    … …  
    127128
    128129        <!--"BEGIN PLACES"-->
    129         <div class="options" tal:condition="python:viewType=='gis'">
     130        <div class="options" tal:condition="python:viewLayer=='gis'">
    130131          <tal:block
    131132            tal:define="gisPlaces python:here.getGisPlaces(docinfo=docinfo, pageinfo=pageinfo); gisAllPlaces python:here.getAllGisPlaces(docinfo=docinfo, pageinfo=pageinfo);">
Note: See TracChangeset for help on using the changeset viewer.