From 1dedf5deaed5099affbc3785536ddd4efa534fcb Mon Sep 17 00:00:00 2001
From: Michael Save <savetheinternet@tinyboard.org>
Date: Sat, 19 May 2012 21:00:15 +1000
Subject: [PATCH] ban list formatting changes

---
 templates/mod/ban_list.html | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index 4a27b8f7..e46d816d 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -4,10 +4,11 @@
 	<form action="" method="post">
 		<table class="mod">
 			<tr>
-				<th>{% trans 'IP address' %}</th>
+				<th>{% trans 'IP address/mask' %}</th>
 				<th>{% trans 'Reason' %}</th>
 				<th>{% trans 'Board' %}</th>
 				<th>{% trans 'Set' %}</th>
+				<th>{% trans 'Duration' %}</th>
 				<th>{% trans 'Expires' %}</th>
 				<th>{% trans 'Staff' %}</th>
 			</tr>
@@ -37,14 +38,22 @@
 					</td>
 					<td style="white-space: nowrap">
 						{{ ban.set|date(config.post_date) }}
+						 <small>({{ ban.set|ago }} ago)</small>
+					</td>
+					<td style="white-space: nowrap">
+						{% if ban.expires == 0 %}
+							-
+						{% else %}
+							{{ (ban.expires - ban.set + time()) | until }}
+						{% endif %}
 					</td>
 					<td style="white-space: nowrap">
 						{% if ban.expires == 0 %}
 							<em>{% trans 'never' %}</em>
 						{% else %}
-							{{ ban.expires|date(config.post_date) }} 
+							{{ ban.expires|date(config.post_date) }}
 							{% if ban.expires > time() %}
-								<small>({{ ban.expires|until }})</small>
+								 <small>({{ ban.expires|until }})</small>
 							{% endif %}
 						{% endif %}
 					</td>