From f1df7764109c22802fa5cbea4de35e05a7cd6fb0 Mon Sep 17 00:00:00 2001
From: Nicolas F <ovdev@fratti.ch>
Date: Tue, 27 Jun 2017 14:40:58 +0200
Subject: [PATCH 1/4] Add alert about reports that nobody will read

Apparently some people don't understand what the report button
is for. Adding this small warning can be considered a success even
if it just leads to one less stupid report.
---
 nyaa/templates/view.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nyaa/templates/view.html b/nyaa/templates/view.html
index 7ed25ff..2c917bc 100644
--- a/nyaa/templates/view.html
+++ b/nyaa/templates/view.html
@@ -189,6 +189,12 @@
 				<h4 class="modal-title">Report torrent #{{ torrent.id }}</h4>
 			</div>
 			<div class="modal-body">
+				<div class="alert alert-warning" role="alert">
+					Before submitting a report, please check that the torrent
+					actually breaks <a href="{{ url_for('site_rules') }}">the
+					rules</a>. Useless reports like "download is slow" or
+					"thanks" can get you banned from the site.
+				</div>
 				<form method="POST" action="{{ request.url }}/submit_report">
 					{{ report_form.csrf_token }}
 					{{ render_field(report_form.reason, class_='form-control', maxlength=255) }}

From 9dfce327b63f8c5fb11f2448844ba9581aee2a12 Mon Sep 17 00:00:00 2001
From: Nicolas F <ovdev@fratti.ch>
Date: Tue, 27 Jun 2017 15:25:55 +0200
Subject: [PATCH 2/4] Improve reports table styling

Condense the table, vertically align the text inside rows, use a
bootstrap styled select, group it together with the review button
and shrink it down a little.
---
 nyaa/static/css/main.css    |  4 ++++
 nyaa/templates/reports.html | 14 +++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/nyaa/static/css/main.css b/nyaa/static/css/main.css
index d361049..d2646d0 100644
--- a/nyaa/static/css/main.css
+++ b/nyaa/static/css/main.css
@@ -411,3 +411,7 @@ h6:hover .header-anchor {
 		margin-top: auto;
 	}
 }
+
+table.table > tbody > tr.reports-row > td {
+	vertical-align: middle;
+}
diff --git a/nyaa/templates/reports.html b/nyaa/templates/reports.html
index 455a6e9..a959089 100644
--- a/nyaa/templates/reports.html
+++ b/nyaa/templates/reports.html
@@ -3,7 +3,7 @@
 {% block body %}
 {% from "_formhelpers.html" import render_field %}
 	<div class="table-responsive">
-		<table class="table table-bordered table-hover table-striped">
+		<table class="table table-bordered table-hover table-striped table-condensed">
 			<thead>
 			<tr>
 				<th>#</th>
@@ -16,7 +16,7 @@
 			</thead>
 			<tbody>
 			{% for report in reports.items %}
-			<tr>
+			<tr class="reports-row">
 				<td>{{ report.id }}</td>
 				<td>
 					<a href="{{ url_for('view_user', user_name=report.user.username) }}">{{ report.user.username }}</a>
@@ -26,13 +26,17 @@
 				</td>
 				<td>{{ report.reason }}</td>
 				<td>{{ report.created_time }}</td>
-				<td style="width: 15%">
+				<td style="width: 180px">
 					<form method="post">
 						{{ report_action.csrf_token }}
-						{{ report_action.action }}
 						{{ report_action.torrent(value=report.torrent.id) }}
 						{{ report_action.report(value=report.id) }}
-						<button type="submit" class="btn btn-primary pull-right">Review</button>
+						<div class="input-group input-group-sm">
+							{{ report_action.action(class_="form-control") }}
+							<div class="input-group-btn">
+								<button type="submit" class="btn btn-primary">Review</button>
+							</div>
+						</div>
 					</form>
 				</td>
 			</tr>

