closes #657

public/templates/search.tpl

@@ -15,12 +15,18 @@
 
 <div class="category search">
 	<div class="{show_results}">
-		<ul id="topics-container" data-search-query="{search_query}">
 		<h3>[[topic:topics]]</h3>
+
+		<!-- IF topic_matches -->
+		<small>{topic_matches} result(s) matching "{search_query}"</small>
+		<!-- ENDIF topic_matches -->
 		<div class="alert alert-info {show_no_topics}">[[topic:no_topics_found]]</div>
+
+		<ul id="topics-container" data-search-query="{search_query}">
+
 			<!-- BEGIN topics -->
-		<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
 			<li class="category-item">
+				<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
 					<div>
 						<div class="col-md-12 img-thumbnail">
 							<div class="search-result-post">
@@ -30,14 +36,21 @@
 
 						</div>
 					</div>
-			</li>
 				</a>
+			</li>
 			<!-- END topics -->
+		</ul>
+
 		<h3>Posts</h3>
+		<!-- IF post_matches -->
+		<small>{post_matches} result(s) matching "{search_query}"</small>
+		<!-- ENDIF post_matches -->
 		<div class="alert alert-info {show_no_posts}">No posts found!</div>
+
+		<ul id="topics-container" data-search-query="{search_query}">
 			<!-- BEGIN posts -->
-		<a href="../../topic/{posts.topicSlug}#{posts.pid}" id="tid-{posts.tid}">
 			<li class="category-item">
+				<a href="../../topic/{posts.topicSlug}#{posts.pid}" id="tid-{posts.tid}">
 					<div>
 						<div class="col-md-12 img-thumbnail">
 							<div class="search-result-post">
@@ -47,8 +60,8 @@
 
 						</div>
 					</div>
-			</li>
 				</a>
+			</li>
 			<!-- END posts -->
 		</ul>
 	</div>

src/routes/api.js

@@ -270,7 +270,9 @@ var path = require('path'),
 							show_results: '',
 							search_query: req.params.term,
 							posts: results[0],
-							topics: results[1]
+							topics: results[1],
+							post_matches : results[0].length,
+							topic_matches : results[1].length
 						});
 					});
 				} else {