--- documentViewer/zpt/head_main.zpt	2010/03/19 11:42:40	1.6
+++ documentViewer/zpt/head_main.zpt	2011/07/20 19:36:57	1.8.2.1
@@ -1,6 +1,4 @@
-<tal:block tal:define="docinfo options/docinfo; pageinfo options/pageinfo; viewMode python:options.get('viewMode','images')">
-  <span tal:condition="not:exists:docinfo/author">(no bibliographical information)</span>
-  <tal:y tal:condition="exists:docinfo/author">
-    <b tal:content="docinfo/author"/>,<i tal:content="docinfo/title"/><i tal:condition="exists:docinfo/year" tal:content="string:,${docinfo/year}"/>
-  </tal:y>
+<tal:block tal:define="docinfo options/docinfo; pageinfo options/pageinfo; formattedLabel python:here.metadata.getFormattedLabel(bibdata=docinfo.get('bib',None))">
+  <span tal:condition="not:formattedLabel" tal:content="string:(no bibliographical information for ${docinfo/bib_type})"/>
+  <span tal:condition="formattedLabel" tal:content="structure formattedLabel"/>
 </tal:block>