Merge remote-tracking branch 'vichan/master'

3 files changed, 12 insertions, 4 deletions

diff --git a/templates/mod/recent_posts.html b/templates/mod/recent_posts.html
index b9c2c0cc..cb4f1726 100644
--- a/templates/mod/recent_posts.html
+++ b/templates/mod/recent_posts.html
@@ -11,7 +11,7 @@
 		{% else %}

 			{% set thread = post.thread %}

 		{% endif %}

-		<div class="post-wrapper" data-board="{{ post.board }}"><hr/><a class="eita-link" id="eita-{{ post.board }}-{{ thread }}" href="?/{{ post.board }}/res/{{ thread }}.html#{{ post.id }}">/{{ post.board }}/{{ post.id }}</a><br>

+		<div class="post-wrapper" data-board="{{ post.board }}"><hr/><a class="eita-link" id="eita-{{ post.board }}-{{ thread }}" href="?/{{ post.board }}/{{ config.dir.res }}{{ thread }}.html#{{ post.id }}">/{{ post.board }}/{{ post.id }}</a><br>

 			{{ post.built }}

 		</div>

 	{% endfor %}

diff --git a/templates/post/image.html b/templates/post/image.html
index 818ccb57..16fe20b6 100644
--- a/templates/post/image.html
+++ b/templates/post/image.html
@@ -1,16 +1,16 @@
 <a href="
-	{% if post.file|extension == 'webm' %}
+	{% if post.file|extension == 'webm' or post.file|extension == 'mp4' %}
 		{{ config.root }}player.php?v={{ config.uri_img }}{{ post.file }}&amp;t={{ post.filename|e('url') }}&amp;loop=1
 	{% else %}
 		{{ config.uri_img }}{{ post.file }}
 	{% endif %}
 	"
 	 target="_blank"
-	{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' or post.filename|extension == 'webm' %}
+	{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' or post.filename|extension == 'webm' or post.file|extension == 'mp4' %}
 		 class="file"
 	{% endif %}
 >
-	{% if post.thumb|extension == 'webm' %}
+	{% if post.thumb|extension == 'webm' or post.thumb|extension == 'mp4' %}
 		<video autoplay class="post-image" src="{{ config.uri_thumb }}{{ post.thumb }}"
 			 poster="
 				{{ config.root }}
diff --git a/templates/thread.html b/templates/thread.html
index cf087a65..65f41960 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -38,12 +38,20 @@
 
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
+	<a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
+	<a href="#bottom" style="padding-left: 10px">[{% trans %}Go to bottom{% endtrans %}]</a>
+	<hr />
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
 	<input type="hidden" name="board" value="{{ board.uri }}" />
 	{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
 	{{ body }}
 	{% include 'report_delete.html' %}
 	</form>
+	<a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
+        <a href="#" id="bottom" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
+
+	{{ boardlist.bottom }}
+
 	{{ config.ad.bottom }}
 
 	<footer>