Mercurial > hg > documentViewer
diff zpt/viewer_text.zpt @ 510:4fb35343d2e7 elementtree
more search. nicer css.
| author | casties |
|---|---|
| date | Tue, 28 Feb 2012 10:39:21 +0100 |
| parents | 9d05befdd462 |
| children | 551ca1641a5e |
line wrap: on
line diff
--- a/zpt/viewer_text.zpt Mon Feb 27 21:57:18 2012 +0100 +++ b/zpt/viewer_text.zpt Tue Feb 28 10:39:21 2012 +0100 @@ -38,13 +38,13 @@ </div> <div class="page-body" tal:condition="python:here.isAccessible(docinfo)"> <!--table of contents--> - <div class="col-left"> + <div class="col toc"> <metal:block metal:use-macro="python:path('here/template/toc_%s/macros/main'%tocMode)" /> </div> <!-- text page --> - <div class="col-main"> + <div class="col main"> <div class="ruler"> <metal:block metal:use-macro="here/template/common_template/macros/page_ruler" /> </div> @@ -62,13 +62,20 @@ </div> <!-- end of col-main --> + <!-- right-side search results --> + <div class="col search" tal:condition="query"> + <!--"BEGIN SEARCH RESULTS" --> + <div class="options"> + <h4>Search results</h4> + <div tal:content="structure python:here.getResultsPage(mode=queryType,query=query,pn=1,pageinfo=pageinfo,docinfo=docinfo)"/> + </div> + </div> + <!-- right-side options --> - <div class="col-right"> + <div class="col buttons"> <!--"BEGIN TEXT DISPLAY" --> <div class="options"> <h4>Text display</h4> - <pre tal:content="python:repr(viewLayers)" /> - <pre tal:content="python:repr(viewLayer)" /> <form tal:attributes="action viewerUrl" class="autosubmit"> <input type="hidden" tal:define="params python:here.getParams(params={'viewLayer':None,'viewMode':None})" @@ -229,15 +236,6 @@ </div> <!-- /col-right --> - <!-- right-side options --> - <div class="col-veryright" tal:condition="query"> - <!--"BEGIN SEARCH RESULTS" --> - <div class="options"> - <h4>Search results</h4> - <div tal:content="structure python:here.getResultsPage(mode=queryType,query=query,pn=1,pageinfo=pageinfo,docinfo=docinfo)"/> - </div> - </div> - </div> <!-- /page-body -->