--- documentViewer/documentViewer.py	2011/08/16 16:27:08	1.175.2.27
+++ documentViewer/documentViewer.py	2011/08/31 16:22:12	1.175.2.34
@@ -1,17 +1,14 @@
 from OFS.Folder import Folder
-from OFS.Image import File
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
-from Products.PageTemplates.PageTemplateFile import PageTemplateFile 
+from Products.PageTemplates.PageTemplateFile import PageTemplateFile
+from App.ImageFile import ImageFile
 from AccessControl import ClassSecurityInfo
 from AccessControl import getSecurityManager
 from Globals import package_home
 
-#from Ft.Xml import EMPTY_NAMESPACE, Parse 
-#import Ft.Xml.Domlette
-
 import xml.etree.ElementTree as ET
 
-import os.path
+import os
 import sys
 import urllib
 import logging
@@ -20,12 +17,7 @@ import urlparse
 import re
 import string
 
-from SrvTxtUtils import getInt, getText, getHttpData
-
-def logger(txt,method,txt2):
-    """logging"""
-    logging.info(txt+ txt2)
-    
+from SrvTxtUtils import getInt, getText, getHttpData, refreshingImageFileIndexHtml
     
 def serializeNode(node, encoding="utf-8"):
     """returns a string containing node as XML"""
@@ -106,7 +98,6 @@ def getParentPath(path, cnt=1):
     # split by /, shorten, and reassemble
     return '/'.join(path.split('/')[0:-cnt])
 
-
 ##
 ## documentViewer class
 ##
@@ -124,10 +115,12 @@ class documentViewer(Folder):
 
     # templates and forms
     viewer_text = PageTemplateFile('zpt/viewer_text', globals())
+    viewer_images = PageTemplateFile('zpt/viewer_images', globals())
     viewer_main = PageTemplateFile('zpt/viewer_main', 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())
@@ -137,8 +130,9 @@ class documentViewer(Folder):
     page_main_pureXml = PageTemplateFile('zpt/page_main_pureXml', globals())
     head_main = PageTemplateFile('zpt/head_main', globals())
     info_xml = PageTemplateFile('zpt/info_xml', globals())
-    # TODO: can this be nicer?
-    docuviewer_css = File('docuviewer_css','',open(os.path.join(package_home(globals()),'css/docuviewer.css')), content_type='text/css')
+    docuviewer_css = ImageFile('css/docuviewer.css',globals())
+    # make ImageFile better for development
+    docuviewer_css.index_html = refreshingImageFileIndexHtml
     
     
     thumbs_main_rss = PageTemplateFile('zpt/thumbs_main_rss', globals())
@@ -918,37 +912,3 @@ def manage_AddDocumentViewer(self,id,ima
     
     if RESPONSE is not None:
         RESPONSE.redirect('manage_main')
-
-## DocumentViewerTemplate class
-class DocumentViewerTemplate(ZopePageTemplate):
-    """Template for document viewer"""
-    meta_type="DocumentViewer Template"
-
-
-def manage_addDocumentViewerTemplateForm(self):
-    """Form for adding"""
-    pt=PageTemplateFile('zpt/addDocumentViewerTemplate', globals()).__of__(self)
-    return pt()
-
-def manage_addDocumentViewerTemplate(self, id='viewer_main', title=None, text=None,
-                           REQUEST=None, submit=None):
-    "Add a Page Template with optional file content."
-
-    self._setObject(id, DocumentViewerTemplate(id))
-    ob = getattr(self, id)
-    txt=file(os.path.join(package_home(globals()),'zpt/viewer_main.zpt'),'r').read()
-    logging.info("txt %s:"%txt)
-    ob.pt_edit(txt,"text/html")
-    if title:
-        ob.pt_setTitle(title)
-    try:
-        u = self.DestinationURL()
-    except AttributeError:
-        u = REQUEST['URL1']
-        
-    u = "%s/%s" % (u, urllib.quote(id))
-    REQUEST.RESPONSE.redirect(u+'/manage_main')
-    return ''
-
-
-