Mercurial > hg > documentViewer

changeset 539:37d122560028

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more nicer
author casties
date Wed, 15 Aug 2012 16:59:45 +0200
parents dbf25bd05fc6
children 4b43a57ad9b3
files css/docuviewer.css zpt/toc_concordance.zpt zpt/toc_figures.zpt zpt/toc_none.zpt zpt/toc_text.zpt zpt/toc_thumbs.zpt zpt/viewer_index.zpt
diffstat 6 files changed, 32 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/css/docuviewer.css	Mon Jul 30 19:41:48 2012 +0200
+++ b/css/docuviewer.css	Wed Aug 15 16:59:45 2012 +0200
@@ -255,6 +255,10 @@
 div.index-info {
 	padding-top: 1em;	
 }
+div.index-info h2 {
+	margin-top: 0.5em;
+	margin-bottom: 0.5em;
+}
 div.index-info td.type {
 	font-weight: bold;
 }
--- a/zpt/toc_concordance.zpt	Mon Jul 30 19:41:48 2012 +0200
+++ b/zpt/toc_concordance.zpt	Wed Aug 15 16:59:45 2012 +0200
@@ -35,6 +35,9 @@
           </tr>
         </table>
       </div>
+      <div class="ruler">
+        <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
+      </div>
     </div>
   </div>
   <!-- /toc -->
--- a/zpt/toc_figures.zpt	Mon Jul 30 19:41:48 2012 +0200
+++ b/zpt/toc_figures.zpt	Wed Aug 15 16:59:45 2012 +0200
@@ -17,6 +17,9 @@
       </div>
       <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>
   <!-- /toc -->
--- a/zpt/toc_text.zpt	Mon Jul 30 19:41:48 2012 +0200
+++ b/zpt/toc_text.zpt	Wed Aug 15 16:59:45 2012 +0200
@@ -16,6 +16,9 @@
         <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
       </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>
   <!-- toc -->
--- a/zpt/toc_thumbs.zpt	Mon Jul 30 19:41:48 2012 +0200
+++ b/zpt/toc_thumbs.zpt	Wed Aug 15 16:59:45 2012 +0200
@@ -34,6 +34,9 @@
             </a></td>
           </tr>
         </table>
+        <div class="ruler">
+          <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler_thumbs" />
+        </div>
       </div>
       <!-- content -->
     </div>
--- a/zpt/viewer_index.zpt	Mon Jul 30 19:41:48 2012 +0200
+++ b/zpt/viewer_index.zpt	Wed Aug 15 16:59:45 2012 +0200
@@ -30,6 +30,7 @@
 
     <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))">
           <tal:x condition="python:formattedData">
@@ -65,7 +66,9 @@
           <!-- ende kein template fuer die daten -->
         </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>
             <td class="content" tal:content="dri" />
@@ -76,15 +79,22 @@
               tal:content="string:http://echo.mpiwg-berlin.mpg.de/$dri" /></td>
           </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>
 
       <div class="index-actions">