Mercurial > hg > documentViewer

changeset 505:29f2172db368 elementtree

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
title also for non-bib-tag.
author casties
date Fri, 17 Feb 2012 10:46:03 +0100
parents 454a42f4c369
children 67014399894d
files zpt/common_template.zpt zpt/viewer_index.zpt
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/common_template.zpt	Thu Feb 16 16:51:17 2012 +0100
+++ b/zpt/common_template.zpt	Fri Feb 17 10:46:03 2012 +0100
@@ -12,8 +12,13 @@
                queryType here/REQUEST/queryType | nothing;
                bib docinfo/bib | nothing; bibType docinfo/bibType | nothing;
                formattedLabel python:here.metadataService.getBibFormattedLabel(bibdata=bib);">
-    <div tal:condition="not:formattedLabel"
+    <div tal:condition="not:formattedLabel">
+      <tal:block tal:condition="python:docinfo['creator'] or docinfo['title']"><i tal:content="docinfo/creator"/>,
+        <span tal:content="docinfo/title"/>, <span tal:content="docinfo/date"/>
+      </tal:block>
+      <span tal:condition="not:python:docinfo['creator'] or docinfo['title']"
       tal:content="string:[no bibliographical information for this document (type ${bibType})]" />
+    </div>
     <div tal:condition="formattedLabel" tal:content="structure formattedLabel" />
     <div class="doclinks">
       <a tal:attributes="href python:here.getLink('viewMode','index')">Bibliographical information</a>
--- a/zpt/viewer_index.zpt	Thu Feb 16 16:51:17 2012 +0100
+++ b/zpt/viewer_index.zpt	Fri Feb 17 10:46:03 2012 +0100
@@ -2,7 +2,7 @@
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
   tal:define="docinfo options/docinfo; pageinfo options/pageinfo; viewMode pageinfo/viewMode;
-                  tocMode pageinfo/tocMode; viewType pageinfo/viewType; viewerUrl docinfo/viewerUrl;
+                  tocMode pageinfo/tocMode; viewerUrl docinfo/viewerUrl;
                   docpath docinfo/textURLPath | nothing;
                   query nothing;
                   numPages docinfo/numPages | nothing;">