Changeset 594:da7daa783df4 in documentViewer

Timestamp:

Nov 16, 2012, 4:16:50 PM (11 years ago)

Author:

casties

Branch:

default

Message:

rearranged viewer templates into folder.

Files:

• documentViewer.py (modified) (2 diffs)
• zpt/viewer/common_template.zpt (moved) (moved from zpt/common_template.zpt)
• zpt/viewer/layer_image_annotator.zpt (moved) (moved from zpt/layer_image_annotator.zpt)
• zpt/viewer/layer_image_search.zpt (moved) (moved from zpt/layer_image_search.zpt)
• zpt/viewer/layer_index_extended.zpt (moved) (moved from zpt/layer_index_extended.zpt)
• zpt/viewer/layer_text_annotator.zpt (moved) (moved from zpt/layer_text_annotator.zpt)
• zpt/viewer/layer_text_dict.zpt (moved) (moved from zpt/layer_text_dict.zpt)
• zpt/viewer/layer_text_gis.zpt (moved) (moved from zpt/layer_text_gis.zpt)
• zpt/viewer/layer_text_pundit.zpt (moved) (moved from zpt/layer_text_pundit.zpt)
• zpt/viewer/layer_text_search.zpt (moved) (moved from zpt/layer_text_search.zpt)
• zpt/viewer/toc_concordance.zpt (moved) (moved from zpt/toc_concordance.zpt)
• zpt/viewer/toc_figures.zpt (moved) (moved from zpt/toc_figures.zpt)
• zpt/viewer/toc_handwritten.zpt (moved) (moved from zpt/toc_handwritten.zpt)
• zpt/viewer/toc_none.zpt (moved) (moved from zpt/toc_none.zpt) (1 prop)
• zpt/viewer/toc_text.zpt (moved) (moved from zpt/toc_text.zpt)
• zpt/viewer/toc_thumbs.zpt (moved) (moved from zpt/toc_thumbs.zpt)
• zpt/viewer/viewer_image.zpt (moved) (moved from zpt/viewer_image.zpt)
• zpt/viewer/viewer_index.zpt (moved) (moved from zpt/viewer_index.zpt)
• zpt/viewer/viewer_indexonly.zpt (moved) (moved from zpt/viewer_indexonly.zpt)
• zpt/viewer/viewer_text.zpt (moved) (moved from zpt/viewer_text.zpt)
• zpt/viewer/viewer_thumbs.zpt (moved) (moved from zpt/viewer_thumbs.zpt)
• zpt/viewer/viewer_xml.zpt (moved) (moved from zpt/viewer_xml.zpt)

documentViewer.py

@@ -96 +96 @@
     #
     # viewMode templates
-    viewer_text = PageTemplateFile('zpt/viewer_text', globals())
-    viewer_xml = PageTemplateFile('zpt/viewer_xml', globals())
-    viewer_image = PageTemplateFile('zpt/viewer_image', globals())
-    viewer_index = PageTemplateFile('zpt/viewer_index', globals())
-    viewer_thumbs = PageTemplateFile('zpt/viewer_thumbs', globals())
-    viewer_indexonly = PageTemplateFile('zpt/viewer_indexonly', globals())
+    viewer_text = PageTemplateFile('zpt/viewer/viewer_text', globals())
+    viewer_xml = PageTemplateFile('zpt/viewer/viewer_xml', globals())
+    viewer_image = PageTemplateFile('zpt/viewer/viewer_image', globals())
+    viewer_index = PageTemplateFile('zpt/viewer/viewer_index', globals())
+    viewer_thumbs = PageTemplateFile('zpt/viewer/viewer_thumbs', globals())
+    viewer_indexonly = PageTemplateFile('zpt/viewer/viewer_indexonly', globals())
     # available layer types (annotator not default)
     builtinLayers = {'text': ['dict','search','gis'],
@@ -107 +107 @@
     availableLayers = builtinLayers;
     # layer templates
-    layer_text_dict = PageTemplateFile('zpt/layer_text_dict', globals())
-    layer_text_search = PageTemplateFile('zpt/layer_text_search', globals())
-    layer_text_annotator = PageTemplateFile('zpt/layer_text_annotator', globals())
-    layer_text_gis = PageTemplateFile('zpt/layer_text_gis', globals())
-    layer_text_pundit = PageTemplateFile('zpt/layer_text_pundit', globals())
-    layer_image_annotator = PageTemplateFile('zpt/layer_image_annotator', globals())
-    layer_image_search = PageTemplateFile('zpt/layer_image_search', globals())
-    layer_index_extended = PageTemplateFile('zpt/layer_index_extended', globals())
+    layer_text_dict = PageTemplateFile('zpt/viewer/layer_text_dict', globals())
+    layer_text_search = PageTemplateFile('zpt/viewer/layer_text_search', globals())
+    layer_text_annotator = PageTemplateFile('zpt/viewer/layer_text_annotator', globals())
+    layer_text_gis = PageTemplateFile('zpt/viewer/layer_text_gis', globals())
+    layer_text_pundit = PageTemplateFile('zpt/viewer/layer_text_pundit', globals())
+    layer_image_annotator = PageTemplateFile('zpt/viewer/layer_image_annotator', globals())
+    layer_image_search = PageTemplateFile('zpt/viewer/layer_image_search', globals())
+    layer_index_extended = PageTemplateFile('zpt/viewer/layer_index_extended', globals())
     # toc templates
-    toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals())
-    toc_text = PageTemplateFile('zpt/toc_text', globals())
-    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())
+    toc_thumbs = PageTemplateFile('zpt/viewer/toc_thumbs', globals())
+    toc_text = PageTemplateFile('zpt/viewer/toc_text', globals())
+    toc_figures = PageTemplateFile('zpt/viewer/toc_figures', globals())
+    toc_concordance = PageTemplateFile('zpt/viewer/toc_concordance', globals())
+    toc_handwritten = PageTemplateFile('zpt/viewer/toc_handwritten', globals())
+    toc_none = PageTemplateFile('zpt/viewer/toc_none', globals())
     # other templates
-    common_template = PageTemplateFile('zpt/common_template', globals())
-    info_xml = PageTemplateFile('zpt/info_xml', globals())
+    common_template = PageTemplateFile('zpt/viewer/common_template', globals())
+    info_xml = PageTemplateFile('zpt/viewer/info_xml', globals())
     docuviewer_css = ImageFile('css/docuviewer.css',globals())
     # make docuviewer_css refreshable for development