Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'

cps/templates/search.html

@@ -2,10 +2,10 @@
 {% block body %}
 <div class="discover">
     {% if entries|length < 1 %}
-      <h2>{{_('No Results Found')}} {{searchterm}}</h2>
-      <p>{{_('Search Term:')}} {{searchterm}}</p>
+      <h2>{{_('No Results Found')}} {{adv_searchterm}}</h2>
+      <p>{{_('Search Term:')}} {{adv_searchterm}}</p>
     {% else %}
-      <h2>{{entries|length}} {{_('Results for:')}} {{searchterm}}</h2>
+      <h2>{{entries|length}} {{_('Results for:')}} {{adv_searchterm}}</h2>
       {% if g.user.is_authenticated %}
         {% if g.user.shelf.all() or g.shelves_access %}
           <div id="shelf-actions" class="btn-toolbar" role="toolbar">