Merge branch 'master' of github.com:vichan-devel/Tinyboard into br-integration

15 files changed, 144 insertions, 145 deletions

diff --git a/templates/generic_page.html b/templates/generic_page.html
index 70cb15aa..0fe1f9c5 100644
--- a/templates/generic_page.html
+++ b/templates/generic_page.html
@@ -36,7 +36,10 @@
 	{% endfor %} {{ btn.next }}</div>
 	{{ boardlist.bottom }}
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
+			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
+		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
+		<br><a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}
diff --git a/templates/index.html b/templates/index.html
index b694950c..530247f7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -79,7 +79,11 @@
 	{{ config.ad.bottom }}
 
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
+			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
+		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group
+		<br><a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel</p>
+
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}
diff --git a/templates/page.html b/templates/page.html
index dd3eb97e..eb2501e1 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -22,7 +22,10 @@
 	{{ body }}
 	<hr>
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
+			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
+		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
+		<br><a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel</p>
 	</footer>
 </body>
 </html>
diff --git a/templates/post/flag.html b/templates/post/flag.html
new file mode 100644
index 00000000..61622368
--- /dev/null
+++ b/templates/post/flag.html
@@ -0,0 +1,18 @@
+{% if config.display_flags and post.modifiers.flag %}
+	<img
+		{% if config.country_flags_condensed %}
+			 class="flag flag-{{ post.modifiers.flag }}" src="{{ config.image_blank }}"
+		{% else %}
+			 class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
+		{% endif %}
+		 style="{% if post.modifiers['flag style'] %}
+				{{ post.modifiers['flag style'] }}
+			{% else %}
+				{{ config.flag_style }}
+			{% endif %}"
+
+		{% if post.modifiers['flag alt'] %} alt="{{ post.modifiers['flag alt'] | e('html_attr') }}"
+			 title="{{ post.modifiers['flag alt'] | e('html_attr') }}"
+		{% endif %}
+	>
+{% endif %}
diff --git a/templates/post/image.html b/templates/post/image.html
new file mode 100644
index 00000000..5020f782
--- /dev/null
+++ b/templates/post/image.html
@@ -0,0 +1,45 @@
+<a href="
+	{% if post.file|extension == 'webm' %}
+		{{ 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' %}
+		 class="file"
+	{% endif %}
+>
+	{% if post.thumb|extension == 'webm' %}
+		<video autoplay class="post-image" src="{{ config.uri_thumb }}{{ post.thumb }}"
+			 poster="
+				{{ config.root }}
+				{% if config.file_icons[post.filename|extension] %}
+					{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
+				{% else %}
+					{{ config.file_thumb|sprintf(config.file_icons.default) }}
+				{% endif %}
+			"
+			 style="width:{{ post.thumbwidth }}px;height:{{ post.thumbheight }}px"
+		>
+		</video>
+	{% else %}
+		<img class="post-image"
+			src="
+				{% if post.thumb == 'file' %}
+					{{ config.root }}
+					{% if config.file_icons[post.filename|extension] %}
+						{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
+					{% else %}
+						{{ config.file_thumb|sprintf(config.file_icons.default) }}
+					{% endif %}
+				{% elseif post.thumb == 'spoiler' %}
+					{{ config.root }}{{ config.spoiler_image }}
+				{% else %}
+					{{ config.uri_thumb }}{{ post.thumb }}
+				{% endif %}
+			"
+			 style="width:{{ post.thumbwidth }}px;height:{{ post.thumbheight }}px" alt="" 
+		/>
+	{% endif %}
+</a>
diff --git a/templates/post/image_identification.html b/templates/post/image_identification.html
new file mode 100644
index 00000000..3d3bd655
--- /dev/null
+++ b/templates/post/image_identification.html
@@ -0,0 +1,10 @@
+{% if post.thumb != 'file' and config.image_identification %}
+	, 
+	<span class='image_id'>
+		<a href="http://imgops.com/{{ config.domain }}{{ config.uri_img }}{{ post.file }}">io</a> 
+		{% if post.file|extension == 'jpg' %}
+			<a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">e</a> 
+		{% endif %}
+		<a href="http://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">g</a>
+	</span>
+{% endif %}
diff --git a/templates/post/ip.html b/templates/post/ip.html
new file mode 100644
index 00000000..11581ff9
--- /dev/null
+++ b/templates/post/ip.html
@@ -0,0 +1,3 @@
+{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}  
+	 [<a class="ip-link" style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]  
+{% endif %}
diff --git a/templates/post/name.html b/templates/post/name.html
new file mode 100644
index 00000000..009b234d
--- /dev/null
+++ b/templates/post/name.html
@@ -0,0 +1,16 @@
+{% set capcode = post.capcode|capcode %}
+{% if post.email|length > 0 %}
+	{# start email #}
+	<a class="email" href="mailto:{{ post.email }}">
+{% endif %}
+	<span {% if capcode.name %}style="{{ capcode.name }}" {% endif %}class="name">{{ post.name|bidi_cleanup }}</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 %}
diff --git a/templates/post/poster_id.html b/templates/post/poster_id.html
new file mode 100644
index 00000000..3f168003
--- /dev/null
+++ b/templates/post/poster_id.html
@@ -0,0 +1,3 @@
+{% if config.poster_ids %}
+	 ID: {{ post.ip|poster_id(post.id) }} 
+{% endif %}
diff --git a/templates/post/subject.html b/templates/post/subject.html
new file mode 100644
index 00000000..0d80d95e
--- /dev/null
+++ b/templates/post/subject.html
@@ -0,0 +1,5 @@
+{% if post.subject|length > 0 %}
+	{# show subject #}
+	<span class="subject">{{ post.subject|bidi_cleanup }}</span> 
+{% endif %}
+
diff --git a/templates/post/time.html b/templates/post/time.html
new file mode 100644
index 00000000..e6273f94
--- /dev/null
+++ b/templates/post/time.html
@@ -0,0 +1 @@
+ <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
diff --git a/templates/post_form.html b/templates/post_form.html
index 450377d8..09c2d48f 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -101,7 +101,7 @@
 				{{ antibot.html() }}
 			</th>
 			<td>
-				<input type="text" name="embed" size="30" maxlength="120" autocomplete="off">
+				<input type="text" name="embed" value="" size="30" maxlength="120" autocomplete="off">
 			</td>
 		</tr>
 		{% endif %}
@@ -130,9 +130,14 @@
 			<th>
 				{% trans %}Password{% endtrans %}
 				{{ antibot.html() }}
+				<!-- Chrome, you suck so hard with your autofill mechanism -->
+				<!-- I tried N different tricks, this sucks most, but only this one -->
+				<!-- disables autofill successfully -->
+				<input type='text' style='display: none'>
+				<input type='password' style='display: none'>
 			</th>
 			<td>
-				<input type="password" name="password" size="12" maxlength="18" autocomplete="off"> 
+				<input type="password" name="password" value="" size="12" maxlength="18" autocomplete="off"> 
 				<span class="unimportant">{% trans %}(For file deletion.){% endtrans %}</span>
 				{{ antibot.html() }}
 			</td>
diff --git a/templates/post_reply.html b/templates/post_reply.html
index 713ddac9..90ac5065 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -5,49 +5,14 @@
 <p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}>
 	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
 	<label for="delete_{{ post.id }}">
-		{% if post.subject|length > 0 %}
-			{# show subject #}
-			<span class="subject">{{ post.subject|bidi_cleanup }}</span> 
-		{% endif %}
-		{% 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|bidi_cleanup }}</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 %}
-		{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
-			 [<a class="ip-link" style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
-		{% endif %}
-		{% if config.display_flags and post.modifiers.flag %}
-			 <img 
-				{% if config.country_flags_condensed %}
-					 class="flag flag-{{ post.modifiers.flag }}" src="{{ config.image_blank }}"
-				{% else %}
-					 class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
-				{% endif %}
-			 	 style="{% if post.modifiers['flag style'] %}
-					{{ post.modifiers['flag style'] }}
-				{% else %}
-					{{ config.flag_style }}
-				{% endif %}"
-			{% if post.modifiers['flag alt'] %} alt="{{ post.modifiers['flag alt'] | e('html_attr') }}"
-				 title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
-		{% endif %}
-		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
+		{% include 'post/subject.html' %}
+		{% include 'post/name.html' %}
+		{% include 'post/ip.html' %}
+		{% include 'post/flag.html' %}
+		{% include 'post/time.html' %}
 	</label>
-	{% if config.poster_ids %}
-		 ID: {{ post.ip|poster_id(post.thread) }}
-	{% endif %}
+	{% include 'post/poster_id.html' %}
+
 	 <a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? highlightReply({{ post.id }}) : true;" href="{{ post.link }}">No.</a>
 	<a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? citeReply({{ post.id }}) : true;" href="{{ post.link('q') }}">
 		{{ post.id }}
@@ -61,7 +26,7 @@
 		<p class="fileinfo">File: <a href="{{ config.uri_img }}{{ post.file }}">{{ post.file }}</a> <span class="unimportant">
 		(
 			{% if post.thumb == 'spoiler' %}
-				Spoiler Image, 
+				{% trans %}Spoiler Image{% endtrans %}, 
 			{% endif %}
 			{{ post.filesize|filesize }}
 			{% if post.filewidth and post.fileheight %}
@@ -78,36 +43,10 @@
 					<span class="postfilename">{{ post.filename|e|bidi_cleanup }}</span>
 				{% endif %}
 			{% endif %}
-			{% if post.thumb != 'file' and config.image_identification %}
-				,
-				<span class='image_id'>
-				 <a href="http://imgops.com/{{ config.domain }}{{ config.uri_img }}{{ post.file }}">io</a>
-				{% if post.file|extension == 'jpg' %}
-					 <a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">e</a>
-				{% endif %}
-				 <a href="http://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">g</a>
-				 <a href="http://www.tineye.com/search?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">t</a>
-				</span>
-			{% endif %}
-
+			{% include "post/image_identification.html" %}
 		)
-		</span>
-</p>
-	<a href="{{ config.uri_img }}{{ post.file }}" target="_blank"{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' %} class="file"{% endif %}>
-	<img class="post-image" src="
-		{% if post.thumb == 'file' %}
-			{{ config.root }}
-			{% if config.file_icons[post.filename|extension] %}
-				{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
-			{% else %}
-				{{ config.file_thumb|sprintf(config.file_icons.default) }}
-			{% endif %}
-		{% elseif post.thumb == 'spoiler' %}
-			{{ config.root }}{{ config.spoiler_image }}
-		{% else %}
-			{{ config.uri_thumb }}{{ post.thumb }}
-		{% endif %}" style="width:{{ post.thumbwidth }}px;height:{{ post.thumbheight }}px" alt="" />
-	</a>
+		</span></p>
+	{% include "post/image.html" %}
 	{% endif %}
 	{{ post.postControls }}
 	<div class="body">
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 113444be..f74427e4 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -28,80 +28,21 @@
 				<span class="postfilename">{{ post.filename|e|bidi_cleanup }}</span>
 			{% endif %}
 		{% endif %}
-		{% if post.thumb != 'file' and config.image_identification %}
-			, 
-			<span class='image_id'>
-			 <a href="http://imgops.com/{{ config.domain }}{{ config.uri_img }}{{ post.file }}">io</a>
-			{% if post.file|extension == 'jpg' %}
-				 <a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">e</a>
-			{% endif %}
-			 <a href="http://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">g</a>
-			 <a href="http://www.tineye.com/search?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">t</a>
-			</span>
-		{% endif %}
+		{% include "post/image_identification.html" %}
 	)
 	</span></p>
-<a href="{{ config.uri_img }}{{ post.file }}" target="_blank"{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' %} class="file"{% endif %}>
-<img class="post-image" src="
-	{% if post.thumb == 'file' %}
-		{{ config.root }}
-		{% if config.file_icons[post.filename|extension] %}
-			{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
-		{% else %}
-			{{ config.file_thumb|sprintf(config.file_icons.default) }}
-		{% endif %}
-	{% elseif post.thumb == 'spoiler' %}
-		{{ config.root }}{{ config.spoiler_image }}
-	{% else %}
-		{{ config.uri_thumb }}{{ post.thumb }}
-	{% endif %}" style="width:{{ post.thumbwidth }}px;height:{{ post.thumbheight }}px" alt="" /></a>
+	{% include "post/image.html" %}
 {% endif %}
 <div class="post op"><p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}>
 	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
 	<label for="delete_{{ post.id }}">
-		{% if post.subject|length > 0 %}
-			{# show subject #}
-			<span class="subject">{{ post.subject|bidi_cleanup }}</span> 
-		{% endif %}
-		{% 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|bidi_cleanup }}</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 %}
-		{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
-			 [<a class="ip-link" style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
-		{% endif %}
-		{% if config.display_flags and post.modifiers.flag %}
-			 <img
-				{% if config.country_flags_condensed %}
-					 class="flag flag-{{ post.modifiers.flag }}" src="{{ config.image_blank }}"
-				{% else %}
-					 class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
-				{% endif %}
-					 style="{% if post.modifiers['flag style'] %}
-					{{ post.modifiers['flag style'] }}
-				{% else %}
-					{{ config.flag_style }}
-				{% endif %}"
-				{% if post.modifiers['flag alt'] %} alt="{{ post.modifiers['flag alt'] | e('html_attr') }}"
-				 title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
-		{% endif %}
-		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
+		{% include 'post/subject.html' %}
+		{% include 'post/name.html' %}
+		{% include 'post/ip.html' %}
+		{% include 'post/flag.html' %}
+		{% include 'post/time.html' %}
 	</label>
-	{% if config.poster_ids %}
-		 ID: {{ post.ip|poster_id(post.id) }}
-	{% endif %}
+	{% include 'post/poster_id.html' %}
          <a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? highlightReply({{ post.id }}) : true;" href="{{ post.link }}">No.</a>
         <a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? citeReply({{ post.id }}) : true;" href="{{ post.link('q') }}">
                 {{ post.id }}
diff --git a/templates/thread.html b/templates/thread.html
index 13159148..d3e75242 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -51,7 +51,10 @@
 	{{ config.ad.bottom }}
 
 	<footer>
-		<p class="unimportant" style="margin-top:20px;text-align:center;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2013 Tinyboard Development Group</p>
+		<p class="unimportant" style="margin-top:20px;text-align:center;">- <a href="http://tinyboard.org/">Tinyboard</a> + 
+			<a href='https://int.vichan.net/devel/'>vichan</a> {{ config.version }} -
+		<br><a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group    
+		<br><a href="https://int.vichan.net/devel/">vichan</a> Copyright &copy; 2012-2014 vichan-devel</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}