# HG changeset patch
# User casties
# Date 1329157713 -3600
# Node ID 3f9703746fef8e1ce72cb8a0ce3b9ea03031e83b
# Parent 3146b4e7b6a53af2ba4ba5eb41c4b0b33dbd652c
more cleanup. new template for viewMode=index (not pretty so far).
diff -r 3146b4e7b6a5 -r 3f9703746fef documentViewer.py
--- a/documentViewer.py Fri Feb 10 19:05:45 2012 +0100
+++ b/documentViewer.py Mon Feb 13 19:28:33 2012 +0100
@@ -116,18 +116,11 @@
# templates and forms
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())
docuviewer_css = ImageFile('css/docuviewer.css',globals())
@@ -135,9 +128,6 @@
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"):
"""init document viewer"""
self.id=id
@@ -182,6 +172,14 @@
"""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?
def getQuery(self, **args):
"""get query in search"""
@@ -222,15 +220,8 @@
"""get lex"""
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):
'''
diff -r 3146b4e7b6a5 -r 3f9703746fef zpt/viewer_index.zpt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/viewer_index.zpt Mon Feb 13 19:28:33 2012 +0100
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+ |
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+ ![]()
+ 
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+ | Author: |
+ |
+
+
+ | Title: |
+ |
+
+
+ | Year: |
+ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ Sorry, document doesn't exist.
+
+
\ No newline at end of file