From 48b2841d7b7e2ba53a0f585d76ab9624b7597aaf Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 2 Dec 2016 15:28:51 -0500
Subject: [PATCH] companion to nodebb/nodebb@753d4b0, nodebb/nodebb#5232

---
 templates/flags/detail.tpl                 |  4 +++
 templates/partials/flags/quick-filters.tpl | 34 +++++++++++++++++++---
 templates/partials/menu.tpl                |  2 +-
 templates/partials/users_list.tpl          |  2 +-
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl
index 5dde0f2..3489e94 100644
--- a/templates/flags/detail.tpl
+++ b/templates/flags/detail.tpl
@@ -53,6 +53,10 @@
 							</p>
 						</div>
 					</div>
+					<div class="form-group">
+						<label>[[flags:description]]</label>
+						<blockquote>{description}</blockquote>
+					</div>
 					<div class="form-group">
 						<label for="state">[[flags:state]]</label>
 						<select class="form-control" id="state" name="state" disabled>
diff --git a/templates/partials/flags/quick-filters.tpl b/templates/partials/flags/quick-filters.tpl
index d9d6f2b..2d77933 100644
--- a/templates/partials/flags/quick-filters.tpl
+++ b/templates/partials/flags/quick-filters.tpl
@@ -2,8 +2,34 @@
 	<div class="panel-heading">
 		<h3 class="panel-title">[[flags:quick-filters]]</h3>
 	</div>
-	<ul>
-		<li>foo</li>
-		<li>bar</li>
-	</ul>
+	<div class="panel-body">
+		<ul>
+			<li>Unresolved flags</li>
+			<li>Assigned to you</li>
+		</ul>
+	</div>
+</div>
+
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<h3 class="panel-title">[[flags:filters]]</h3>
+	</div>
+	<div class="panel-body">
+		<form role="form" component="flags/filters">
+			<div class="form-group">
+				<label for="reporterId">[[flags:filter-reporterId]]</label>
+				<input type="number" class="form-control" id="reporterId" name="reporterId" min="0" />
+			</div>
+
+			<div class="form-group">
+				<label for="type">[[flags:filter-type]]</label>
+				<select class="form-control" id="type" name="type">
+					<option value="">[[flags:filter-type-all]]</option>
+					<option value="post">[[flags:filter-type-post]]</option>
+				</select>
+			</div>
+
+			<button type="button" class="btn btn-primary btn-block">[[flags:apply-filters]]</button>
+		</form>
+	</div>
 </div>
\ No newline at end of file
diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index c150740..4282656 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -109,7 +109,7 @@
 							<li role="presentation" class="divider"></li>
 							<li class="dropdown-header">Moderator Tools</li>
 							<li>
-								<a href="{relative_path}/posts/flags">
+								<a href="{relative_path}/flags">
 									<i class="fa fa-fw fa-flag"></i> <span>[[pages:flagged-posts]]</span>
 								</a>
 							</li>
diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl
index b1dd391..34a72d3 100644
--- a/templates/partials/users_list.tpl
+++ b/templates/partials/users_list.tpl
@@ -38,7 +38,7 @@
 		<!-- 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>
+			<span class="formatted-number"><a href="{config.relative_path}/flags?uid={users.uid}">{users.flags}</a></span>
 		</div>
 		<!-- ENDIF section_flagged -->
 	</div>