From 775734de0f39ad425acc9875021fd0059ca53f33 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 24 Aug 2016 14:47:38 +0300
Subject: [PATCH] user page search changes

---
 templates/account/followers.tpl        |  5 +++--
 templates/account/following.tpl        |  4 +++-
 templates/partials/users_list.tpl      | 16 ++++++++--------
 templates/partials/users_list_menu.tpl | 10 +++++-----
 templates/users.tpl                    |  7 ++-----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/templates/account/followers.tpl b/templates/account/followers.tpl
index 08eec5c..9b5a00c 100644
--- a/templates/account/followers.tpl
+++ b/templates/account/followers.tpl
@@ -3,7 +3,7 @@
 
 	<div class="users row">
 		<h1>[[pages:{template.name}, {username}]]</h1>
-		
+
 		<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
 			<!-- IMPORT partials/users_list.tpl -->
 		</ul>
@@ -11,6 +11,7 @@
 		<!-- IF !users.length -->
 		<div class="alert alert-warning text-center">[[user:has_no_follower]]</div>
 		<!-- ENDIF !users.length -->
-	</div>
 
+		<!-- IMPORT partials/paginator.tpl -->
+	</div>
 </div>
\ No newline at end of file
diff --git a/templates/account/following.tpl b/templates/account/following.tpl
index 6780466..90a8737 100644
--- a/templates/account/following.tpl
+++ b/templates/account/following.tpl
@@ -3,7 +3,7 @@
 
 	<div class="users row">
 		<h1>[[pages:{template.name}, {username}]]</h1>
-		
+
 		<ul id="users-container" class="users-container" data-nextstart="{nextStart}">
 			<!-- IMPORT partials/users_list.tpl -->
 		</ul>
@@ -11,5 +11,7 @@
 		<!-- IF !users.length -->
 		<div class="alert alert-warning text-center">[[user:follows_no_one]]</div>
 		<!-- ENDIF !users.length -->
+
+		<!-- IMPORT partials/paginator.tpl -->
 	</div>
 </div>
\ No newline at end of file
diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl
index 4a73d82..b1dd391 100644
--- a/templates/partials/users_list.tpl
+++ b/templates/partials/users_list.tpl
@@ -15,32 +15,32 @@
 		</span>
 		<br/>
 
-		<!-- IF route_users:joindate -->
+		<!-- IF section_joindate -->
 		<div title="joindate" class="joindate">
 			<span class="timeago" title="{users.joindateISO}"></span>
 		</div>
-		<!-- ENDIF route_users:joindate -->
+		<!-- ENDIF section_joindate -->
 
-		<!-- IF route_users:reputation -->
+		<!-- IF section_sort-reputation -->
 		<div title="reputation" class="reputation">
 			<i class="fa fa-star"></i>
 			<span class="formatted-number">{users.reputation}</span>
 		</div>
-		<!-- ENDIF route_users:reputation -->
+		<!-- ENDIF section_sort-reputation -->
 
-		<!-- IF route_users:postcount -->
+		<!-- IF section_sort-posts -->
 		<div title="post count" class="post-count">
 			<i class="fa fa-pencil"></i>
 			<span class="formatted-number">{users.postcount}</span>
 		</div>
-		<!-- ENDIF route_users:postcount -->
+		<!-- ENDIF section_sort-posts -->
 
-		<!-- IF route_users:flags -->
+		<!-- IF section_flagged -->
 		<div title="flag count" class="flag-count">
 			<i class="fa fa-flag"></i>
 			<span class="formatted-number"><a href="{config.relative_path}/posts/flags?byUsername={users.username}">{users.flags}</a></span>
 		</div>
-		<!-- ENDIF route_users:flags -->
+		<!-- ENDIF section_flagged -->
 	</div>
 </li>
 <!-- END users -->
\ No newline at end of file
diff --git a/templates/partials/users_list_menu.tpl b/templates/partials/users_list_menu.tpl
index 5d4721e..8553c22 100644
--- a/templates/partials/users_list_menu.tpl
+++ b/templates/partials/users_list_menu.tpl
@@ -1,11 +1,11 @@
 <ul class="nav nav-pills">
-	<li><a href="{config.relative_path}/users/online">[[global:online]]</a></li>
-	<li><a href="{config.relative_path}/users/sort-posts">[[users:top_posters]]</a></li>
+	<li><a href="{config.relative_path}/users?section=online">[[global:online]]</a></li>
+	<li><a href="{config.relative_path}/users?section=sort-posts">[[users:top_posters]]</a></li>
 	<!-- IF !reputation:disabled -->
-	<li><a href="{config.relative_path}/users/sort-reputation">[[users:most_reputation]]</a></li>
+	<li><a href="{config.relative_path}/users?section=sort-reputation">[[users:most_reputation]]</a></li>
 	<!-- ENDIF !reputation:disabled -->
 	<!-- IF isAdminOrGlobalMod -->
-	<li><a href="{config.relative_path}/users/flagged">[[users:most_flags]]</a></li>
-	<li><a href="{config.relative_path}/users/banned">[[user:banned]]</a></li>
+	<li><a href="{config.relative_path}/users?section=flagged">[[users:most_flags]]</a></li>
+	<li><a href="{config.relative_path}/users?section=banned">[[user:banned]]</a></li>
 	<!-- ENDIF isAdminOrGlobalMod -->
 </ul>
\ No newline at end of file
diff --git a/templates/users.tpl b/templates/users.tpl
index 935d500..ba9a910 100644
--- a/templates/users.tpl
+++ b/templates/users.tpl
@@ -19,7 +19,7 @@
 				<div class="input-group">
 					<input class="form-control" id="search-user" type="text" placeholder="[[users:enter_username]]"/>
 					<span class="input-group-addon">
-						<i class="fa fa-search"></i>
+						<i component="user/search/icon" class="fa fa-search"></i>
 					</span>
 				</div>
 			</div>
@@ -41,8 +41,5 @@
 		<!-- ENDIF anonymousUserCount -->
 	</ul>
 
-	<div class="text-center {loadmore_display}">
-		<button id="load-more-users-btn" class="btn btn-primary">[[users:load_more]]</button>
-	</div>
-	<br/>
+	<!-- IMPORT partials/paginator.tpl -->
 </div>