Changeset 499:3f9703746fef in documentViewer for documentViewer.py

Timestamp:

Feb 13, 2012, 6:28:33 PM (12 years ago)

Author:

casties

Branch:

elementtree

Message:

more cleanup. new template for viewMode=index (not pretty so far).

File:

• documentViewer.py (modified) (4 diffs)

documentViewer.py

@@ -117 +117 @@
     viewer_text = PageTemplateFile('zpt/viewer_text', globals())
     viewer_images = PageTemplateFile('zpt/viewer_images', globals())
-    viewer_main = PageTemplateFile('zpt/viewer_main', globals())
+    viewer_index = PageTemplateFile('zpt/viewer_index', globals())
     toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals())
     toc_text = PageTemplateFile('zpt/toc_text', globals())
     toc_figures = PageTemplateFile('zpt/toc_figures', globals())
     toc_none = PageTemplateFile('zpt/toc_none', globals())
-    page_main_images = PageTemplateFile('zpt/page_main_images', globals())
-    page_main_double = PageTemplateFile('zpt/page_main_double', globals())
-    page_main_text = PageTemplateFile('zpt/page_main_text', globals())
-    page_main_text_dict = PageTemplateFile('zpt/page_main_text_dict', globals())
-    page_main_gis =PageTemplateFile ('zpt/page_main_gis', globals())
-    page_main_xml = PageTemplateFile('zpt/page_main_xml', globals())
-    page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals())
     head_main = PageTemplateFile('zpt/head_main', globals())
     info_xml = PageTemplateFile('zpt/info_xml', globals())
@@ -135 +128 @@
     docuviewer_css.index_html = refreshingImageFileIndexHtml
     
-    
-    thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())
-
     
     def __init__(self,id,imageScalerUrl=None,textServerName=None,title="",digilibBaseUrl=None,thumbcols=2,thumbrows=5,authgroups="mpiwg"):
@@ -182 +172 @@
         """returns full text content of page"""
         return self.template.fulltextclient.getTextPage(**args)
+
+    def getToc(self, **args):
+        """returns the full table of contents (in internal format)"""
+        return self.template.fulltextclient.getToc(**args)
+
+    def getTocPage(self, **args):
+        """returns one page of the table of contents"""
+        return self.template.fulltextclient.getTocPage(**args)
 
     #WTF?
@@ -223 +221 @@
         return self.template.fulltextclient.getLex(**args)
 
-    def getToc(self, **args):
-        """returns the full table of contents (in internal format)"""
-        return self.template.fulltextclient.getToc(**args)
-
-    def getTocPage(self, **args):
-        """returns one page of the table of contents"""
-        return self.template.fulltextclient.getTocPage(**args)
-
-    
+    #WTF?
+    thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())
     security.declareProtected('View','thumbs_rss')
     def thumbs_rss(self,mode,url,viewMode="auto",start=None,pn=1):