diff zpt/viewer_index.zpt @ 543:6cdc31e9ed8e

fixed problem with dict-mode in default view. added configurable footer and logo in site_template.pt
author casties
date Wed, 22 Aug 2012 16:25:38 +0200
parents dbaa7dce60a5
children a35ec08c782d
line wrap: on
line diff
--- a/zpt/viewer_index.zpt	Tue Aug 21 13:28:35 2012 +0200
+++ b/zpt/viewer_index.zpt	Wed Aug 22 16:25:38 2012 +0200
@@ -127,12 +127,11 @@
         (copyright and license see below)
       </div>
 
-      <div class="options">
+      <div class="options" tal:condition="docpath">
         <h4>Search</h4>
         <form tal:define="queryType string:fulltextMorph" tal:condition="docpath" tal:attributes="action viewerUrl">
-          <input type="hidden" tal:define="params python:here.getParams(params={'query':None,'queryType':None,'viewMode':None,'viewLayer':None})"
-            tal:repeat="param params" tal:attributes="name param; value python:params[param]" /> <input type="hidden"
-            name="viewLayer" value="search" />
+          <input type="hidden" tal:define="params python:here.getParams(params={'query':None,'queryType':None,'viewMode':None,'viewLayer':'search'})"
+            tal:repeat="param params" tal:attributes="name param; value python:params[param]" />
           <!-- query text -->
           <input type="text" name="query" tal:attributes="value query" /> <br /> <input type="submit" value="Search" /> <a
             tal:condition="query" tal:attributes="href python:here.getLink('query',None)">Clear</a>
@@ -149,23 +148,19 @@
         </form>
       </div>
       <!-- end search options-->
-      <!--BEGIN search
-          <form tal:define="queryType string:fulltextMorph" tal:condition="docpath" tal:attributes="action python:here.getLink()">
-            <input type="hidden" tal:define="params python:here.getParams('viewMode', None)" tal:repeat="param params"
-              tal:attributes="name param; value python:params[param]" /> <input type="hidden" name="viewLayer" value="search" />
-            <input type="text" name="query" tal:attributes="value query" /> <input type="submit" value="Search full document" /> <a
-              tal:condition="query" tal:attributes="href python:here.getLink('query',None)">Clear</a><br /> <input type="radio"
-              name="queryType" value="fulltext" tal:attributes="checked python:queryType=='fulltext'" /> Exact <input type="radio"
-              name="queryType" value="fulltextMorph" tal:attributes="checked python:queryType=='fulltextMorph'" /> All forms <input
-              type="radio" name="queryType" value="ftIndex" tal:attributes="checked python:queryType=='ftIndex'" /> Fulltext index
-            <input type="radio" name="queryType" value="ftIndexMorph" tal:attributes="checked python:queryType=='ftIndexMorph'" />
-            Morphological index
-          </form>
-          END search-->
     </div>
   </div>
+  <tal:block tal:condition="exists:here/template/site_template.pt/macros/footer">
+    <!-- footer -->
+    <metal:block metal:use-macro="here/template/site_template.pt/macros/footer"/>
+  </tal:block>
+  
 </body>
 <body tal:condition="not:numPages">
   <div class="errortext">Sorry, document doesn't exist.</div>
+  <tal:block tal:condition="exists:here/template/site_template.pt/macros/footer">
+    <!-- footer -->
+    <metal:block metal:use-macro="here/template/site_template.pt/macros/footer"/>
+  </tal:block>
 </body>
 </html>
\ No newline at end of file