# HG changeset patch # User casties # Date 1343670108 -7200 # Node ID dbf25bd05fc613771390c7854ed2569184f041ef # Parent ad6f97fd394439cd17e3e3aeee17bd64bd58b5af digilib buttons get icons. pid on index page. diff -r ad6f97fd3944 -r dbf25bd05fc6 css/docuviewer.css --- a/css/docuviewer.css Fri Jul 27 17:09:59 2012 +0200 +++ b/css/docuviewer.css Mon Jul 30 19:41:48 2012 +0200 @@ -232,6 +232,10 @@ margin-bottom: 0.5em; } +div.options.digilib li img { + vertical-align: middle; +} + /* * search results */ diff -r ad6f97fd3944 -r dbf25bd05fc6 documentViewer.py --- a/documentViewer.py Fri Jul 27 17:09:59 2012 +0200 +++ b/documentViewer.py Mon Jul 30 19:41:48 2012 +0200 @@ -568,14 +568,18 @@ if attribution: logging.debug("getDocinfo: attribution=%s"%repr(attribution)) docinfo['attribution'] = attribution - #docinfo = self.getDocinfoFromAccess(docinfo, access) # copyright info copyright = self.metadataService.getCopyrightData(dom=metaDom) if copyright: logging.debug("getDocinfo: copyright=%s"%repr(copyright)) docinfo['copyright'] = copyright - #docinfo = self.getDocinfoFromAccess(docinfo, access) + + # DRI (permanent ID) + dri = self.metadataService.getDRI(dom=metaDom, type='escidoc-test') + if dri: + logging.debug("getDRI: dri=%s"%repr(dri)) + docinfo['DRI'] = dri # image path if mode != 'texttool': diff -r ad6f97fd3944 -r dbf25bd05fc6 zpt/viewer_images.zpt --- a/zpt/viewer_images.zpt Fri Jul 27 17:09:59 2012 +0200 +++ b/zpt/viewer_images.zpt Mon Jul 30 19:41:48 2012 +0200 @@ -70,34 +70,39 @@
-
-
- zoom in -
-
- zoom out -
-
- zoom area -
-
- full page -
-
- page width -
-
- set mark -
-
- remove mark -
-
- get reference -
-
- digilib -
+
+
diff -r ad6f97fd3944 -r dbf25bd05fc6 zpt/viewer_index.zpt --- a/zpt/viewer_index.zpt Fri Jul 27 17:09:59 2012 +0200 +++ b/zpt/viewer_index.zpt Mon Jul 30 19:41:48 2012 +0200 @@ -16,85 +16,99 @@
- +
-
- - -
+
+ + +
-
-
- - - - - +
+
+
+ + + + - - - - - - + + + + + + - - + + + + + + + + + + + + + + +
- -
+ +
Author: +
Title: +
Date: +
+ + - - - - - + - - + - - - -
Author: -
Title: + Document ID:
Date: + Permanent URL:
+ - - - - - -
-
+ + + + + +
+
-
-
- →Browse document -
-
- Download full document as →HTML or →XML +
+
+ →Browse document +
+
+ Download full document as →HTML or →XML +
+
+ +
+ +
+ +
+
-
- -
- -
- -
-
-