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 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

(limited to 'templates/post_reply.html')

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 }}
-- 
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/post_reply.html')

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 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/post_reply.html')

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