3 files changed, 86 insertions, 0 deletions
diff --git a/templates/comments_display.tmpl b/templates/comments_display.tmpl
new file mode 100644
index 000000000..bc4b70273
--- /dev/null
+++ b/templates/comments_display.tmpl
@@ -0,0 +1,36 @@
+<div class="comments-display">
+
+<div class="comments-header">
+Posted by
+<TMPL_IF NAME="COMMENTUSER">
+<span class="author">
+<TMPL_IF NAME="COMMENTAUTHORURL">
+<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR NAME=AUTHOR>
+</TMPL_IF>
+</span>
+<TMPL_ELSE>
+<TMPL_IF NAME=COMMENTIP>
+<span class="author">
+<TMPL_VAR NAME=COMMENTIP>
+</span>
+<TMPL_ELSE>
+unknown IP address
+</TMPL_IF>
+
+<TMPL_IF NAME=AUTHOR>
+(<span class="claimedauthor"><TMPL_IF NAME="AUTHORURL"><a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a><TMPL_ELSE><TMPL_VAR NAME=AUTHOR></TMPL_IF></span>)
+</TMPL_IF>
+</TMPL_IF>
+
+(<TMPL_VAR CTIME>)
+</div>
+
+<div class="comments-subject"><TMPL_VAR TITLE></div>
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
+
+</div><!--.comments-display-->
diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
new file mode 100644
index 000000000..9a9455f99
--- /dev/null
+++ b/templates/comments_form.tmpl
@@ -0,0 +1,34 @@
+<div class="comments-form">
+<TMPL_VAR MESSAGE>
+<TMPL_VAR FORM-START>
+<TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-SID>
+<TMPL_VAR FIELD-PAGE>
+<TMPL_IF NAME=USERNAME>
+Signed in as <TMPL_VAR NAME=USERNAME ESCAPE=HTML><br />
+<TMPL_ELSE>
+<TMPL_IF NAME=ALLOWAUTHOR>
+Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br />
+Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br />
+</TMPL_IF>
+</TMPL_IF>
+Subject: <TMPL_VAR FIELD-SUBJECT><br />
+<TMPL_VAR FIELD-EDITCONTENT><br />
+Page type: <TMPL_VAR FIELD-TYPE><br />
+<TMPL_VAR FORM-SUBMIT><br />
+<TMPL_VAR HELPONFORMATTINGLINK><br />
+A subset of HTML is allowed.<br />
+IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed in comments on this wiki.<br />
+<TMPL_VAR NAME="FORM-END">
+
+<TMPL_IF NAME="PAGE_PREVIEW">
+<hr />
+<div class="header">
+<span>Comment preview:</span>
+</div><!-- .header -->
+<div id="preview">
+<TMPL_VAR PAGE_PREVIEW>
+</div><!-- #preview -->
+</TMPL_IF>
+
+</div><!-- .comments-form -->
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 8c2ca668f..ea50fb722 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -67,6 +67,22 @@
 <TMPL_VAR CONTENT>
 </div>
 
+<TMPL_IF COMMENTS>
+<div id="comments">
+<TMPL_VAR COMMENTS>
+</div>
+
+<TMPL_UNLESS COMMENTURL>
+<div class="addcomment">Comments on this page are closed.</div>
+</TMPL_UNLESS>
+</TMPL_IF>
+
+<TMPL_IF COMMENTURL>
+<div class="addcomment">
+<a href="<TMPL_VAR COMMENTURL>">Add a comment</a>
+</div>
+</TMPL_IF>
+
 <div id="footer" class="pagefooter">
 <div id="pageinfo">