Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

templates/mod/news.html

@@ -52,7 +52,7 @@
 				<em>{% trans 'no subject' %}</em>
 			{% endif %} 
 			<small class="unimportant">
-				&mdash; {% trans 'by' %} {{ post.name }} {% trans 'at' %} {{ notice.time|date(config.post_date) }} 
+				&mdash; {% trans 'by' %} {{ post.name }} {% trans 'at' %} {{ post.time|date(config.post_date) }} 
 			</small>
 		</h2>
 		<p>

templates/mod/search_results.html

@@ -39,7 +39,7 @@
 			</tr>
 		{% endfor %}
 	</table>
-{%  endif %}
+{% endif %}
 
 {% if search_type == 'bans' %}
 	<table class="modlog" style="width:100%">
@@ -125,7 +125,7 @@
 			</tr>
 		{% endfor %}
 	</table>
-{%  endif %}
+{% endif %}
 
 {% if search_type == 'log' %}
 	<table class="modlog">
@@ -166,7 +166,98 @@
 			</tr>
 		{% endfor %}
 	</table>
-{%  endif %}
+{% endif %}
+
+{% if search_type == 'posts' %}
+	<table class="modlog">
+		<tr>
+			<th>Time</th>
+			<th>Board</th>
+			<th>ID</th>
+			<th>Thread</th>
+			<th>IP</th>
+			<th>Name</th>
+			<th>Subject</th>
+			<th>File</th>
+			<th>Body (snippet)</th>
+		</tr>
+		{% for post in results %}
+			<tr>
+				<td class="minimal">
+					<small>{{ post.time | ago }} ago</small>
+				</td>
+				<td class="minimal">
+					<a href="?/{{ config.board_path|sprintf(post.board) }}{{ config.file_index }}">{{ config.board_abbreviation|sprintf(post.board) }}</a>
+				</td>
+				<td class="minimal">
+					{% if post.thread %}
+						{% set thread = post.thread %}
+					{% else %}
+						{% set thread = post.id %}
+					{% endif %}
+					<a href="{{ config.root ~ post.board ~ '/' ~ config.dir.res}}{{ config.file_page|sprintf(thread) }}#{{ post.id }}">
+						{{ post.id }}
+					</a>
+				</td>
+				<td class="minimal">
+					<small>
+						{% if post.thread %}
+							{{ post.thread }}
+						{% else %}
+							(OP)
+						{% endif %}
+					</small>
+				</td>
+				<td class="minimal">
+					{% if mod|hasPermission(config.mod.show_ip, post.board) %}
+						<a href="?/IP/{{ post.ip }}">
+							{{ post.ip }}
+						</a>
+					{% else %}
+						<em>hidden</em>
+					{% endif %}
+				</td>
+				<td style="max-width:100px">
+					<small>
+						{% if post.email|length > 0 %}
+							{# start email #}
+							<a class="email" href="mailto:{{ post.email }}">
+						{% endif %}
+						{% set capcode = post.capcode|capcode %}
+						<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name }}</span>
+						{% if post.trip|length > 0 %}
+							<span {% if capcode.trip %}style="{{ capcode.trip }}" {% endif %}class="trip">{{ post.trip }}</span>
+						{% endif %}
+						{% if post.email|length > 0 %}
+							{# end email #}
+							</a>
+						{% endif %}
+						{% if capcode %}
+							{{ capcode.cap }}
+						{% endif %}
+					</small>
+				</td>
+				<td style="max-width:250px">
+					{% if post.subject %}
+						<small>{{ post.subject }}</small>
+					{% else %}
+						&ndash;
+					{% endif %}
+				</td>
+				<td style="max-width:200px">
+					{% if post.file %}
+						<small>{{ post.file }} ({{ post.filesize | filesize }})</small>
+					{% else %}
+						&ndash;
+					{% endif %}
+				</td>
+				<td>
+					<small><em>{{ post.snippet }}</em></small>
+				</td>
+			</tr>
+		{% endfor %}
+	</table>
+{% endif %}
 
 {% if result_count > results|count %}
 	<p class="unimportant" style="text-align:center;word-wrap:break-word">