Changeset 609:7962e6891d99 in documentViewer

Timestamp:

Jan 15, 2013, 5:15:32 PM (11 years ago)

Author:

casties

Branch:

default

Message:

works with new notes and notesHandwritten.

Files:

• MpiwgXmlTextServer.py (modified) (4 diffs)
• css/docuviewer.css (modified) (1 diff)
• documentViewer.py (modified) (1 diff)
• version.txt (modified) (1 diff)
• zpt/viewer/common_template.zpt (modified) (1 diff)
• zpt/viewer/toc_notes.zpt (added)

MpiwgXmlTextServer.py

@@ -96 +96 @@
         
         field = ''
-        if mode in ['pages', 'toc', 'figures', 'handwritten']:
+        if mode in ['pages', 'toc', 'figures', 'notes', 'handwritten']:
             # translate mode to field param
-            field = '&field=%s'%mode
+            if mode == 'handwritten':
+                field = '&field=notesHandwritten'
+            else:
+                field = '&field=%s'%mode
         else:
             mode = None
@@ -132 +135 @@
                     docinfo['numTextPages'] = getInt(getText(sys.find('countPages'))) 
                     docinfo['numFigureEntries'] = getInt(getText(sys.find('countFigures'))) 
-                    docinfo['numHandwritten'] = getInt(getText(sys.find('countHandwritten'))) 
+                    docinfo['numHandwritten'] = getInt(getText(sys.find('countNotesHandwritten'))) 
+                    docinfo['numNotes'] = getInt(getText(sys.find('countNotes'))) 
+                    docinfo['numPlaces'] = getInt(getText(sys.find('countPlaces'))) 
                     docinfo['numTocEntries'] = getInt(getText(sys.find('countTocEntries'))) 
                     
@@ -162 +167 @@
                                     
                     # toc
-                    elif lt == 'toc' or lt == 'figures' or lt == 'handwritten':
+                    elif lt in ['toc', 'figures', 'notes', 'notesHandwritten']:
                         # contains tags with table of contents/figures
                         # <item n="2.1." lv="2">CAP.I. <ref o="119">132</ref></item>
@@ -661 +666 @@
         tocs = fulltoc[first:last]
         tp = '<div>'
-        label = {'figures': 'Figure', 'handwritten': 'Handwritten note'}.get(mode, 'Item')
+        label = {'figures': 'Figure', 'notes': 'Note', 'handwritten': 'Handwritten note'}.get(mode, 'Item')
         for toc in tocs:
             pageurl = self.getLink('pn', toc['pn'])
             tp += '<div class="tocline">'
             content = toc['content']
+            lvs = toc['level-string']
             if content:
-                tp += '<div class="toc name">[%s] %s</div>'%(toc['level-string'], toc['content'])
+                tp += '<div class="toc name">[%s] %s</div>'%(lvs, toc['content'])
+            elif lvs:
+                tp += '<div class="toc name">[%s %s]</div>'%(label, lvs)
             else:
-                tp += '<div class="toc name">[%s %s]</div>'%(label, toc['level-string'])
+                tp += '<div class="toc name">[%s]</div>'%(label)
             
             if toc.get('no', None):

css/docuviewer.css

@@ -102 +102 @@
     -o-transform-origin: top left;
         left: 7px;
-    top: 34em;
-    width: 40em;
+    top: 42em;
+    width: 45em;
     padding: 0px;
 }

documentViewer.py

@@ -120 +120 @@
     toc_figures = PageTemplateFile('zpt/viewer/toc_figures', globals())
     toc_concordance = PageTemplateFile('zpt/viewer/toc_concordance', globals())
+    toc_notes = PageTemplateFile('zpt/viewer/toc_notes', globals())
     toc_handwritten = PageTemplateFile('zpt/viewer/toc_handwritten', globals())
     toc_none = PageTemplateFile('zpt/viewer/toc_none', globals())

version.txt

@@ -1 @@
-DocumentViewer 2.2.10
+DocumentViewer 2.2.11

zpt/viewer/common_template.zpt

@@ -116 +116 @@
             tal:condition="python:docpath and docinfo.get('pageNumbers', None)"><span><a
               tal:omit-tag="python:tocMode=='concordance'" tal:attributes="href python:here.getLink('tocMode','concordance')">Concordance</a></span></li>
+          <li tal:attributes="class python:here.getStyle(tocMode, 'notes')"
+            tal:condition="python:docpath and docinfo.get('numNotes', None)"><span><a
+              tal:omit-tag="python:tocMode=='notes'" tal:attributes="href python:here.getLink('tocMode','notes')">Notes</a></span></li>
           <li tal:attributes="class python:here.getStyle(tocMode, 'handwritten')"
             tal:condition="python:docpath and docinfo.get('numHandwritten', None)"><span><a
-              tal:omit-tag="python:tocMode=='handwritten'" tal:attributes="href python:here.getLink('tocMode','handwritten')">Notes</a></span></li>
+              tal:omit-tag="python:tocMode=='handwritten'" tal:attributes="href python:here.getLink('tocMode','handwritten')">Handwritten</a></span></li>
           <li tal:attributes="class python:here.getStyle(tocMode, 'figures')"
             tal:condition="python:docpath and docinfo.get('numFigureEntries', None)"><span><a