From 25535e9cb98fe122c7a73c139d9b7e2e304baa6c Mon Sep 17 00:00:00 2001
From: Nicolas F <ovdev@fratti.ch>
Date: Tue, 27 Jun 2017 15:56:46 +0200
Subject: [PATCH 3/4] Add extra information to reports list

Shows whether the reporter is trusted, whether the uploader is trusted,
the name of the uploader and for superadmins the IP for the uploader.
---
 nyaa/templates/reports.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nyaa/templates/reports.html b/nyaa/templates/reports.html
index a959089..77ffe2e 100644
--- a/nyaa/templates/reports.html
+++ b/nyaa/templates/reports.html
@@ -20,13 +20,24 @@
 				<td>{{ report.id }}</td>
 				<td>
 					<a href="{{ url_for('view_user', user_name=report.user.username) }}">{{ report.user.username }}</a>
+					{% if report.user.is_trusted %}
+					<span class="label label-success pull-right">Trusted</span>
+					{% endif %}
 				</td>
 				<td>
 					<a href="{{ url_for('view_torrent', torrent_id=report.torrent.id) }}">{{ report.torrent.display_name }}</a>
+					by <a href="{{ url_for('view_user', user_name=report.torrent.user.username) }}">
+					{{ report.torrent.user.username }}</a>
+					{% if g.user.is_superadmin and report.torrent.uploader_ip %}
+					({{ report.torrent.uploader_ip_string }})
+					{% endif %}
+					{% if report.torrent.user.is_trusted %}
+					<span class="label label-success pull-right">Trusted</span>
+					{% endif %}
 				</td>
 				<td>{{ report.reason }}</td>
 				<td>{{ report.created_time }}</td>
-				<td style="width: 180px">
+				<td style="min-width: 150px">
 					<form method="post">
 						{{ report_action.csrf_token }}
 						{{ report_action.torrent(value=report.torrent.id) }}

From fdb041c23b4956dc9857ce299574b00a2161d230 Mon Sep 17 00:00:00 2001
From: Nicolas F <ovdev@fratti.ch>
Date: Tue, 27 Jun 2017 16:07:10 +0200
Subject: [PATCH 4/4] Don't use responsive table on reports list

The responsive table actually does *worse* in narrow layouts because
the action column fucks off out of view and needs to be scrolled to
if the report reason is long. With a normal table you may not get
consistent row heights, but at least you don't have to horizontally
scroll to perform an action.

Also fixed a goof where I used a style attribute instead of making
the max-width for the action column a class.
---
 nyaa/static/css/main.css    | 4 ++++
 nyaa/templates/reports.html | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nyaa/static/css/main.css b/nyaa/static/css/main.css
index d2646d0..13fcb0a 100644
--- a/nyaa/static/css/main.css
+++ b/nyaa/static/css/main.css
@@ -415,3 +415,7 @@ h6:hover .header-anchor {
 table.table > tbody > tr.reports-row > td {
 	vertical-align: middle;
 }
+
+td.report-action-column {
+	min-width: 150px;
+}
diff --git a/nyaa/templates/reports.html b/nyaa/templates/reports.html
index 77ffe2e..943abb7 100644
--- a/nyaa/templates/reports.html
+++ b/nyaa/templates/reports.html
@@ -2,7 +2,7 @@
 {% block title %}Reports :: {{ config.SITE_NAME }}{% endblock %}
 {% block body %}
 {% from "_formhelpers.html" import render_field %}
-	<div class="table-responsive">
+	<div class="table">
 		<table class="table table-bordered table-hover table-striped table-condensed">
 			<thead>
 			<tr>
@@ -37,7 +37,7 @@
 				</td>
 				<td>{{ report.reason }}</td>
 				<td>{{ report.created_time }}</td>
-				<td style="min-width: 150px">
+				<td class="report-action-column">
 					<form method="post">
 						{{ report_action.csrf_token }}
 						{{ report_action.torrent(value=report.torrent.id) }}