From 902e60fab28d8279562df8e6ab8396fb6dd707e7 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 28 Aug 2013 13:53:20 -0400
Subject: [PATCH 1/2] added password settings to admin

---
 public/templates/admin/settings.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl
index 1d3bc5311a..5d5541cec4 100644
--- a/public/templates/admin/settings.tpl
+++ b/public/templates/admin/settings.tpl
@@ -55,6 +55,8 @@
 	<div class="alert alert-notify">
 		<strong>Minimum Username Length</strong><br /> <input type="text" class="" value="2" data-field="minimumUsernameLength"><br />
 		<strong>Maximum Username Length</strong><br /> <input type="text" class="" value="16" data-field="maximumUsernameLength"><br />
+		<strong>Minimum Password Length</strong><br /> <input type="text" class="" value="6" data-field="minimumPasswordLength"><br />
+		<strong>Maximum Password Length</strong><br /> <input type="text" class="" value="16" data-field="maximumPasswordLength"><br />
 	</div>
 </form>
 

From 0db599a47879fc02a64f73442890c31849c234ac Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 28 Aug 2013 14:46:18 -0400
Subject: [PATCH 2/2] closes #205

---
 public/templates/search.tpl |  9 ++++-----
 src/routes/api.js           | 11 +++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/templates/search.tpl b/public/templates/search.tpl
index 7dec88da87..b7408291d2 100644
--- a/public/templates/search.tpl
+++ b/public/templates/search.tpl
@@ -5,14 +5,11 @@
 	</ul>
 </div>
 
-
-<div class="alert alert-warning {show_no_results}" id="no-search-results">
-	<strong>No search results for {search_query}.</strong>
-</div>
-
 <div class="category row">
 	<div class="span12">
 		<ul id="topics-container" data-search-query="{search_query}">
+		<h3>Topics</h3>
+		<div class="alert alert-info {show_no_topics}">No topics found!</div>
 		<!-- BEGIN topics -->
 		<a href="../../topic/{topics.slug}" id="tid-{topics.tid}">
 			<li class="category-item">
@@ -28,6 +25,8 @@
 			</li>
 		</a>
 		<!-- END topics -->
+		<h3>Posts</h3>
+		<div class="alert alert-info {show_no_posts}">No posts found!</div>
 		<!-- BEGIN posts -->
 		<a href="../../topic/{posts.topicSlug}#{posts.pid}" id="tid-{posts.tid}">
 			<li class="category-item">
diff --git a/src/routes/api.js b/src/routes/api.js
index 88cc74495b..739b6a7e6f 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -183,9 +183,11 @@ var user = require('./../user.js'),
 
 		app.get('/api/search', function(req, res) {
 			return res.json({
-				show_no_results:'hide',
+				show_no_topics:'hide',
+				show_no_posts:'hide',
 				search_query:'',
-				posts:[]
+				posts:[],
+				topics:[]
 			});
 		});
 
@@ -228,9 +230,10 @@ var user = require('./../user.js'),
 			async.parallel([searchPosts, searchTopics], function(err, results) {
 				if (err)
 					return next();
-				var noresults = !results[0].length && !results[1].length;
+
 				return res.json({
-					show_no_results: noresults?'show':'hide',
+					show_no_topics: results[1].length? 'hide':'',
+					show_no_posts: results[0].length? 'hide':'',
 					search_query:req.params.term,
 					posts:results[0],
 					topics:results[1]