2 files changed, 12 insertions, 3 deletions
diff --git a/data/templates/search.htm b/data/templates/search.htm
index 4f3a252..d703784 100644
--- a/data/templates/search.htm
+++ b/data/templates/search.htm
@@ -14,6 +14,9 @@
      <form class="navbar-form pull-left">
       <input type="text" name="q" placeholder="Search"
              value="{{query}}" class="input-xxlarge"/>
+      {% if siteParam %}
+      <input type="hidden" name="site" value="{{site}}"/>
+      {% endif %}
       <button type="submit" class="btn">Find</button>
      </form>
     </div>
diff --git a/data/templates/search/list.htm b/data/templates/search/list.htm
index 46bf4ba..069dcf3 100644
--- a/data/templates/search/list.htm
+++ b/data/templates/search/list.htm
@@ -1,10 +1,16 @@
 {% if hitcount == 0 %}
  <p>
-  Sorry, no results for "<tt>{{query}}</tt>".
+  No results
+  for "<strong><tt>{{cleanQuery}}</tt></strong>"
+  {% if site %}
+  on <strong><tt>{{site}}</tt></strong>
+  &#160;&#160;&#160;|&#160;&#160;&#160;
+  <a href="{{urlNoSite}}">Show all results</a>
+  {% endif %}
  </p>
 {% else %}
- <p class="resultinfo">
-  {{hitcount}} results
+<p class="resultinfo">
+  {{hitcount}}
   {% if hitcount == 1 %}result{% else %}results{%endif%}
   for "<strong><tt>{{cleanQuery}}</tt></strong>"
   {% if site %}