# HG changeset patch # User dwinter # Date 1432630707 -7200 # Node ID e36bf3226fdea2908c3d3ba02b6c55318fbc063e # Parent 447251b5af6581bd5187173feb2524aaa521915a text image viewer eingecheckt diff -r 447251b5af65 -r e36bf3226fde css/docuviewer.css --- a/css/docuviewer.css Wed Feb 11 17:18:23 2015 +0100 +++ b/css/docuviewer.css Tue May 26 10:58:27 2015 +0200 @@ -75,6 +75,31 @@ vertical-align: top; } + + +/* +* two colomn stype for image - text +*/ +div.two-column { + display: table; +} + +div.two-column-row { + display: table-row; +} + +div.two-column-left { + display: table-cell; + vertical-align: top; +} + +div.two-column-right { + display: table-cell; + vertical-align: top; +} + + + /* * TOC */ diff -r 447251b5af65 -r e36bf3226fde documentViewer.py --- a/documentViewer.py Wed Feb 11 17:18:23 2015 +0100 +++ b/documentViewer.py Tue May 26 10:58:27 2015 +0200 @@ -95,12 +95,14 @@ viewer_index = PageTemplateFile('zpt/viewer/viewer_index', globals()) viewer_thumbs = PageTemplateFile('zpt/viewer/viewer_thumbs', globals()) viewer_indexonly = PageTemplateFile('zpt/viewer/viewer_indexonly', globals()) + viewer_text_image = PageTemplateFile('zpt/viewer/viewer_text_image', globals()) # available layer types (annotator not default) builtinLayers = {'text': ['dict','search','gis'], - 'xml': None, 'image': None, 'index': ['extended']} + 'xml': None, 'image': None, 'index': ['extended'],'text_image': ['dict'],} availableLayers = builtinLayers; # layer templates layer_text_dict = PageTemplateFile('zpt/viewer/layer_text_dict', globals()) + layer_text_image_dict = PageTemplateFile('zpt/viewer/layer_text_image_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()) @@ -976,7 +978,9 @@ pageinfo['pageZero'] = pageZero pageinfo['pageBatch'] = self.getPageBatch(start=start, rows=rows, cols=cols, pageFlowLtr=pageFlowLtr, pageZero=pageZero, minIdx=minPageNo, maxIdx=np) # more page parameters - pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') + #pageinfo['characterNormalization'] = self.REQUEST.get('characterNormalization','reg') + #becuase it is buggy this currently disabled and set to orig. + pageinfo['characterNormalization'] = 'orig' if docinfo.get('pageNumbers'): # get original page numbers pageNumber = docinfo['pageNumbers'].get(pn, None) diff -r 447251b5af65 -r e36bf3226fde zpt/viewer/common_template.zpt --- a/zpt/viewer/common_template.zpt Wed Feb 11 17:18:23 2015 +0100 +++ b/zpt/viewer/common_template.zpt Tue May 26 10:58:27 2015 +0200 @@ -30,6 +30,8 @@