From 90e42084732126228ff40d3acbb745f461b65068 Mon Sep 17 00:00:00 2001
From: Jason Puglisi <jason@puglisi.im>
Date: Sat, 8 Aug 2015 13:45:02 -0400
Subject: Added [Return] and [Go to bottom] to thread page above posts

---
 templates/thread.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/thread.html b/templates/thread.html
index f92c06dc..de0bf5e7 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -38,6 +38,9 @@
 
 	{% 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 %}
@@ -45,7 +48,7 @@
 	{% include 'report_delete.html' %}
 	</form>
 	<a href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
-        <a href="#" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
+        <a href="#" id="bottom" style="padding-left: 10px">[{% trans %}Go to top{% endtrans %}]</a>
 
 	{{ boardlist.bottom }}
 
-- 
cgit v1.3


From e6c1623a4235f267c6e7909ad22e78863af48700 Mon Sep 17 00:00:00 2001
From: 27chan <gameover@hotmail.com.br>
Date: Mon, 10 Aug 2015 22:09:26 -0300
Subject: Add extension mp4

---
 templates/post/image.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates')

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 }}
-- 
cgit v1.3


From d4dcfc6321eac2433441db91102356eb10f7afab Mon Sep 17 00:00:00 2001
From: kellerwhy <kellerwhy@gmail.com>
Date: Mon, 10 Aug 2015 23:16:23 -0400
Subject: Make mod/recent_posts.html respect $config['dir']['res']

So certain links don't keep linking to /board/res/postnumber despite any changes to $config['dir']['res'] e.g. changing res/ to thread/
---
 templates/mod/recent_posts.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates')

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 %}
-- 
cgit v1.3