--- a/ForgeTracker/forgetracker/templates/search.html
+++ b/ForgeTracker/forgetracker/templates/search.html
@@ -20,10 +20,9 @@
<div class="column grid_12">
<form method="GET" action=".">
<input type="text" name="q" value="$q" class="defaultText" title="Search App"/><br/>
+ Search history? <input type="checkbox" name="history" checked="${history or None}"/><br/>
<input type="submit" value="Search App"/>
- <input type="submit" name="project" value="Search Entire Project"
- /><br/>
- Search history? <input type="checkbox" name="history" checked="${history or None}"/><br/>
+ <input type="submit" name="project" value="Search Entire Project"/><br/>
</form>
<p py:if="q">
<form method="GET" action="../bins/newbin">
@@ -31,6 +30,7 @@
<input type="hidden" name="q" value="$q"/>
</form>
</p>
+ <div style="clear:both"/>
<p py:if="solr_error">${solr_error}</p>
<p py:if="count==0 and q">No results.</p>
<p py:if="count==1 and q">$count result.</p>
@@ -58,7 +58,7 @@
</tr>
</tbody>
</table>
- <p>Showing ${limit} results per page. </p>
+ <p>Showing ${limit} result<py:if test="limit!=1">s</py:if> per page. </p>
<ul class="per_page">
<li py:for="per_page in [25, 50, 100, 250]">
<a href="${tg.url(request.path_info, dict(q=q, limit=per_page))}" py:strip="limit == per_page">${per_page}</a>