changeset 88:4938ce551ae8

first version with new full-text infrastructure and slightly changed templates
author casties
date Fri, 19 Mar 2010 12:42:40 +0100
parents a0fbc9a42be8
children 3d95ba1bf535
files zpt/head_main.zpt zpt/page_main_images.zpt
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/head_main.zpt	Fri Mar 19 12:42:40 2010 +0100
+++ b/zpt/head_main.zpt	Fri Mar 19 12:42:40 2010 +0100
@@ -3,8 +3,4 @@
   <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:x tal:condition="python:viewMode=='text'">
-  <a target="_blank" tal:attributes="href string:${here/imageViewerUrl}fn=${docinfo/imagePath}&pn=${pageinfo/current}">view image</a>
-  <a target="_blank" tal:attributes="href string:${here/textViewerUrl}/getPage?fn=${docinfo/imagePath}&_pn=${pageinfo/current}">show xml</a>
-  </tal:x>
 </tal:block>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/page_main_images.zpt	Fri Mar 19 12:42:40 2010 +0100
@@ -0,0 +1,3 @@
+<tal:block tal:define="docinfo options/docinfo; pageinfo options/pageinfo; mk python:options.get('mk','')">
+ <iframe height="100%" width="100%" tal:attributes="src string:${here/template/zogilib/absolute_url}?fn=${docinfo/imagePath}&pn=${pageinfo/current}&$mk"/>
+</tal:block>