From: Christian Weiske
Date: Thu, 4 Feb 2016 16:10:49 +0000 (+0100)
Subject: Show site search reset link
X-Git-Tag: v0.1.0~20
X-Git-Url: https://git.cweiske.de/phinde.git/commitdiff_plain/dda0b5ec6258b94fdd6cdec81eccba3f2b9513a0?hp=ae2d3a27072b157a9c3df2ba1e8101d6d3a70d4f
Show site search reset link
---
diff --git a/data/templates/search/list.htm b/data/templates/search/list.htm
index 97584d6..46bf4ba 100644
--- a/data/templates/search/list.htm
+++ b/data/templates/search/list.htm
@@ -3,14 +3,15 @@
Sorry, no results for "{{query}}".
{% else %}
-
- Found {{hitcount}} search
+
+ {{hitcount}} results
{% if hitcount == 1 %}result{% else %}results{%endif%}
- for "{{cleanQuery}}"
+ for "{{cleanQuery}}"
{% if site %}
- on {{site}}
+ on {{site}}
+ |
+ Show all results
{% endif %}
- in {{queryTime}}:
{% for hit in hits %}
diff --git a/www/css/phinde.css b/www/css/phinde.css
index 6d9ad20..a25aa31 100644
--- 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 12befbc..0412f82 100644
--- 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,