From e034b9179dd2777353c369910e65350d5496b779 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 6 Apr 2014 21:48:31 +0200
Subject: fix paths in templates

---
 templates/post_reply.html  | 33 ++++++++++++++++++++++++---------
 templates/post_thread.html | 42 +++++++++++++++++++++++++++++-------------
 2 files changed, 53 insertions(+), 22 deletions(-)

(limited to 'templates')

diff --git a/templates/post_reply.html b/templates/post_reply.html
index 713ddac9..bdac289d 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -93,20 +93,35 @@
 		)
 		</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' %}
+	<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 %}
-		{% 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 %}" 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>
 	{% endif %}
 	{{ post.postControls }}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 113444be..fdf6369a 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -41,20 +41,36 @@
 		{% endif %}
 	)
 	</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 }}
+<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 %}
-		{{ config.uri_thumb }}{{ post.thumb }}
-	{% endif %}" style="width:{{ post.thumbwidth }}px;height:{{ post.thumbheight }}px" alt="" /></a>
+		<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>
 {% 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 }}" />
-- 
cgit v1.3


From 15c0802c061ea8e49536d32ce5b3d55c641b39ca Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 10 Apr 2014 11:01:37 +0200
Subject: Disable the sucky chrome autofill
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It used to force login into "embed" field and password into post password.

Disabling autocomplete (at form) didn't work. Recreating the fields either.
Trying to induce default values didn't as well. x-autocompletetype didn't.

What worked – creating two dummy fields:
  <input type='text'>
  <input type='password'>
...just before the real post password.
---
 templates/post_form.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'templates')

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


From 677e428a4dc6a2144d96c185efc65463efea08b6 Mon Sep 17 00:00:00 2001
From: Michael Reiley <mreiley@pariahsoft.com>
Date: Sat, 12 Apr 2014 11:12:42 -0700
Subject: Update copyright years.

---
 LICENSE.md                  | 2 +-
 mod.php                     | 2 +-
 post.php                    | 2 +-
 templates/generic_page.html | 2 +-
 templates/index.html        | 2 +-
 templates/page.html         | 4 ++--
 templates/thread.html       | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'templates')

diff --git a/LICENSE.md b/LICENSE.md
index 74cf71ee..2bc2f186 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,5 +1,5 @@
 # License
-Copyright (c) 2010-2013 Tinyboard Development Group (tinyboard.org)
+Copyright (c) 2010-2014 Tinyboard Development Group (tinyboard.org)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/mod.php b/mod.php
index f6a4aa0c..2cf7bd16 100644
--- a/mod.php
+++ b/mod.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- *  Copyright (c) 2010-2013 Tinyboard Development Group
+ *  Copyright (c) 2010-2014 Tinyboard Development Group
  */
 
 require 'inc/functions.php';
diff --git a/post.php b/post.php
index 366dde45..8a747add 100644
--- a/post.php
+++ b/post.php
@@ -2,7 +2,7 @@
  
 
 /*
- *  Copyright (c) 2010-2013 Tinyboard Development Group
+ *  Copyright (c) 2010-2014 Tinyboard Development Group
  */
 //
 require 'inc/functions.php';
