# HG changeset patch # User casties # Date 1350665507 -7200 # Node ID 024b7516243787c4a00731118a9b28368487ccee # Parent 9251719154a35ebc7e5fa10db7156544c5282a44 displays context data on index page diff -r 9251719154a3 -r 024b75162437 documentViewer.py --- a/documentViewer.py Thu Oct 18 17:53:09 2012 +0200 +++ b/documentViewer.py Fri Oct 19 18:51:47 2012 +0200 @@ -630,9 +630,14 @@ # DRI (permanent ID) dri = self.metadataService.getDRI(dom=metaDom, type='escidoc') if dri: - logging.debug("getDRI: dri=%s"%repr(dri)) docinfo['DRI'] = dri + # (presentation) context + ctx = self.metadataService.getContextData(dom=metaDom, all=True) + if ctx: + logging.debug("getcontext: ctx=%s"%repr(ctx)) + docinfo['presentationContext'] = ctx + # image path if mode != 'texttool': # override image path from texttool with url parameter TODO: how about mode=auto? diff -r 9251719154a3 -r 024b75162437 version.txt --- a/version.txt Thu Oct 18 17:53:09 2012 +0200 +++ b/version.txt Fri Oct 19 18:51:47 2012 +0200 @@ -1,1 +1,1 @@ -DocumentViewer 2.2.5 \ No newline at end of file +DocumentViewer 2.2.6 \ No newline at end of file diff -r 9251719154a3 -r 024b75162437 zpt/viewer_index.zpt --- a/zpt/viewer_index.zpt Thu Oct 18 17:53:09 2012 +0200 +++ b/zpt/viewer_index.zpt Fri Oct 19 18:51:47 2012 +0200 @@ -15,14 +15,13 @@ @@ -46,11 +45,12 @@ + tal:condition="python:not docinfo.get('titlePage',None) and exists('here/template/book.png')" border="0" + src="template/book.png" />
- +

Bibliographic information

@@ -102,6 +102,14 @@
+ +

Presentation context

+ +
+

Copyright information

@@ -120,19 +128,21 @@ - - + +
License:CC-BY-SA - (unless stated otherwise)Internal use only, - please contact library@mpiwg-berlin.mpg.de - (unless stated otherwise)CC-BY-SA (unless stated otherwise)Internal use only, please contact library@mpiwg-berlin.mpg.de + (unless stated otherwise) +
-
- + + +
- +

Browse

@@ -179,8 +187,8 @@

Metadata

- +
    @@ -193,7 +201,8 @@
-
+ +