--- a/Allura/allura/lib/widgets/templates/discussion.html
+++ b/Allura/allura/lib/widgets/templates/discussion.html
@@ -1,21 +1,19 @@
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:py="http://genshi.edgewall.org/">
- ${widgets.discussion_header.display(value=value)}
- <div class="content">
- <div class="row">
- <div class="column grid_12">
- ${widgets.subscription_form.display(value=value,
- threads=threads,
- show_actions=True,
- action=value.url() + 'subscribe',
- allow_create_thread=allow_create_thread,
- show_discussion_email=show_discussion_email,
- show_subject=show_subject,
- limit=limit,
- page=page,
- count=count)}
- </div>
- </div>
- </div>
-</div>+{% extends 'jinja_master/master.html' %}
+
+{% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}} / Discussion{% endblock %}
+
+{% block header %}{{value.name}}{% endblock %}
+
+{% block content %}
+{{widgets.discussion_header.display(value=value)}}
+{{widgets.subscription_form.display(value=value,
+ threads=threads,
+ show_actions=True,
+ action=value.url() + 'subscribe',
+ allow_create_thread=allow_create_thread,
+ show_discussion_email=show_discussion_email,
+ show_subject=show_subject,
+ limit=limit,
+ page=page,
+ count=count)}}
+{% endblock %}