Changeset 540:4b43a57ad9b3 in documentViewer for zpt/layer_text_search.zpt

Timestamp:

Aug 16, 2012, 5:09:49 PM (12 years ago)

Author:

casties

Branch:

default

Message:

more nicer

File:

• zpt/layer_text_search.zpt (modified) (6 diffs)

zpt/layer_text_search.zpt

@@ -17 +17 @@
       <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>
+          tal:attributes="checked python:'search' in viewLayers" /> Search results</li>
       </metal:block>
     </ul>
@@ -25 +25 @@
     <!-- right-side search results -->
     <div class="col results" tal:condition="query">
-      <!--"BEGIN SEARCH RESULTS"  -->
-      <div class="options">
+      <div class="result">
         <h4>Search results</h4>
         <div
@@ -33 +32 @@
           <div class="ruler" tal:define="startParam string:resultStart">
             <metal:block metal:use-macro="here/template/common_template/macros/toc_ruler" />
+          </div>
+          <div class="query">
+            Searching "<span tal:content="query" />" (<span tal:content="queryType" />)
           </div>
           <div class="content"
@@ -42 +44 @@
 
   <metal:block metal:define-macro="options_box">
-    <!--"BEGIN SEARCH"-->
+    <!-- search options -->
     <div class="options">
       <h4>Search</h4>
@@ -55 +57 @@
         <!-- query text -->
         <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>
+          tal:condition="query" 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'" />
@@ -68 +70 @@
       </form>
     </div>
-    <!--"END SEARCH"-->
+    <!-- end search options-->
   </metal:block>