Changeset 578:024b75162437 in documentViewer

Timestamp:

Oct 19, 2012, 4:51:47 PM (12 years ago)

Author:

casties

Branch:

default

Message:

displays context data on index page

Files:

• documentViewer.py (modified) (1 diff)
• version.txt (modified) (1 diff)
• zpt/viewer_index.zpt (modified) (7 diffs)

documentViewer.py

@@ -631 +631 @@
             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

version.txt

@@ -1 @@
-DocumentViewer 2.2.5
+DocumentViewer 2.2.6

zpt/viewer_index.zpt

@@ -16 +16 @@
 <script type="text/javascript" tal:attributes="src string:$viewerUrl/template/jquery_js"></script>
 <script type="text/javascript">
-// <!--
-  $(document).ready(function() {
-    // autosubmit forms
-    $('form.autosubmit').find('.autosubmit').change(function() {
-      this.form.submit();
-    });
-    $('form.autosubmit input[type="submit"]').hide();
-  });
+        $(document).ready(function() {
+                // autosubmit forms
+                $('form.autosubmit').find('.autosubmit').change(function() {
+                        this.form.submit();
+                });
+                $('form.autosubmit input[type="submit"]').hide();
+        });
 // -->
 </script>
@@ -47 +46 @@
         tal:attributes="href python:context.getLink(params={'viewMode':'auto','pn':tp})"><img tal:condition="tp" border="0"
         tal:attributes="src python:'%s&pn=%s&dw=300&dh=500'%(docinfo.get('imageURL',None),tp)" /><img
-        tal:condition="python:not docinfo.get('titlePage',None) and exists('here/template/book.png')" border="0" src="template/book.png" /></a>
+        tal:condition="python:not docinfo.get('titlePage',None) and exists('here/template/book.png')" border="0"
+        src="template/book.png" /></a>
     </div>
 
     <div class="col main">
-     <!-- main content column --> 
+      <!-- main content column -->
       <div class="index-info">
         <h2>Bibliographic information</h2>
@@ -101 +101 @@
             </tr> -->
           </table>
+        </tal:block>
+
+        <tal:block tal:define="ctxs docinfo/presentationContext | nothing">
+          <h2>Presentation context</h2>
+          <ul>
+            <li tal:repeat="ctx ctxs"><a tal:define="link ctx/link | nothing; name ctx/name | link;" tal:content="name"
+              tal:attributes="href link" target="_blank" tal:omit-tag="not:link" /></li>
+          </ul>
         </tal:block>
 
@@ -121 +129 @@
             <tr tal:define="accType python:docinfo.get('accessType', None)">
               <td class="type">License:</td>
-              <td tal:condition="python:accType == '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:accType != 'free'" class="content">Internal use only<span tal:condition="accType" tal:content="string: ($accType)"/>, 
-                please contact <a href="mailto:library@mpiwg-berlin.mpg.de">library@mpiwg-berlin.mpg.de</a>
-                (unless stated otherwise)</td>
+              <td tal:condition="python:accType == '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:accType != 'free'" class="content">Internal use only<span tal:condition="accType"
+                tal:content="string: ($accType)" />, please contact <a href="mailto:library@mpiwg-berlin.mpg.de">library@mpiwg-berlin.mpg.de</a>
+                (unless stated otherwise)
+              </td>
             </tr>
           </table>
         </tal:block>
       </div>
-    </div> <!-- /main content column --> 
-    
+    </div>
+    <!-- /main content column -->
+
     <div class="col buttons">
-      <!-- option block column --> 
+      <!-- option block column -->
       <div class="options">
         <h4>Browse</h4>
@@ -146 +156 @@
         <ul class="list">
           <li><a target="_blank" rel="nofollow" class="download"
-            tal:attributes="href python:here.getTextDownloadUrl(type='html',docinfo=docinfo)"
-            target="_blank">as HTML</a></li>
+            tal:attributes="href python:here.getTextDownloadUrl(type='html',docinfo=docinfo)" target="_blank">as HTML</a></li>
           <li><a target="_blank" rel="nofollow" class="download"
-            tal:attributes="href python:here.getTextDownloadUrl(type='xml',docinfo=docinfo)" target="_blank">as
-              XML</a></li>
+            tal:attributes="href python:here.getTextDownloadUrl(type='xml',docinfo=docinfo)" target="_blank">as XML</a></li>
         </ul>
         (copyright and license see below)
@@ -180 +188 @@
         <h4>Metadata</h4>
         <form tal:attributes="action viewerUrl" class="autosubmit">
-          <input type="hidden" tal:define="params python:here.getParams(params={'viewLayer':None})"
-            tal:repeat="param params" tal:attributes="name param; value python:params[param]" />
+          <input type="hidden" tal:define="params python:here.getParams(params={'viewLayer':None})" tal:repeat="param params"
+            tal:attributes="name param; value python:params[param]" />
           <ul>
             <!-- text layer select buttons (rendered always) -->
@@ -194 +202 @@
         </form>
       </div>
-    </div> <!-- /option block column -->     
+    </div>
+    <!-- /option block column -->
   </div>
   <tal:block tal:condition="exists:here/template/site_template.pt/macros/footer">