Changeset 506:67014399894d in documentViewer for zpt

Timestamp:

Feb 21, 2012, 6:16:28 PM (12 years ago)

Author:

casties

Branch:

elementtree

Message:

cleaned out all 4suite code and weird methods.
fixed GIS places.

File:

• zpt/viewer_text.zpt (modified) (3 diffs)

zpt/viewer_text.zpt

@@ -27 +27 @@
   <tal:block
     tal:define="docpath docinfo/textURLPath;
-                               pn pageinfo/pn; 
-                               flowLtr python:pageinfo.get('pageFlow','ltr')!='rtl';
-                               textPage python:here.getTextPage(mode=viewLayer, pn=pn, docinfo=docinfo, pageinfo=pageinfo) or '[no text here]';">
+                pn pageinfo/pn; 
+                flowLtr python:pageinfo.get('pageFlow','ltr')!='rtl';
+                textPage python:here.getTextPage(mode=viewLayer, pn=pn, docinfo=docinfo, pageinfo=pageinfo) or '[no text here]';">
     <!-- header -->
     <div class="page-head">
@@ -69 +69 @@
               tal:define="params python:here.getParams(params={'viewLayer':None,'viewMode':None})"
               tal:repeat="param params"
-              tal:attributes="name param; value python:params[param]" /> 
-            <input class="autosubmit" type="radio" name="viewMode" value="text"
-              tal:attributes="checked python:viewMode=='text'" /> Text<br /> 
-            <span class="optionsText">
-              &nbsp;&nbsp;<input type="checkbox" class="autosubmit" name="viewLayer"
-              value="dict" tal:attributes="checked python:viewLayer=='dict'" /> Dictionary<br />
-            </span> 
-            <span class="optionsText" tal:condition="python:docinfo.get('numPlaces',0)">
+              tal:attributes="name param; value python:params[param]" /> <input
+              class="autosubmit" type="radio" name="viewMode" value="text"
+              tal:attributes="checked python:viewMode=='text'" /> Text<br /> <span
+              class="optionsText"> &nbsp;&nbsp;<input type="checkbox"
+              class="autosubmit" name="viewLayer" value="dict"
+              tal:attributes="checked python:viewLayer=='dict'" /> Dictionary<br />
+            </span> <span class="optionsText" tal:condition="python:docinfo.get('numPlaces',0)">
               &nbsp;&nbsp;<input type="checkbox" class="autosubmit" name="viewLayer"
               value="gis" tal:attributes="checked python:viewLayer=='gis'" /> Places<br />
-            </span> 
-            <input type="radio" class="autosubmit" name="viewMode" value="xml"
-              tal:attributes="checked python:viewMode=='xml'" /> XML<br />
-            <input type="submit" value="Go!" />
+            </span> <input type="radio" class="autosubmit" name="viewMode" value="xml"
+              tal:attributes="checked python:viewMode=='xml'" /> XML<br /> <input
+              type="submit" value="Go!" />
           </form>
         </div>
@@ -129 +127 @@
         <!--"BEGIN PLACES"-->
         <div class="options" tal:condition="python:viewLayer=='gis'">
-          <tal:block
-            tal:define="gisPlaces python:here.getGisPlaces(docinfo=docinfo, pageinfo=pageinfo); gisAllPlaces python:here.getAllGisPlaces(docinfo=docinfo, pageinfo=pageinfo);">
-            <span><b>Places</b></span>
-            <br />(Link to extern:)<br />
-            <span>Page</span>
-            <span style="float: right"> <a
-              tal:attributes="href python:'http://chinagis.mpiwg-berlin.mpg.de/chinagis/REST/db/mpdl/%s?id=%s&format=%s'%(name,gisPlaces,'gis')"
-              target="_blank"> <img src="images/arrow.png" alt="" />
-            </a>
-            </span>
-            <br />
-            <span>Book</span>
-            <span style="float: right"> <a
-              tal:attributes="href python:'http://chinagis.mpiwg-berlin.mpg.de/chinagis/REST/db/mpdl/%s?format=%s'%(name,'gis')"
-              target="_blank"> <img src="images/arrow.png" alt="" />
-            </a>
-            </span>
-            <br />
+          <tal:block tal:define="
+            name docinfo/documentName;
+            places python:here.getPlacesOnPage(docinfo=docinfo, pn=pn);
+            pidlist python:','.join([p['id'] for p in places]);">
+            <h4>Places</h4>
+            <ul>
+            <li><a
+              tal:attributes="href python:'http://mappit.mpiwg-berlin.mpg.de/db/RESTdb/db/mpdl/%s?id=%s&format=gis'%(name,pidlist)"
+              target="_blank">on this page</a>
+            </li>
+            <li>
+              <a
+              tal:attributes="href python:'http://mappit.mpiwg-berlin.mpg.de/db/RESTdb/db/mpdl/%s?format=gis'%(name)"
+              target="_blank">in whole document</a>
+            </li>
+            </ul>
           </tal:block>
         </div>