Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/search/www/search.adp	14 Jul 2015 22:36:41 -0000	1.18
+++ openacs-4/packages/search/www/search.adp	7 Aug 2017 23:48:29 -0000	1.19
@@ -2,7 +2,7 @@
 <property name="context">@context;literal@</property>
 <property name="doc(title)">@page_title;literal@</property>
 
-<if @and_queries_notice_p@ eq 1>
+<if @and_queries_notice_p;literal@ true>
   <font color="6f6f6f">
     #search.The#
     [<a href="help/basics#and">#search.details#</a>]<br>
@@ -16,14 +16,13 @@
 </if>
 <if @nstopwords@ gt 1>
   <font color="6f6f6f">
-    #search.lt_The_following_words_a# <b>@stopwords@</b>.
+    #search.lt_The_following_words_a# <strong>@stopwords@</strong>.
     [<a href="help/basics#stopwords">#search.details#</a>]<br>
   </font>
 </if>
 
 <if @count@ eq 0>
-  Your search - <b>@query@</b> - did not match any content.
-  <br>#search.lt_No_pages_were_found_c#<b>@query@</b>".
+  #search.lt_No_pages_were_found_c#<strong>@query@</strong>".
   <br><br>#search.Suggestions#
   <ul>
     <li>#search.lt_Make_sure_all_words_a#
@@ -38,7 +37,7 @@
   <div id="search-info">
     <p class="subtitle">#search.Searched_for_query#</p>
     <p class="times">
-      #search.Results# <strong>@low@-@high@</strong> #search.of_about# <strong>@count@</strong>#search.________Search_took# <strong>@elapsed@</strong> #search.seconds# 
+      #search.Results# <strong>@low@-@high@</strong> #search.of_about# <strong>@result.count@</strong>#search.________Search_took# <strong>@elapsed@</strong> #search.seconds# 
     </p>
   </div>
   <div id="search-results">
@@ -47,10 +46,10 @@
         <li>
           <a href="@searchresult.url_one@" class="result-title">
             <if @searchresult.title_summary@ nil>#search.Untitled#</if>	
-            <else>@searchresult.title_summary;noquote@</else>
+            <else>@searchresult.title_summary;literal@</else>
           </a>
           <if @searchresult.txt_summary@ not nil>	
-            <div class="result-text">@searchresult.txt_summary;noquote@</div>
+            <div class="result-text">@searchresult.txt_summary;literal@</div>
           </if>
           <div class="result-url">@searchresult.url_one@</div>
         </li>
@@ -59,7 +58,7 @@
   </div>
 </else>
 
-<include src="/packages/search/lib/navbar" &="urlencoded_query"
+<include src="/packages/search/lib/navbar" &="q"
     paginator_class="list-paginator-bottom" count="@result.count;literal@" &="low" &="high"
     &="offset" &="num" &="search_package_id">
 
@@ -68,11 +67,12 @@
     <form method="get" action="search">
       <div>
 	<input type="text" name="q" size="60" maxlength="256" value="@query@">
+         <if @::__csrf_token@ defined><input type="hidden" name="__csrf_token" value="@::__csrf_token;literal@"></if>
 	<input type="submit" value="#search.Search#">
       </div>
     </form>
     <if @t@ eq "Search">
-      <i>#search.lt_Tip_In_most_browsers_#</i>
+      <em>#search.lt_Tip_In_most_browsers_#</em>
     </if>
   </div>
 
@@ -81,7 +81,7 @@
   </if>
 </if>
 
-<if @and_queries_notice_p@ eq 1>
+<if @and_queries_notice_p;literal@ true>
   <p class="hint">#search.and_not_needed# [<a href="help/basics#and">#search.details#</a>]</p>
 </if>
 <if @nstopwords@ eq 1>
@@ -91,7 +91,7 @@
   <p class="hint">#search.lt_The_following_words_a# [<a href="help/basics#stopwords">#search.details#</a>]</p>
 </if>
 
-<if @debug_p@>
+<if @debug_p;literal@ true>
   <p>#search.Searched_for_query#</p>
   <p>#search.Results_count#</p>
 </if>