various improvements

3 files changed, 117 insertions, 2 deletions

diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html
new file mode 100644
index 00000000..00b8a0f4
--- /dev/null
+++ b/templates/mod/ban_list.html
@@ -0,0 +1,74 @@
+{% if bans|count == 0 %}
+	<p style="text-align:center" class="unimportant">(There are no active bans.)</p>
+{% else %}
+	<form action="" method="post">
+		<table class="mod">
+			<tr>
+				<th>{% trans %}IP address{% endtrans %}</th>
+				<th>{% trans %}Reason{% endtrans %}</th>
+				<th>{% trans %}Board{% endtrans %}</th>
+				<th>{% trans %}Set{% endtrans %}</th>
+				<th>{% trans %}Expires{% endtrans %}</th>
+				<th>{% trans %}Staff{% endtrans %}</th>
+			</tr>
+			{% for ban in bans %}
+				<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>
+						{% else %}
+							{{ ban.ip|e }}
+						{% endif %}
+					</td>
+					<td>
+						{% if ban.reason %}
+							{{ ban.reason }}
+						{% else %}
+							-
+						{% endif %}
+					</td>
+					<td  style="white-space: nowrap">
+						{% if ban.board %}
+							{{ config.board_abbreviation|sprintf(ban.board) }}
+						{% else %}
+							<em>{% trans %}all boards{% endtrans %}
+						{% endif %}					
+					</td>
+					<td style="white-space: nowrap">
+						{{ ban.set|date(config.post_date) }}
+					</td>
+					<td style="white-space: nowrap">
+						{% if ban.expires == 0 %}
+							<em>never</em>
+						{% else %}
+							{{ ban.expires|date(config.post_date) }} 
+							{% if ban.expires > time() %}
+								<small>({{ ban.expires|until }})</small>
+							{% endif %}
+						{% endif %}
+					</td>
+					<td>
+						{% if ban.username %}
+							{% if mod|hasPermission(config.mod.view_banstaff) %}
+								<a href="?/new_PM/{{ ban.username|e }}">{{ ban.username|e }}</a>
+							{% else %}
+								{% if mod|hasPermission(config.mod.view_banquestionmark) %}
+									<em>?</em>
+								{% else %}
+							
+								{% endif %}
+							{% endif %}
+						{% else %}
+							<em>deleted?</em>
+						{% endif %}
+					</td>
+				</tr>
+			{% endfor %}
+		</table>
+		
+		<p style="text-align:center">
+			<input type="submit" name="unban" value="Unban selected">
+		</p>
+	</form>
+{% endif %}
diff --git a/templates/mod/new_pm.html b/templates/mod/new_pm.html
index d694bc26..ece1325c 100644
--- a/templates/mod/new_pm.html
+++ b/templates/mod/new_pm.html
@@ -2,7 +2,7 @@
 	{% set username = 'me' %}
 {% endif %}#}
 
-<form action="" method="post">
+<form action="?/new_PM/{{ username|e }}" method="post">
 	<table>
 		<tr>
 			<th>To</th>
@@ -14,7 +14,7 @@
 		</tr>
 		<tr>
 			<th>Message</th>
-			<td><textarea name="message" rows="10" cols="40"></textarea></td>
+			<td><textarea name="message" rows="10" cols="40">{{ message }}</textarea></td>
 		</tr>
 	</table>
 
diff --git a/templates/mod/pm.html b/templates/mod/pm.html
new file mode 100644
index 00000000..511bcfef
--- /dev/null
+++ b/templates/mod/pm.html
@@ -0,0 +1,41 @@
+<form action="" method="post">
+	<table>
+		<tr>
+			<th>From</th>
+			{% if username %}
+				<td><a href="?/new_PM/{{ username|e }}">{{ username|e }}</a></td>
+			{% else %}
+				<td><em>deleted?</em></td>
+			{% endif %}
+		</tr>
+		{% if to != mod.id %}
+			<tr>
+				<th>To</th>
+				{% if to_username %}
+					<td><a href="?/new_PM/{{ to_username|e }}">{{ to_username|e }}</a></td>
+				{% else %}
+					<td><em>deleted?</em></td>
+				{% endif %}
+			</tr>
+		{% endif %}
+		<tr>
+			<th>Date</th>
+			<td>{{ time|date(config.post_date) }}</td>
+		</tr>
+		<tr>
+			<th>Message</th>
+			<td>{{ message }}</td>
+		</tr>
+	</table>
+	
+	<ul style="list-style:none;text-align:center;padding:0">
+		<li style="padding:5px 0">
+			<input type="submit" name="delete" value="Delete forever">
+		</li>
+		<li style="padding:5px 0">
+			<a href="?/PM/{{ id }}/reply">
+				Reply with quote
+			</a>
+		</li>
+	</ul>
+</form>