[zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - search.pt:1.3

Wed Aug 6 14:35:36 EDT 2003

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv27960

Modified Files:
	search.pt 
Log Message:
Changes from Andrew to fix reviewing.


=== Products/ZopeOrg-NV/skins/nzo/search.pt 1.2 => 1.3 ===
       metal:use-macro="here/main_template/macros/master">
 <body>
 <div metal:fill-slot="main"
-     tal:define="global results python:request.get('SearchableText') and here.doFormSearch( REQUEST=request ) or [];
-                 global pss modules/Products.PythonScripts.standard">
+     tal:define="global results  python:(request.get('SearchableText', None) or request.get('review_state', None)) and here.doFormSearch( REQUEST=request ) or [];
+                 global pss modules/Products.PythonScripts.standard;
+                 global SearchableText request/SearchableText|nothing">
 
-<div class="searchNav">
+<div class="searchNav" tal:condition="SearchableText">
     <form method="get" action="#"
           tal:attributes="action string: ${portal_url}/search">
 
         You searched for:
         <input type="text" name="SearchableText" size="25"
                value="Type your search here ..." 
-               tal:attributes="value request/SearchableText" />
+               tal:attributes="value SearchableText" />
         <input type="submit" name="Submit" value="Search Zope.org" />
    </form>
 
@@ -29,9 +30,10 @@
 Results 1-10 of <span 
      tal:replace="python:pss.thousands_commas(len(results))">290</span>.
 </span>
-
+<span tal:condition="SearchableText">
 Searching Zope.org for <strong
-      tal:content="request/SearchableText">search term</strong>
+      tal:content="SearchableText">search term</strong>
+</span>
 
 </div>
 
@@ -162,7 +164,7 @@
 
 <!--- End Result Page Batches --->
 
-<div class="searchNav">
+<div class="searchNav" tal:condition="SearchableText">
 
     <form method="get" action="#"
           tal:attributes="action string: ${portal_url}/search">
@@ -170,7 +172,7 @@
         You searched for:
         <input type="text" name="SearchableText" size="25"
                value="Type your search here ..." 
-               tal:attributes="value request/SearchableText" />
+               tal:attributes="value SearchableText" />
         <input type="submit" name="Submit" value="Search Zope.org" />
    </form>
 



