From b25c3d8b670b636256eb80e8f0878bc830d6fa1a Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Mon, 23 Sep 2013 14:40:31 -0400
Subject: [PATCH] closes #324

---
 public/src/app.js           |  8 ++++++--
 public/src/forum/footer.js  |  4 ++++
 public/src/forum/search.js  |  7 +++++++
 public/src/forum/users.js   |  8 +++++---
 public/templates/header.tpl |  4 ++--
 public/templates/search.tpl | 10 ++++++++++
 src/webserver.js            |  4 ++++
 7 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/public/src/app.js b/public/src/app.js
index 63a57bde7b..f3201af211 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -286,6 +286,8 @@ var socket,
 
 		$('span.timeago').timeago();
 
+
+
 		setTimeout(function() {
 			window.scrollTo(0, 1); // rehide address bar on mobile after page load completes.
 		}, 100);
@@ -432,12 +434,14 @@ var socket,
 			ajaxify.go("search/" + input.val(), null, "search");
 			input.val('');
 			return false;
-		})
+		});
+
+
+
 	});
 
 	showWelcomeMessage = location.href.indexOf('loggedin') !== -1;
 
 	loadConfig();
 
-
 }());
\ No newline at end of file
diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index 876880f05f..27a706d974 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -94,6 +94,10 @@
 			right_menu.appendChild(registerEl);
 			right_menu.appendChild(loginEl);
 		}
+
+		$('#main-nav a,#right-menu a').on('click', function() {
+			$('.navbar-header button').click();
+		});
 	});
 
 	// Notifications dropdown
diff --git a/public/src/forum/search.js b/public/src/forum/search.js
index 5044a9be76..f7238ef8c3 100644
--- a/public/src/forum/search.js
+++ b/public/src/forum/search.js
@@ -12,6 +12,13 @@
 
 
 		$('#search-form input').val(searchQuery);
+
+		$('#mobile-search-form').off('submit').on('submit', function() {
+			var input = $(this).find('input');
+			ajaxify.go("search/" + input.val(), null, "search");
+			input.val('');
+			return false;
+		});
 	});
 
 })();
\ No newline at end of file
diff --git a/public/src/forum/users.js b/public/src/forum/users.js
index 37b73d3b34..ce2f4f7a41 100644
--- a/public/src/forum/users.js
+++ b/public/src/forum/users.js
@@ -75,8 +75,10 @@
 		});
 
 		socket.on('api:user.isOnline', function(data) {
-			$('#users-container').empty();
-			startLoading('users:online', 0);
+			if(active == 'online') {
+				$('#users-container').empty();
+				startLoading('users:online', 0);
+			}
 		});
 
 		function onUsersLoaded(users) {
@@ -99,12 +101,12 @@
 			}
 
 			if (set) {
-				loadingMoreUsers = true;
 				startLoading(set, $('#users-container').children().length);
 			}
 		}
 
 		function startLoading(set, after) {
+			loadingMoreUsers = true;
 			socket.emit('api:users.loadMore', {
 				set: set,
 				after: after
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 0efb66394d..f7f6b41822 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -54,9 +54,9 @@
 					<li>
 						<a href="/users">Users</a>
 					</li>
-					<!--Enable when /search form is completed <li class="visible-xs">
+					<li class="visible-xs">
 						<a href="/search">Search</a>
-					</li>-->
+					</li>
 					<li>
 						<a href="/"></a>
 					</li>
diff --git a/public/templates/search.tpl b/public/templates/search.tpl
index 993f32c484..3aae132913 100644
--- a/public/templates/search.tpl
+++ b/public/templates/search.tpl
@@ -3,6 +3,16 @@
 	<li class="active">Search</li>
 </ol>
 
+
+<form id="mobile-search-form" class="navbar-form navbar-right visible-xs" role="search" method="GET" action="">
+	<div class="" id="search-fields">
+		<div class="form-group">
+			<input type="text" class="form-control" placeholder="Search" name="query" value="">
+		</div>
+		<button type="submit" class="btn btn-default hide">Search</button>
+	</div>
+</form>
+
 <div class="category search">
 	<div class="">
 		<ul id="topics-container" data-search-query="{search_query}">
diff --git a/src/webserver.js b/src/webserver.js
index 3e46fa3147..ed6117442f 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -481,6 +481,8 @@ var express = require('express'),
 		});
 
 		app.get('/search', function (req, res) {
+			if (!req.user)
+				return res.redirect('/403');
 			app.build_header({
 				req: req,
 				res: res
@@ -490,6 +492,8 @@ var express = require('express'),
 		});
 
 		app.get('/search/:term', function (req, res) {
+			if (!req.user)
+				return res.redirect('/403');
 			app.build_header({
 				req: req,
 				res: res