--- a/zpt/layer_text_search.zpt	Thu Jul 05 12:08:58 2012 +0200
+++ b/zpt/layer_text_search.zpt	Wed Jul 25 21:28:31 2012 +0200
@@ -15,10 +15,8 @@
     <!-- LAYER DISPLAY OPTION  -->
     <ul>
       <metal:block metal:define-macro="layer_select_li">
-        <li tal:condition="python:query">
-          <input type="checkbox" class="autosubmit" name="viewLayer" value="search"
-            tal:attributes="checked python:'search' in viewLayers" /> Search hits
-        </li>
+        <li tal:condition="python:query"><input type="checkbox" class="autosubmit" name="viewLayer" value="search"
+          tal:attributes="checked python:'search' in viewLayers" /> Search hits</li>
       </metal:block>
     </ul>
   </div>
@@ -47,38 +45,25 @@
     <div class="options">
       <h4>Search</h4>
       <form tal:attributes="action viewerUrl">
-        <input type="hidden"
-          tal:define="params python:here.getParams(params={'query':None,'queryType':None,'viewLayer':None})"
-          tal:repeat="param params"
-          tal:attributes="name param; value python:params[param]" />
+        <input type="hidden" tal:define="params python:here.getParams(params={'query':None,'queryType':None,'viewLayer':None})"
+          tal:repeat="param params" tal:attributes="name param; value python:params[param]" />
         <!-- make sure we have one viewLayer=search -->
         <tal:block tal:repeat="vl viewLayers">
-          <input type="hidden" name="viewLayer" tal:attributes="value vl"
-            tal:condition="python:vl != 'search'" />
+          <input type="hidden" name="viewLayer" tal:attributes="value vl" tal:condition="python:vl != 'search'" />
         </tal:block>
         <input type="hidden" name="viewLayer" value="search" />
         <!-- query text -->
-        <input type="text" name="query" tal:attributes="value query" /> <input
-          type="submit" value="Search" /> <a
+        <input type="text" name="query" tal:attributes="value query" /> <br /> <input type="submit" value="Search" /> <a
           tal:attributes="href python:here.getLink('query',None)">Clear</a>
         <ul>
-          <li>
-            <input type="radio" name="queryType" value="fulltext"
-              tal:attributes="checked python:queryType=='fulltext'" /> Exact
-          </li>
-          <li>
-            <input type="radio" name="queryType" value="fulltextMorph"
-              tal:attributes="checked python:queryType=='fulltextMorph'" /> All forms
-          </li>
-          <li>
-            <input type="radio" name="queryType" value="ftIndex"
-              tal:attributes="checked python:queryType=='ftIndex'" /> Fulltext index
-          </li>
-          <li>
-            <input type="radio" name="queryType" value="ftIndexMorph"
-              tal:attributes="checked python:queryType=='ftIndexMorph'" /> Morphological
-            index
-          </li>
+          <li><input type="radio" name="queryType" value="fulltext" tal:attributes="checked python:queryType=='fulltext'" />
+            Exact</li>
+          <li><input type="radio" name="queryType" value="fulltextMorph"
+            tal:attributes="checked python:queryType=='fulltextMorph'" /> All forms</li>
+          <li><input type="radio" name="queryType" value="ftIndex" tal:attributes="checked python:queryType=='ftIndex'" />
+            Fulltext index</li>
+          <li><input type="radio" name="queryType" value="ftIndexMorph"
+            tal:attributes="checked python:queryType=='ftIndexMorph'" /> Morphological index</li>
         </ul>
       </form>
     </div>