diff --git a/templates/generic_page.html b/templates/generic_page.html
index 8f608a6a..2506c454 100644
--- a/templates/generic_page.html
+++ b/templates/generic_page.html
@@ -35,7 +35,7 @@
 	{% 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;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group</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 0458ed5a..d71038b7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -56,7 +56,7 @@
 	
 	{{ 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;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group</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 0d33c16f..617cb796 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -19,7 +19,7 @@
 	{{ 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;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group</p>
 	</footer>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/templates/thread.html b/templates/thread.html
index e8c43ef7..f7198cef 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -39,7 +39,7 @@
 
 	{{ 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;">Powered by <a href="http://tinyboard.org/">Tinyboard</a> {{ config.version }} | <a href="http://tinyboard.org/">Tinyboard</a> Copyright &copy; 2010-2014 Tinyboard Development Group</p>
 		{% for footer in config.footer %}<p class="unimportant" style="text-align:center;">{{ footer }}</p>{% endfor %}
 	</footer>
 	<script type="text/javascript">{% raw %}
-- 
cgit v1.3


From e81ce17fb4fdb6215d942005c10db32f4bafa6d5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 16 Apr 2014 11:54:41 +0200
Subject: modularize post templates a little bit; try to unify duplicate code

---
 templates/post_reply.html  | 65 ++++------------------------------------------
 templates/post_thread.html | 59 +++--------------------------------------
 2 files changed, 8 insertions(+), 116 deletions(-)

(limited to 'templates')

diff --git a/templates/post_reply.html b/templates/post_reply.html
index bdac289d..530d2626 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -28,21 +28,7 @@
 		{% 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 %}
+		{% include 'post/flag.html' %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>
 	{% if config.poster_ids %}
@@ -61,7 +47,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,51 +64,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="
-		{% 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>
+		</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 fdf6369a..acacd602 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -28,49 +28,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="
-	{% 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>
+	{% 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 }}" />
@@ -98,21 +59,7 @@
 		{% 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 %}
+		{% include 'post/flag.html' %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>
 	{% if config.poster_ids %}
-- 
cgit v1.3


From 48bc9d9e297d14bd549bd10513537052d7ce221c Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 16 Apr 2014 11:58:41 +0200
Subject: add some files missing from the previous commit

---
 templates/post/flag.html                 | 18 +++++++++++++
 templates/post/image.html                | 45 ++++++++++++++++++++++++++++++++
 templates/post/image_identification.html | 10 +++++++
 3 files changed, 73 insertions(+)
 create mode 100644 templates/post/flag.html
 create mode 100644 templates/post/image.html
 create mode 100644 templates/post/image_identification.html

(limited to 'templates')

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


From 59874b83769259e3a1b0730405e5f65e46243666 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 16 Apr 2014 15:01:37 +0200
Subject: modularize post templates a little more

---
 templates/post/ip.html        |  3 +++
 templates/post/name.html      | 16 ++++++++++++++++
 templates/post/poster_id.html |  3 +++
 templates/post/subject.html   |  5 +++++
 templates/post/time.html      |  1 +
 templates/post_reply.html     | 33 ++++++---------------------------
 templates/post_thread.html    | 32 +++++---------------------------
 7 files changed, 39 insertions(+), 54 deletions(-)
 create mode 100644 templates/post/ip.html
 create mode 100644 templates/post/name.html
 create mode 100644 templates/post/poster_id.html
 create mode 100644 templates/post/subject.html
 create mode 100644 templates/post/time.html

(limited to 'templates')

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_reply.html b/templates/post_reply.html
index 530d2626..90ac5065 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -5,35 +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 %}
+		{% include 'post/subject.html' %}
+		{% include 'post/name.html' %}
+		{% include 'post/ip.html' %}
 		{% include 'post/flag.html' %}
-		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
+		{% 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 }}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index acacd602..f74427e4 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -36,35 +36,13 @@
 <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 %}
+		{% include 'post/subject.html' %}
+		{% include 'post/name.html' %}
+		{% include 'post/ip.html' %}
 		{% include 'post/flag.html' %}
-		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
+		{% 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 }}
-- 
cgit v1.3


From e5c48282c47247d40e2dd063de52d61e1105fb05 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Thu, 17 Apr 2014 17:11:27 +0200
Subject: apply new branding for vichan-devel

---
 templates/generic_page.html | 5 ++++-
 templates/index.html        | 6 +++++-
 templates/page.html         | 5 ++++-
 templates/thread.html       | 5 ++++-
 tools/rebuild.php           | 2 +-
 5 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/generic_page.html b/templates/generic_page.html
index 3f2d0898..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-2014 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 8a045144..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-2014 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 bd456db0..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-2014 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/thread.html b/templates/thread.html
index 0f9dc764..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-2014 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/tools/rebuild.php b/tools/rebuild.php
index 7d6a5abc..bbf104a2 100755
--- a/tools/rebuild.php
+++ b/tools/rebuild.php
@@ -37,7 +37,7 @@ $options['quick'] = isset($opts['quick']);
 $options['full'] = isset($opts['full']) || isset($opts['f']);
 
 if(!$options['quiet'])
-	echo "== Tinyboard {$config['version']} ==\n";	
+	echo "== Tinyboard + vichan {$config['version']} ==\n";	
 
 if(!$options['quiet'])
 	echo "Clearing template cache...\n";
-- 
cgit v1.3