Show site search reset link

diff --git a/data/templates/search/list.htm b/data/templates/search/list.htm
index 97584d6cbe6d739128a682917f891864ab97cebf..46bf4bae8655f0449191927f88b332c0919c46aa 100644 (file)
--- a/data/templates/search/list.htm
+++ b/data/templates/search/list.htm
@@ -3,14 +3,15 @@
   Sorry, no results for "<tt>{{query}}</tt>".
  </p>
 {% else %}
- <p>
-  Found {{hitcount}} search
+ <p class="resultinfo">
+  {{hitcount}} results
   {% if hitcount == 1 %}result{% else %}results{%endif%}
-  for "<tt>{{cleanQuery}}</tt>"
+  for "<strong><tt>{{cleanQuery}}</tt></strong>"
   {% if site %}
-  on <tt>{{site}}</tt>
+  on <strong><tt>{{site}}</tt></strong>
+  &#160;&#160;&#160;|&#160;&#160;&#160;
+  <a href="{{urlNoSite}}">Show all results</a>
   {% endif %}
-  in {{queryTime}}:
  </p>
  <ul class="hits">
  {% for hit in hits %}

diff --git a/www/css/phinde.css b/www/css/phinde.css
index 6d9ad20014e3c3740883b60cd21c56f71020627f..a25aa31c5eab83704d9da76d8011542e37b46fad 100644 (file)
--- a/www/css/phinde.css
+++ b/www/css/phinde.css
@@ -27,4 +27,8 @@
 }
 .hit em.hl {
     font-weight: bold;
+}
+.resultinfo {
+    margin-top: 1ex;
+    margin-bottom: 2ex;
 }
\ No newline at end of file

diff --git a/www/index.php b/www/index.php
index 12befbc28b6e942c3e1b2ca660c95624cdfe99de..0412f8284c947863cc465d22592ca323ac486470 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -59,8 +59,10 @@ if (preg_match('#site:([^ ]*)#', $query, $matches)) {
     $site = $matches[1];
     $cleanQuery = trim(str_replace('site:' . $site, '', $query));
     $site = Helper::noSchema($site);
+    $urlNoSite = buildLink('?q=' . urlencode($cleanQuery), $filters, null, null);
 } else {
     $cleanQuery = $query;
+    $urlNoSite = null;
 }
 
 $timeBegin = microtime(true);
@@ -108,6 +110,7 @@ render(
         'queryTime' => round($timeEnd - $timeBegin, 2) . 'ms',
         'query' => $query,
         'cleanQuery' => $cleanQuery,
+        'urlNoSite' => $urlNoSite,
         'site' => $site,
         'hitcount' => $res->hits->total,
         'hits' => $res->hits->hits,