Changeset 590:ed4485d2748e in documentViewer

Timestamp:

Nov 16, 2012, 10:44:21 AM (11 years ago)

Author:

casties

Branch:

default

Message:

viewMode "images" changed to "image".

Files:

• css/docuviewer.css (modified) (1 diff)
• documentViewer.py (modified) (9 diffs)
• zpt/common_template.zpt (modified) (1 diff)
• zpt/layer_image_annotator.zpt (moved) (moved from zpt/layer_images_annotator.zpt)
• zpt/viewer_image.zpt (moved) (moved from zpt/viewer_images.zpt) (5 diffs)

css/docuviewer.css

@@ -373 +373 @@
  * image page
  */
-div.col.main div.content.images {
+div.col.main div.content.image {
         background-color: inherit;
         padding: 0;
 }
-div.col.main div.content.images table {
+div.col.main div.content.image table {
         border-collapse: collapse; /* for tight digilib */
 }

documentViewer.py

@@ -90 +90 @@
     viewer_text = PageTemplateFile('zpt/viewer_text', globals())
     viewer_xml = PageTemplateFile('zpt/viewer_xml', globals())
-    viewer_images = PageTemplateFile('zpt/viewer_images', globals())
+    viewer_image = PageTemplateFile('zpt/viewer_image', globals())
     viewer_index = PageTemplateFile('zpt/viewer_index', globals())
     viewer_thumbs = PageTemplateFile('zpt/viewer_thumbs', globals())
@@ -96 +96 @@
     # available layer types (annotator not default)
     builtinLayers = {'text': ['dict','search','gis'],
-                     'xml': None, 'images': None, 'index': ['extended']}
+                     'xml': None, 'image': None, 'index': ['extended']}
     availableLayers = builtinLayers;
     # layer templates
@@ -104 +104 @@
     layer_text_gis = PageTemplateFile('zpt/layer_text_gis', globals())
     layer_text_pundit = PageTemplateFile('zpt/layer_text_pundit', globals())
-    layer_images_annotator = PageTemplateFile('zpt/layer_images_annotator', globals())
+    layer_image_annotator = PageTemplateFile('zpt/layer_image_annotator', globals())
     layer_index_extended = PageTemplateFile('zpt/layer_index_extended', globals())
     # toc templates
@@ -211 +211 @@
         @param mode: defines how to access the document behind url 
         @param url: url which contains display information
-        @param viewMode: if images display images, if text display text, default is images (text,images or auto)
+        @param viewMode: image: display images, text: display text, default is auto (try text, else image)
         
         '''
         
         if not hasattr(self, 'template'):
-            # create template folder if it doesn't exist
-            self.manage_addFolder('template')
-            
+            # this won't work
+            logging.error("template folder missing!")
+            return "ERROR: template folder missing!"
+                        
         if not self.digilibBaseUrl:
             self.digilibBaseUrl = self.findDigilibUrl() or "http://nausikaa.mpiwg-berlin.mpg.de/digitallibrary"
@@ -232 +233 @@
                 viewMode="text"
             else:
-                viewMode="images"
+                viewMode="image"
                
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
@@ -243 +244 @@
         @param url: url which contains display information
         @param mode: defines how to access the document behind url 
-        @param viewMode: 'images': display images, 'text': display text, 'xml': display xml, default is 'auto'
+        @param viewMode: 'image': display images, 'text': display text, 'xml': display xml, default is 'auto'
         @param viewLayer: sub-type of viewMode, e.g. layer 'dict' for viewMode='text'
         @param tocMode: type of 'table of contents' for navigation (thumbs, text, figures, none)
@@ -280 +281 @@
                     viewLayer = "dict"
             else:
-                viewMode = "images"
+                viewMode = "image"
                 
         elif viewMode == "text_dict":
@@ -287 +288 @@
             viewLayer = "dict"
             
+        elif viewMode == 'images':
+            # legacy fix
+            viewMode = 'image'
+            self.REQUEST['viewMode'] = 'image'
+
         # safe viewLayer in userinfo
         userinfo['viewLayer'] = viewLayer
@@ -405 +411 @@
             try:
                 layers = json.loads(newLayerString)
-                if 'text' in layers and 'images' in layers:
+                if 'text' in layers and 'image' in layers:
                     self.availableLayers = layers
                     return

zpt/common_template.zpt

@@ -28 +28 @@
         <li tal:condition="docpath" tal:attributes="class python:here.getStyle(viewMode, 'text')"><a
           tal:omit-tag="python:viewMode=='text'" tal:attributes="href python:here.getLink('viewMode','text')">Text</a></li>
-        <li tal:condition="python:docinfo.get('imagePath',None)" tal:attributes="class python:here.getStyle(viewMode, 'images')"><a
-          tal:omit-tag="python:viewMode=='images'" tal:attributes="href python:here.getLink('viewMode','images')">Image</a></li>
+        <li tal:condition="python:docinfo.get('imagePath',None)" tal:attributes="class python:here.getStyle(viewMode, 'image')"><a
+          tal:omit-tag="python:viewMode=='image'" tal:attributes="href python:here.getLink('viewMode','image')">Image</a></li>
         <li tal:condition="docpath" tal:attributes="class python:here.getStyle(viewMode, 'xml')"><a
           tal:omit-tag="python:viewMode=='xml'" tal:attributes="href python:here.getLink('viewMode','xml')">XML</a></li>

zpt/viewer_image.zpt

@@ -4 +4 @@
   tal:define="docinfo options/docinfo; pageinfo options/pageinfo; viewMode pageinfo/viewMode;
               viewLayer pageinfo/viewLayer; viewLayers pageinfo/viewLayers;
-              availableLayers python:here.getAvailableLayers().get('images', None);
+              availableLayers python:here.getAvailableLayers().get('image', None);
               tocMode pageinfo/tocMode; viewerUrl docinfo/viewerUrl;
               numPages docinfo/numPages | nothing; dlBaseUrl docinfo/digilibBaseUrl | nothing;">
@@ -32 +32 @@
 <!--  layer headers (rendered always) -->
 <tal:block tal:repeat="layer availableLayers">
-  <tal:block tal:define="mpath string:here/template/layer_images_${layer}/macros/html_head" tal:condition="python:exists(mpath)">
+  <tal:block tal:define="mpath string:here/template/layer_image_${layer}/macros/html_head" tal:condition="python:exists(mpath)">
     <metal:block metal:use-macro="python:path(mpath)" />
   </tal:block>
@@ -71 +71 @@
           <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" />
         </div>
-        <div class="content images">
+        <div class="content image">
           <div id="scaler">
             <img tal:attributes="src string:${docinfo/imageURL}&pn=${pageinfo/pn}&dw=500&dh=500" />
@@ -90 +90 @@
               <!-- layer select buttons (rendered always) -->
               <tal:block tal:repeat="layer availableLayers">
-                <tal:block tal:define="mpath string:here/template/layer_images_${layer}/macros/layer_select_li"
+                <tal:block tal:define="mpath string:here/template/layer_image_${layer}/macros/layer_select_li"
                   tal:condition="python:exists(mpath)">
                   <li metal:use-macro="python:path(mpath)" />
@@ -138 +138 @@
         <!--  layer option boxes (rendered if active) -->
         <tal:block tal:repeat="layer availableLayers">
-          <tal:block tal:define="mpath string:here/template/layer_images_${layer}/macros/options_box"
+          <tal:block tal:define="mpath string:here/template/layer_image_${layer}/macros/options_box"
             tal:condition="python:exists(mpath)">
             <metal:block metal:use-macro="python:path(mpath)" />