--- a/documentViewer.py	Thu Nov 15 17:58:14 2012 +0100
+++ b/documentViewer.py	Fri Nov 16 11:44:21 2012 +0100
@@ -89,13 +89,13 @@
     # viewMode templates
     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())
     viewer_indexonly = PageTemplateFile('zpt/viewer_indexonly', globals())
     # 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
     layer_text_dict = PageTemplateFile('zpt/layer_text_dict', globals())
@@ -103,7 +103,7 @@
     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_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
     toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals())
@@ -210,14 +210,15 @@
         view it
         @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"
             
@@ -231,7 +232,7 @@
             if docinfo.has_key("textURL") or docinfo.get('textURLPath',None): #texturl gesetzt und textViewer konfiguriert
                 viewMode="text"
             else:
-                viewMode="images"
+                viewMode="image"
                
         return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
 
@@ -242,7 +243,7 @@
         show page
         @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)
         """
@@ -279,13 +280,18 @@
                     # use layer dict as default 
                     viewLayer = "dict"
             else:
-                viewMode = "images"
+                viewMode = "image"
                 
         elif viewMode == "text_dict":
             # legacy fix
             viewMode = "text"
             viewLayer = "dict"
             
+        elif viewMode == 'images':
+            # legacy fix
+            viewMode = 'image'
+            self.REQUEST['viewMode'] = 'image'
+
         # safe viewLayer in userinfo
         userinfo['viewLayer'] = viewLayer
                 
@@ -404,7 +410,7 @@
         if newLayerString is not None:
             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
             except: