summaryrefslogtreecommitdiff
path: root/templates/mod
diff options
context:
space:
mode:
authorMichael Save <savetheinternet@tinyboard.org>2012-05-19 21:00:15 +1000
committerMichael Save <savetheinternet@tinyboard.org>2012-05-19 21:00:15 +1000
commit1dedf5deaed5099affbc3785536ddd4efa534fcb (patch)
tree97120429661a7efb374f420a373c236213b8aa3d /templates/mod
parentd2c6853ed34105759cc22bf42e317ef3a178a4a6 (diff)
ban list formatting changes
Diffstat (limited to 'templates/mod')
-rw-r--r--templates/mod/ban_list.html15
1 files 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>