add site search, highlighting

3 files changed, 11 insertions, 3 deletions

diff --git a/data/templates/search.htm b/data/templates/search.htm
index 8eb077b..4f3a252 100644
--- a/data/templates/search.htm
+++ b/data/templates/search.htm
@@ -12,7 +12,8 @@
       </li>
      </ul>
      <form class="navbar-form pull-left">
-      <input type="text" name="q" placeholder="Search" value="{{query}}"/>
+      <input type="text" name="q" placeholder="Search"
+             value="{{query}}" class="input-xxlarge"/>
       <button type="submit" class="btn">Find</button>
      </form>
     </div>
diff --git a/data/templates/search/hit.htm b/data/templates/search/hit.htm
index 4981017..dababcb 100644
--- a/data/templates/search/hit.htm
+++ b/data/templates/search/hit.htm
@@ -1,7 +1,7 @@
 {% set doc = hit._source %}
 <li class="hit">
  <span class="title">
-  <a href="{{doc.url}}">{{doc.title}}</a>
+  <a href="{{doc.url}}">{{doc.htmlTitle|raw}}</a>
   {% if doc.author.name %}
   by
   <em>
@@ -19,5 +19,6 @@
   {% if doc.modate %}
   <span class="date">{{doc.extra.day|date("Y-m-d")}}</span>
   {% endif %}
+  {{doc.htmlText|raw}}
  </span>
 </li>
diff --git a/data/templates/search/list.htm b/data/templates/search/list.htm
index ef8d454..97584d6 100644
--- a/data/templates/search/list.htm
+++ b/data/templates/search/list.htm
@@ -4,7 +4,13 @@
  </p>
 {% else %}
  <p>
-  Found {{hitcount}} search results for "<tt>{{query}}</tt>" in {{queryTime}}:
+  Found {{hitcount}} search
+  {% if hitcount == 1 %}result{% else %}results{%endif%}
+  for "<tt>{{cleanQuery}}</tt>"
+  {% if site %}
+  on <tt>{{site}}</tt>
+  {% endif %}
+  in {{queryTime}}:
  </p>
  <ul class="hits">
  {% for hit in hits %}