Mercurial > hg > documentViewer

changeset 92:727fa536860c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more changed templates, now with metal:use-macro zogilib mostly working
author casties
date Fri, 09 Apr 2010 20:33:53 +0200
parents b8c491e52ebc
children fd2e11a1c369
files zpt/head_main.zpt zpt/page_main_images.zpt
diffstat 2 files changed, 36 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/head_main.zpt	Thu Apr 08 13:04:51 2010 +0200
+++ b/zpt/head_main.zpt	Fri Apr 09 20:33:53 2010 +0200
@@ -1,6 +1,18 @@
-<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>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+  <!-- block used for main content area -->
+  <metal:block metal:define-macro="main">
+    <div class="page_head">
+      <span tal:condition="not:exists:docinfo/author">(no bibliographical information)</span>
+      <tal:block 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:block>
+    </div>
+  </metal:block>
+</body>
+</html>
\ No newline at end of file
--- a/zpt/page_main_images.zpt	Thu Apr 08 13:04:51 2010 +0200
+++ b/zpt/page_main_images.zpt	Fri Apr 09 20:33:53 2010 +0200
@@ -1,3 +1,18 @@
-<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>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <!--  block used for definitions and scripts in head -->
+  <metal:block metal:define-macro="head" tal:define="zogilib nocall:here/zogilib; fn docinfo/imagePath; pn pageinfo/current">
+	<metal:block metal:use-macro="here/zogilib/template/main_embed/macros/head"/>
+  </metal:block>
+</head>
+<body onload="dl_init()">
+  <!-- block used for main content area -->
+  <metal:block metal:define-macro="main" tal:define="zogilib nocall:here/zogilib">
+	<tal:block tal:define="global zogilib_hasNavRef nothing"/>
+	<metal:block metal:use-macro="here/zogilib/template/main_embed/macros/main"/>
+  </metal:block>
+</body>
+</html>