Changeset 606:37ad612edf5a in documentViewer for zpt

Timestamp:

Dec 11, 2012, 9:33:12 PM (11 years ago)

Author:

casties

Branch:

default

Message:

fixed bug in indexonly with no image.

Location:

zpt/viewer

Files:

• viewer_index.zpt (modified) (1 diff)
• viewer_indexonly.zpt (modified) (2 diffs)

zpt/viewer/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

zpt/viewer/viewer_indexonly.zpt

@@ -26 +26 @@
     <div class="col index-image">
       <!-- image -->
-      <a tal:define="tp docinfo/titlePage | string:1"
-        tal:attributes="href python:context.getLink(params={'viewMode':'auto','pn':tp})"><img tal:condition="tp" border="0"
+      <a tal:define="tp docinfo/titlePage | string:1" tal:condition="python:docinfo.get('imageURL',None) and tp or exists('here/template/book.png')"
+        tal:attributes="href python:context.getLink(params={'viewMode':'auto','pn':tp})"><img tal:condition="python:docinfo.get('imageURL',None) and 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"
+        tal:condition="python:(not docinfo.get('imageURL',None)) and exists('here/template/book.png')" border="0"
         src="template/book.png" /></a>
     </div>
@@ -45 +45 @@
           <tal:x condition="not:formattedData">
             <!-- kein template fuer die daten -->
-            <tal:x condition="exists:docinfo/bib">
-              <tr tal:define="bibinfo docinfo/bib" tal:repeat="bib bibinfo">
-                <td class="type" tal:content="python:bib.capitalize().replace('_',' ') + ':'" />
-                <td class="content" tal:content="bibinfo/bib" />
-              </tr>
-            </tal:x>
+            <tal:block condition="exists:docinfo/bib">
+              <tal:block tal:define="bibinfo docinfo/bib" tal:repeat="bib bibinfo">
+                <tr tal:condition="python:bib[0]!='@'">
+                  <td class="type" tal:content="python:bib.capitalize().replace('_',' ') + ':'" />
+                  <td class="content" tal:content="python:bibinfo[bib]" />
+                </tr>
+              </tal:block>
+            </tal:block>
 
             <tal:y condition="not:exists:docinfo/bib">