Changeset 577:9251719154a3 in documentViewer

Timestamp:

Oct 18, 2012, 3:53:09 PM (12 years ago)

Author:

casties

Branch:

default

Message:

toc with list of handwritten notes.

Files:

• MpiwgXmlTextServer.py (modified) (7 diffs)
• css/docuviewer.css (modified) (3 diffs)
• documentViewer.py (modified) (1 diff)
• zpt/common_template.zpt (modified) (1 diff)
• zpt/toc_handwritten.zpt (added)

MpiwgXmlTextServer.py

@@ -160 +160 @@
                             
                         docinfo['pageNumbers'] = pages
-                        logging.debug("got pageNumbers=%s"%repr(pages))
                                     
                     # toc
@@ -296 +295 @@
                 if punditMode:
                     self._addPunditAttributes(pagediv, pageinfo, docinfo)
+                    
+                # TODO: move empty page text
+                ep = dom.find(".//div[@class='emptyPage']")
+                if ep is not None:
+                    pagediv.append(ep)
                  
                 s = serialize(pagediv)
@@ -545 +549 @@
             start = (pn - 1) * size
 
-        #fullresult = ET.fromstring(resultxml)
-        #fullresult = resultxml
-        #logging.debug("resultxml=%s"%repr(resultxml))
-        
         if resultxml is not None:
             # paginate
@@ -554 +554 @@
             last = first+size
             tocdivs = resultxml[first:last]
-            #del fullresult[:first]
-            #del fullresult[len:]
-            #tocdivs = fullresult
             
             toc = ET.Element('div', attrib={'class':'queryResultPage'})
@@ -621 +618 @@
         tocs = fulltoc[first:last]
         tp = '<div>'
+        label = {'figures': 'Figure', 'handwritten': 'Handwritten note'}.get(mode, 'Item')
         for toc in tocs:
             pageurl = self.getLink('pn', toc['pn'])
@@ -628 +626 @@
                 tp += '<div class="toc name">[%s] %s</div>'%(toc['level-string'], toc['content'])
             else:
-                tp += '<div class="toc name">[Figure %s]</div>'%(toc['level-string'])
+                tp += '<div class="toc name">[%s %s]</div>'%(label, toc['level-string'])
             
             if toc.get('no', None):
@@ -659 +657 @@
 
 def manage_addMpiwgXmlTextServer(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de/mpdl/interface/",timeout=40,RESPONSE=None):
-#def manage_addMpiwgXmlTextServer(self,id,title="",serverUrl="http://mpdl-text.mpiwg-berlin.mpg.de:30030/mpdl/interface/",timeout=40,RESPONSE=None):    
-    """add zogiimage"""
+    """add MpiwgXmlTextServer"""
     newObj = MpiwgXmlTextServer(id=id,title=title,serverUrl=serverUrl,timeout=timeout)
     self.Destination()._setObject(id, newObj)

css/docuviewer.css

@@ -99 +99 @@
     -o-transform-origin: top left;
         left: 7px;
-    top: 32em;
+    top: 34em;
     width: 40em;
     padding: 0px;
@@ -269 +269 @@
     margin-bottom: 0.25em;
 }
-/* normalization forms *
-div.col.main div.content.text div.text.orig span.w span.reg,
-div.col.main div.content.text div.text.orig span.w span.norm {
-    display: none;
-}
-div.col.main div.content.text div.text.reg span.w span.orig,
-div.col.main div.content.text div.text.reg span.w span.norm {
-    display: none;
-}
-div.col.main div.content.text div.text.norm span.w span.orig,
-div.col.main div.content.text div.text.norm span.w span.reg {
-    display: none;
-}
-/* dictionary forms *
-div.col.main div.content.text div.text.plain span.w a.dictionary {
-    display: none;
-}
-div.col.main div.content.text div.text.dict span.w span.nodictionary {
-    display: none;
-} 
-*/
 /* page break */
 div.col.main div.content.text span.pb span.n,
@@ -311 +290 @@
 }
 div.col.main div.content.text span.note span.noteSign {
+    display: none;
+    /* font-size: 70%;
+        vertical-align: super; */
+}
+/* handwritten */
+div.col.main div.content.text span.handwritten {
+        display: block;
+        /* float: left; */
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+    padding: 5px;
+    border: 1px dashed silver;  
+}
+div.col.main div.content.text span.handwritten span.figureNum {
     display: none;
     /* font-size: 70%;

documentViewer.py

@@ -150 +150 @@
     toc_figures = PageTemplateFile('zpt/toc_figures', globals())
     toc_concordance = PageTemplateFile('zpt/toc_concordance', globals())
+    toc_handwritten = PageTemplateFile('zpt/toc_handwritten', globals())
     toc_none = PageTemplateFile('zpt/toc_none', globals())
     # other templates

zpt/common_template.zpt

@@ -113 +113 @@
             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, '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>
           <li tal:attributes="class python:here.getStyle(tocMode, 'figures')"
             tal:condition="python:docpath and docinfo.get('numFigureEntries', None)"><span><a