modularize post templates a little more

7 files changed, 39 insertions, 54 deletions

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 }}