--- a/Allura/allura/templates/discussion/post.html
+++ b/Allura/allura/templates/discussion/post.html
@@ -1,32 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:py="http://genshi.edgewall.org/"
- xmlns:xi="http://www.w3.org/2001/XInclude">
+{% extends 'jinja_master/master.html' %}
- <xi:include href="${g.allura_templates}/master.html"/>
+{% block title %}
+{{c.project.name}} / {{c.app.config.options.mount_label}} / {{post.thread.subject or '(no subject)'}}
+{% endblock %}
- <head>
- <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
- <title>$c.project.name / $c.app.config.options.mount_label / ${post.thread.subject or '(no subject)'}</title>
- </head>
+{% block header %}
+{{post.thread.subject or '(no subject)'}}
+{% endblock %}
- <body>
- <h1 class="title">${post.thread.subject or '(no subject)'}</h1>
- <div class="content">
- <div class="row">
- <div class="column grid_12">
+{% block content %}
<div>
Version:
<a href="?version=1"><<</a>
- <a href="?version=${post.version-1}"><</a>
- $post.version
- <a href="?version=${post.version+1}">></a>
+ <a href="?version={{post.version-1}}"><</a>
+ {{post.version}}
+ <a href="?version={{post.version+1}}">></a>
<a href=".">>></a>
</div>
- ${c.post.display(value=post)}
- </div>
- </div>
- </div>
- </body>
-</html>
+ {{c.post.display(value=post)}}
+{% endblock %}