From 3e57bb04d7b8fc62761c0fa50b4d062701b1a82a Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 17 Sep 2013 09:15:24 +1000
Subject: Begin upgrade to much better bans table. DO NOT PULL YET; It won't
 work.

---
 templates/banned.html       |  2 +-
 templates/mod/ban_list.html | 12 ++++++------
 templates/mod/view_ip.html  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'templates')

diff --git a/templates/banned.html b/templates/banned.html
index a4498cf5..065d61e2 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -30,7 +30,7 @@
 	{% endif %}
 	<p>
 		{% trans %}Your ban was filed on{% endtrans %} 
-			<strong>{{ ban.set|date(config.ban_date) }}</strong> {% trans %}and{% endtrans %} <span id="expires">
+			<strong>{{ ban.created|date(config.ban_date) }}</strong> {% trans %}and{% endtrans %} <span id="expires">
 		{% if ban.expires and time() >= ban.expires %}
 			{% trans %} has since expired. Refresh the page to continue.{%  endtrans %}
 		{% elseif ban.expires %}
diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
index f8826ade..83674544 100644
--- a/templates/mod/ban_list.html
+++ b/templates/mod/ban_list.html
@@ -17,10 +17,10 @@
 				<tr{% if ban.expires != 0 and ban.expires < time() %} style="text-decoration:line-through"{% endif %}>
 					<td style="white-space: nowrap">
 						<input type="checkbox" name="ban_{{ ban.id }}"> 
-						{% if ban.real_ip %}
-							<a href="?/IP/{{ ban.ip }}">{{ ban.ip }}</a>
+						{% if ban.single_addr %}
+							<a href="?/IP/{{ ban.mask }}">{{ ban.mask }}</a>
 						{% else %}
-							{{ ban.ip|e }}
+							{{ ban.mask }}
 						{% endif %}
 					</td>
 					<td>
@@ -38,8 +38,8 @@
 						{% endif %}					
 					</td>
 					<td style="white-space: nowrap">
-						<span title="{{ ban.set|date(config.post_date) }}">
-							{{ ban.set|ago }} ago
+						<span title="{{ ban.created|date(config.post_date) }}">
+							{{ ban.created|ago }} ago
 						</span>
 					</td>
 					<td style="white-space: nowrap">
@@ -77,7 +77,7 @@
 							
 								{% endif %}
 							{% endif %}
-						{% elseif ban.mod == -1 %}
+						{% elseif ban.creator == -1 %}
 							<em>system</em>
 						{% else %}
 							<em>{% trans 'deleted?' %}</em>
diff --git a/templates/mod/view_ip.html b/templates/mod/view_ip.html
index e2dad7af..f73c5d5a 100644
--- a/templates/mod/view_ip.html
+++ b/templates/mod/view_ip.html
@@ -100,7 +100,7 @@
 					</tr>
 					<tr>
 						<th>{% trans 'IP' %}</th>
-						<td>{{ ban.ip }}</td>
+						<td>{{ ban.mask }}</td>
 					</tr>
 					<tr>
 						<th>{% trans 'Reason' %}</th>
@@ -124,7 +124,7 @@
 					</tr>
 					<tr>
 						<th>{% trans 'Set' %}</th>
-						<td>{{ ban.set|date(config.post_date) }}</td>
+						<td>{{ ban.created|date(config.post_date) }}</td>
 					</tr>
 					<tr>
 						<th>{% trans 'Expires' %}</th>
-- 
cgit v1.3