# HG changeset patch # User casties # Date 1274798184 -7200 # Node ID 027134cca83ebe40ec566f191976b5a10b788f89 # Parent cb0978becec474f6e9d62dfce6aa1fb7ef31c99c reverting back to non-metal version for now diff -r cb0978becec4 -r 027134cca83e zpt/head_main.zpt --- a/zpt/head_main.zpt Tue May 25 12:03:55 2010 +0200 +++ b/zpt/head_main.zpt Tue May 25 16:36:24 2010 +0200 @@ -1,18 +1,6 @@ - - - - - - - - -

- (no bibliographical information) - - , - -

- - - \ No newline at end of file + + (no bibliographical information) + + , + + diff -r cb0978becec4 -r 027134cca83e zpt/page_main_images.zpt --- a/zpt/page_main_images.zpt Tue May 25 12:03:55 2010 +0200 +++ b/zpt/page_main_images.zpt Tue May 25 16:36:24 2010 +0200 @@ -1,18 +1,3 @@ - - - - - - - - - - - - - - - - - + + +</tal:block> diff -r cb0978becec4 -r 027134cca83e zpt/toc_figures.zpt --- a/zpt/toc_figures.zpt Tue May 25 12:03:55 2010 +0200 +++ b/zpt/toc_figures.zpt Tue May 25 16:36:24 2010 +0200 @@ -1,25 +1,14 @@ -<!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> -  - <metal:block metal:define-macro="main"> - <tal:block tal:define="pn python:int(pageinfo['tocPN']); tocsize python:int(docinfo['tocSize_figures']); grpsize python:int(pageinfo['tocPageSize']); - maxpn python:int(tocsize/grpsize);"> - <div class="thumbruler"> - <span tal:condition="python:(pn>1)"> - <a tal:attributes="href python:here.getLink(param='tocPN',val=pn-1)"><</a> - </span> - <span tal:content="string:$pn of $maxpn"/> - <span> - <a tal:attributes="href python:here.getLink(param='tocPN',val=pn+1)">></a> - </span> - </div> - <div tal:content="structure python:here.getTocPage(mode='figures',pageinfo=pageinfo,docinfo=docinfo)"/> - </tal:block> - </metal:block> -</body> -</html> +<tal:block tal:define="docinfo options/docinfo; pageinfo options/pageinfo; + pn python:int(pageinfo['tocPN']); tocsize python:int(docinfo['tocSize_figures']); grpsize python:int(pageinfo['tocPageSize']); + maxpn python:int(tocsize/grpsize);"> + <div class="thumbruler"> + <span tal:condition="python:(pn>1)"> + <a tal:attributes="href python:here.getLink(param='tocPN',val=pn-1)"><</a> + </span> + <span tal:content="string:$pn of $maxpn"/> + <span> + <a tal:attributes="href python:here.getLink(param='tocPN',val=pn+1)">></a> + </span> +</div> + <div tal:content="structure python:here.getTocPage(mode='figures',pageinfo=pageinfo,docinfo=docinfo)"/> +</tal:block> diff -r cb0978becec4 -r 027134cca83e zpt/toc_text.zpt --- a/zpt/toc_text.zpt Tue May 25 12:03:55 2010 +0200 +++ b/zpt/toc_text.zpt Tue May 25 16:36:24 2010 +0200 @@ -1,25 +1,14 @@ -<!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> -  - <metal:block metal:define-macro="main"> - <tal:block tal:define="pn python:int(pageinfo['tocPN']); tocsize python:int(docinfo['tocSize_text']); grpsize python:int(pageinfo['tocPageSize']); - maxpn python:int(tocsize/grpsize);"> - <div class="thumbruler"> - <span tal:condition="python:(pn>1)"> - <a tal:attributes="href python:here.getLink(param='tocPN',val=pn-1)"><</a> - </span> - <span tal:content="string:$pn of $maxpn"/> - <span> - <a tal:attributes="href python:here.getLink(param='tocPN',val=pn+1)">></a> - </span> - </div> - <div tal:content="structure python:here.getTocPage(mode='text',pageinfo=pageinfo,docinfo=docinfo)"/> - </tal:block> - </metal:block> -</body> -</html> \ No newline at end of file +<tal:block tal:define="docinfo options/docinfo; pageinfo options/pageinfo; + pn python:int(pageinfo['tocPN']); tocsize python:int(docinfo['tocSize_text']); grpsize python:int(pageinfo['tocPageSize']); + maxpn python:int(tocsize/grpsize);"> + <div class="thumbruler"> + <span tal:condition="python:(pn>1)"> + <a tal:attributes="href python:here.getLink(param='tocPN',val=pn-1)"><</a> + </span> + <span tal:content="string:$pn of $tocsize"/> + <span> + <a tal:attributes="href python:here.getLink(param='tocPN',val=pn+1)">></a> + </span> +</div> + <div tal:content="structure python:here.getTocPage(mode='text',pageinfo=pageinfo,docinfo=docinfo)"/> +</tal:block> diff -r cb0978becec4 -r 027134cca83e zpt/toc_thumbs.zpt --- a/zpt/toc_thumbs.zpt Tue May 25 12:03:55 2010 +0200 +++ b/zpt/toc_thumbs.zpt Tue May 25 16:36:24 2010 +0200 @@ -1,13 +1,5 @@ -<!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> -  - <metal:block metal:define-macro="main"> - <div tal:define="start pageinfo/start; end pageinfo/end; rows pageinfo/rows; cols pageinfo/cols; +<div tal:define="docinfo options/docinfo; pageinfo options/pageinfo; + start pageinfo/start; end pageinfo/end; rows pageinfo/rows; cols pageinfo/cols; current pageinfo/current; grpsize pageinfo/groupsize"> <div class="thumbruler"> @@ -37,6 +29,3 @@ </tr> </table> </div> - </metal:block> -</body> -</html> \ No newline at end of file diff -r cb0978becec4 -r 027134cca83e zpt/viewer_main.zpt --- a/zpt/viewer_main.zpt Tue May 25 12:03:55 2010 +0200 +++ b/zpt/viewer_main.zpt Tue May 25 16:36:24 2010 +0200 @@ -1,30 +1,28 @@ <!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" - tal:define="docinfo options/docinfo; pageinfo options/pageinfo; viewMode pageinfo/viewMode; tocMode pageinfo/tocMode; - body_onload nothing"> + tal:define="docinfo options/docinfo; pageinfo options/pageinfo; viewMode pageinfo/viewMode; tocMode pageinfo/tocMode"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="stylesheet" href="template/docuviewer_css" type="text/css"> - <metal:block metal:use-macro="python:path('here/template/page_main_%s/macros/head'%viewMode)"/> </head> -<body tal:condition="docinfo/numPages" tal:attributes="onload body_onload"> - <metal:block metal:use-macro="here/template/head_main/macros/main"/> - <tal:block tal:condition="python:here.isAccessible(docinfo)"> - <table border="0" width="100%" height="100%"> - <tr> - <td width="300px" valign="top"> - <metal:block metal:use-macro="python:path('here/template/toc_%s/macros/main'%tocMode)"/> - </td> - <td width="100%" valign="top"> - <metal:block metal:use-macro="python:path('here/template/page_main_%s/macros/main'%viewMode)"/> - </td> - </tr> - </table> - </tal:block> - <tal:block tal:condition="not:python:here.isAccessible(docinfo)"> - <div class="errortext">Sorry, access to this document is restricted.</div> - </tal:block> +<body tal:condition="docinfo/numPages"> +<div tal:replace="structure python:here.template.head_main(docinfo=docinfo,viewMode=viewMode,pageinfo=pageinfo)"/> +<tal:block tal:condition="python:here.isAccessible(docinfo)"> +<table border="0" width="100%" height="100%"> + <tr> + <td width="300px" valign="top"> + <tal:block tal:replace="structure python:getattr(here.template, 'toc_%s'%tocMode)(docinfo=docinfo,pageinfo=pageinfo)"/> + </td> + <td width="100%" valign="top"> + <tal:block tal:content="structure python:getattr(here.template, 'page_main_%s'%viewMode)(docinfo=docinfo,pageinfo=pageinfo,mk=options['mk'])"/> + </td> + </tr> +</table> +</tal:block> +<tal:block tal:condition="not:python:here.isAccessible(docinfo)"> +<div class="errortext">Sorry, access to this document is restricted.</div> +</tal:block> </body> <body tal:condition="not:docinfo/numPages"> <div class="errortext">Sorry, document doesn't exist.</div>