Mercurial > hg > documentViewer

changeset 560:04c330b92cab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uses escidoc-dri (instead of -test). updated default license display for access!=free.
author casties
date Mon, 01 Oct 2012 15:33:22 +0200
parents eabfbad6aeb4
children 9255acc4518d
files documentViewer.py zpt/viewer_index.zpt
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/documentViewer.py	Fri Sep 28 18:50:59 2012 +0200
+++ b/documentViewer.py	Mon Oct 01 15:33:22 2012 +0200
@@ -610,7 +610,7 @@
                 docinfo['copyright'] = copyright
 
             # DRI (permanent ID)
-            dri = self.metadataService.getDRI(dom=metaDom, type='escidoc-test')
+            dri = self.metadataService.getDRI(dom=metaDom, type='escidoc')
             if dri:
                 logging.debug("getDRI: dri=%s"%repr(dri))
                 docinfo['DRI'] = dri
--- a/zpt/viewer_index.zpt	Fri Sep 28 18:50:59 2012 +0200
+++ b/zpt/viewer_index.zpt	Mon Oct 01 15:33:22 2012 +0200
@@ -116,12 +116,14 @@
             <tr>
               <td class="type">Copyright:</td>
               <td class="content"><a target="_blank" href="http://www.mpiwg-berlin.mpg.de">Max Planck Institute for the
-                  History of Science</a> (unless otherwise stated)</td>
+                  History of Science</a> (unless stated otherwise)</td>
             </tr>
             <tr>
               <td class="type">License:</td>
-              <td class="content"><a target="_blank" href="http://creativecommons.org/licenses/by-sa/3.0/de/">CC-BY-SA</a>
-                (unless otherwise stated)</td>
+              <td tal:condition="python:docinfo.get('accessType', None) == 'free'" class="content"><a target="_blank" href="http://creativecommons.org/licenses/by-sa/3.0/de/">CC-BY-SA</a>
+                (unless stated otherwise)</td>
+              <td tal:condition="python:docinfo.get('accessType', None) != 'free'" class="content">Internal use only, please contact <a href="mailto:library@mpiwg-berlin.mpg.de">library@mpiwg-berlin.mpg.de</a>
+                (unless stated otherwise)</td>
             </tr>
           </table>
         </tal:block>