Changeset 571:f1906951be2a in documentViewer

Timestamp:

Oct 12, 2012, 3:02:40 PM (13 years ago)

Author:

casties

Branch:

default

Message:

nicer batching of tocs

Files:

• documentViewer.py (modified) (2 diffs)
• zpt/common_template.zpt (modified) (2 diffs)
• zpt/viewer_text.zpt (modified) (1 diff)

documentViewer.py

@@ -980 +980 @@
 
         batch['pages'] = pages
+        batch['first'] = minIdx
+        batch['last'] = maxIdx
         return batch
         
@@ -1024 +1026 @@
             batch['nextStart'] = None
         
-        logging.debug("getBatch start=%s size=%s end=%s batch=%s"%(start,size,end,repr(batch)))
+        batch['first'] = start
+        batch['last'] = end
         return batch
         

zpt/common_template.zpt

@@ -78 +78 @@
         tal:attributes="href python:here.getLink(startParam,batch['prevStart'])">&lt;</a> <span tal:condition="not:batch/prevStart">&lt;</span>
       <select class="autosubmit" tal:attributes="name startParam">
-        <option tal:repeat="grp batch/batches" tal:attributes="selected python:(start==grp['start']); value grp/start"
+        <option tal:repeat="grp batch/batches" tal:attributes="selected python:(start>=grp['start'] and start<=grp['end']); value grp/start"
           tal:content="string:${grp/start} - ${grp/end}" />
+        <option tal:condition="python:start>batch['last']" selected="selected" value="1">[out of range]</option>
       </select> <input type="submit" value="Go" /> <a tal:condition="batch/nextStart"
         tal:attributes="href python:here.getLink(startParam,batch['nextStart'])">&gt;</a> <span tal:condition="not:batch/nextStart">&gt;</span>
@@ -93 +94 @@
         class="autosubmit" name="start" tal:define="ofs python:test(pageinfo['pageZero'],0,1)">
           <tal:block>
-            <option tal:repeat="grp pageBatch/batches" tal:attributes="selected python:start==grp['start']; value grp/start;"
+            <option tal:repeat="grp pageBatch/batches" tal:attributes="selected python:(start>=grp['start'] and start<=grp['end']); value grp/start;"
               tal:content="string:${grp/start} - ${grp/end}" />
+            <option tal:condition="python:start>pageBatch['last']" selected="selected" value="1">[out of range]</option>
           </tal:block>
       </select> <input type="submit" value="Go" /> <a tal:condition="right" tal:attributes="href python:here.getLink('start',right)">&gt;</a>

zpt/viewer_text.zpt

@@ -59 +59 @@
             tal:content="structure pageinfo/pageHeaderTitle" />
           <tal:block tal:condition="textPage" tal:replace="structure textPage"/>
-          <div class="emptyPage" tal:condition="not:textPage">[Error: no page]</div>
+          <div class="emptyPage" tal:condition="not:textPage">[Error: no text]</div>
         </div>
       </div>