diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/atomitem.tmpl | 6 | ||||
| -rw-r--r-- | templates/change.tmpl | 4 | ||||
| -rw-r--r-- | templates/comment.tmpl | 42 | ||||
| -rw-r--r-- | templates/editcomment.tmpl | 29 | ||||
| -rw-r--r-- | templates/inlinepage.tmpl | 4 | ||||
| -rw-r--r-- | templates/page.tmpl | 17 | ||||
| -rw-r--r-- | templates/rssitem.tmpl | 3 |
7 files changed, 103 insertions, 2 deletions
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl index 1ff7f4f4e..768695a2c 100644 --- a/templates/atomitem.tmpl +++ b/templates/atomitem.tmpl @@ -39,4 +39,10 @@ <TMPL_VAR CONTENT ESCAPE=HTML> </content> </TMPL_IF> + <TMPL_IF NAME="COMMENTSURL"> + <link rel="comments" href="<TMPL_VAR NAME="COMMENTSURL">" type="text/html" /> + </TMPL_IF> + <TMPL_IF NAME="ATOMCOMMENTSURL"> + <link rel="comments" href="<TMPL_VAR NAME="ATOMCOMMENTSURL">" type="application/atom+xml" /> + </TMPL_IF> </entry> diff --git a/templates/change.tmpl b/templates/change.tmpl index 0aebae61e..0e61a80f4 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -32,14 +32,14 @@ <div class=changelog> <TMPL_LOOP NAME="MESSAGE"> <TMPL_IF NAME="LINE"> -<TMPL_VAR NAME="LINE" ESCAPE="HTML"><br /> +<TMPL_VAR NAME="LINE"><br /> </TMPL_IF> </TMPL_LOOP> </div> <TMPL_IF NAME="DIFF"> <div class=diff> <pre> -<TMPL_VAR NAME="DIFF" ESCAPE="HTML"> +<TMPL_VAR NAME="DIFF"> </pre> </div> </TMPL_IF> diff --git a/templates/comment.tmpl b/templates/comment.tmpl new file mode 100644 index 000000000..6f2b1619e --- /dev/null +++ b/templates/comment.tmpl @@ -0,0 +1,42 @@ +<div class="comment" id="<TMPL_VAR NAME=INLINEPAGE>"> + +<div class="comment-subject"><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a></div> + +<div class="inlinecontent"> +<TMPL_VAR CONTENT> +</div> + +<div class="comment-header"> +Comment by + +<TMPL_IF NAME="COMMENTUSER"> +<TMPL_IF NAME="COMMENTOPENID"> +<span class="author" title="OpenID"> +<a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a> +</span> +<TMPL_ELSE> +<span class="author" title="Signed in"> +<TMPL_IF NAME="COMMENTAUTHORURL"> +<a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a> +<TMPL_ELSE> +<TMPL_VAR NAME=COMMENTAUTHOR> +</TMPL_IF> +</span> +</TMPL_IF> +<TMPL_ELSE><!-- !COMMENTUSER --> +<TMPL_IF NAME=COMMENTIP> +<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>"> +<TMPL_ELSE><!-- !COMMENTIP --> +<span class="author" title="Unauthenticated, from unknown IP address"> +</TMPL_IF> +<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><!-- !COMMENTUSER --> + +— <TMPL_VAR CTIME> +</div> +</div><!--.comment--> diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl new file mode 100644 index 000000000..891bcae65 --- /dev/null +++ b/templates/editcomment.tmpl @@ -0,0 +1,29 @@ +<div class="editcomment"> +<TMPL_VAR MESSAGE> +<TMPL_VAR FORM-START> +<TMPL_VAR FIELD-DO> +<TMPL_VAR FIELD-SID> +<TMPL_VAR FIELD-PAGE> +<TMPL_UNLESS NAME=USERNAME> +<TMPL_IF NAME=ALLOWAUTHOR> +Name: <TMPL_VAR NAME=FIELD-AUTHOR> (optional)<br /> +Website: <TMPL_VAR NAME=FIELD-URL> (optional)<br /> +</TMPL_IF> +</TMPL_UNLESS> +Subject: <TMPL_VAR FIELD-SUBJECT><br /> +<TMPL_VAR FIELD-EDITCONTENT><br /> +<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><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><!-- .editcomment --> diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl index 984d33cef..3c0b93315 100644 --- a/templates/inlinepage.tmpl +++ b/templates/inlinepage.tmpl @@ -58,9 +58,13 @@ License: <TMPL_VAR LICENSE> <TMPL_IF NAME="EDITURL"> <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li> </TMPL_IF> +<TMPL_IF NAME="COMMENTSLINK"> +<li><TMPL_VAR COMMENTSLINK></li> +<TMPL_ELSE> <TMPL_IF NAME="DISCUSSIONLINK"> <li><TMPL_VAR DISCUSSIONLINK></li> </TMPL_IF> +</TMPL_IF> </ul> </div><!--.actions--> </TMPL_IF> diff --git a/templates/page.tmpl b/templates/page.tmpl index 8c2ca668f..f75491127 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -49,9 +49,13 @@ <TMPL_IF NAME="PREFSURL"> <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li> </TMPL_IF> +<TMPL_IF NAME="COMMENTSLINK"> +<li><TMPL_VAR COMMENTSLINK><br /></li> +<TMPL_ELSE> <TMPL_IF NAME="DISCUSSIONLINK"> <li><TMPL_VAR DISCUSSIONLINK><br /></li> </TMPL_IF> +</TMPL_IF> </ul> </div> </TMPL_IF> @@ -67,6 +71,19 @@ <TMPL_VAR CONTENT> </div> +<TMPL_IF COMMENTS> +<div id="comments"> +<TMPL_VAR COMMENTS> +<TMPL_IF ADDCOMMENTURL> +<div class="addcomment"> +<a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a> +</div> +<TMPL_ELSE> +<div class="addcomment">Comments on this page are closed.</div> +</TMPL_IF> +</div> +</TMPL_IF> + <div id="footer" class="pagefooter"> <div id="pageinfo"> diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl index 42936a668..a61b92b61 100644 --- a/templates/rssitem.tmpl +++ b/templates/rssitem.tmpl @@ -23,4 +23,7 @@ <TMPL_ELSE> <description><TMPL_VAR CONTENT ESCAPE=HTML></description> </TMPL_IF> + <TMPL_IF NAME="COMMENTSURL"> + <comments><TMPL_VAR NAME="COMMENTSURL"></comments> + </TMPL_IF> </item> |