Fixes #16

Riduidel · Apr 20, 2020 · fb47ad1 · fb47ad1
1 parent 1583a5b
commit fb47ad1
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/my-lifestream/src/main/jbake/templates/index.ftl b/my-lifestream/src/main/jbake/templates/index.ftl
@@ -7,9 +7,7 @@
 	</div>
 	<#list posts as post>
   		<#if (post.status == "published")>
-  			<a href="${post.uri}"><h1><#escape x as x?xml>${post.title}</#escape></h1></a>
-  			<p>${post.date?string("dd MMMM yyyy")}</p>
-  			<p>${post.body}</p>
+			<#include "post-content.ftl" >
   		</#if>
   	</#list>
 

diff --git a/my-lifestream/src/main/jbake/templates/post-content.ftl b/my-lifestream/src/main/jbake/templates/post-content.ftl
@@ -0,0 +1,22 @@
+<div style="${post.style}">
+
+<div class="page-header">
+<#if (post.title)??>
+	<a href="${post.uri}"><h1><#escape x as x?xml>${post.title}</#escape></h1></a>
+<#else></#if>
+
+<p><em>${post.date?string("dd MMMM yyyy")}</em></p>
+
+<p class="tags">
+<#list post.tags?sort as tag>
+<#list tags?filter(t -> t.name==tag) as matching>
+<a class="tag" href="${content.rootpath}${matching.uri}">${matching.name}</a></#list>
+</#list>
+</p>
+</div>
+
+<div class="content">${post.body}</div>
+
+<hr />
+
+</div>
diff --git a/my-lifestream/src/main/jbake/templates/post.ftl b/my-lifestream/src/main/jbake/templates/post.ftl
@@ -2,16 +2,7 @@
 
 	<#include "menu.ftl">
 
-	<#if (content.title)??>
-	<div class="page-header">
-		<h1><#escape x as x?xml>${content.title}</#escape></h1>
-	</div>
-	<#else></#if>
-
-	<p><em>${content.date?string("dd MMMM yyyy")}</em></p>
-
-	<p>${content.body}</p>
-
-	<hr />
+	<#assign post=content >
+	<#include "post-content.ftl" >
 
 <#include "footer.ftl">