Changeset 539:37d122560028 in documentViewer

Timestamp:

Aug 15, 2012, 2:59:45 PM (12 years ago)

Author:

casties

Branch:

default

Message:

more nicer

Files:

• css/docuviewer.css (modified) (1 diff)
• zpt/toc_concordance.zpt (modified) (1 diff, 1 prop)
• zpt/toc_figures.zpt (modified) (1 diff, 1 prop)
• zpt/toc_none.zpt (modified) (1 prop)
• zpt/toc_text.zpt (modified) (1 diff, 1 prop)
• zpt/toc_thumbs.zpt (modified) (1 diff, 1 prop)
• zpt/viewer_index.zpt (modified) (3 diffs)

css/docuviewer.css

@@ -256 +256 @@
         padding-top: 1em;       
 }
+div.index-info h2 {
+        margin-top: 0.5em;
+        margin-bottom: 0.5em;
+}
 div.index-info td.type {
         font-weight: bold;

zpt/toc_concordance.zpt

@@ -36 +36 @@
         </table>
       </div>
+      <div class="ruler">
+        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
+      </div>
     </div>
   </div>

zpt/toc_figures.zpt

@@ -18 +18 @@
       <div class="content"
         tal:content="structure python:here.getTocPage(mode='figures',start=start,pageinfo=pageinfo,docinfo=docinfo)" />
+      <div class="ruler">
+        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
+      </div>
     </div>
   </div>

zpt/toc_text.zpt

@@ -17 +17 @@
       </div>
       <div class="content" tal:content="structure python:here.getTocPage(mode='text',start=start,pageinfo=pageinfo,docinfo=docinfo)" />
+      <div class="ruler">
+        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
+      </div>
     </div>
   </div>

zpt/toc_thumbs.zpt

@@ -35 +35 @@
           </tr>
         </table>
+        <div class="ruler">
+          <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler_thumbs" />
+        </div>
       </div>
       <!-- content -->

zpt/viewer_index.zpt

@@ -31 +31 @@
     <div class="col">
       <div class="index-info">
+        <h2>Bibliographical information</h2>
         <table border="0"
           tal:define="formattedData python:here.metadata.getBibFormattedMetaDataExtended(bibdata=docinfo.get('bib', None))">
@@ -66 +67 @@
         </table>
 
-        <table tal:define="dri docinfo/DRI | nothing" tal:condition="dri">
+        <tal:block tal:define="dri docinfo/DRI | nothing" tal:condition="dri">
+        <h2>Permanent URL</h2>
+        <table>
           <tr>
             <td class="type">Document ID:</td>
@@ -77 +80 @@
           </tr>
         </table>
+        </tal:block>
 
-        <table border="0">
+        <tal:block tal:define="attribution docinfo/attribution | nothing; copyright docinfo/copyright | nothing">
+        <h2>Copyright information</h2>
+        <table border="0" tal:condition="attribution | copyright">
           <!-- attribution -->
-          <tr tal:condition="exists:docinfo/attribution"
-            tal:replace="structure python:here.metadataService.getAttributionFormatted('metadata_template', data=docinfo['attribution'])" />
+          <tr tal:condition="attribution"
+            tal:replace="structure python:here.metadataService.getAttributionFormatted('metadata_template', data=attribution)" />
           <!-- copyright -->
-          <tr tal:condition="exists:docinfo/copyright"
-            tal:replace="structure python:here.metadataService.getCopyrightFormatted('metadata_template', data=docinfo['copyright'])" />
+          <tr tal:condition="copyright"
+            tal:replace="structure python:here.metadataService.getCopyrightFormatted('metadata_template', data=copyright)" />
         </table>
+        <table border="0" tal:condition="not:attribution | copyright">
+          <tr><td></td></tr>
+        </table>        
+        </tal:block>
       </div>