diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/atomitem.tmpl | 6 | ||||
-rw-r--r-- | templates/change.tmpl | 13 | ||||
-rw-r--r-- | templates/comment.tmpl | 59 | ||||
-rw-r--r-- | templates/commentmoderation.tmpl | 29 | ||||
-rw-r--r-- | templates/editcomment.tmpl | 30 | ||||
-rw-r--r-- | templates/editpage.tmpl | 1 | ||||
-rw-r--r-- | templates/googleform.tmpl | 4 | ||||
-rw-r--r-- | templates/inlinepage.tmpl | 10 | ||||
-rw-r--r-- | templates/misc.tmpl | 2 | ||||
-rw-r--r-- | templates/page.tmpl | 32 | ||||
-rw-r--r-- | templates/rssitem.tmpl | 3 |
11 files changed, 172 insertions, 17 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 4a99cf5ff..0e61a80f4 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -3,7 +3,10 @@ [[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]] </TMPL_IF> [[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]] -<div class="metadata"> +<TMPL_IF PERMALINK> +[[!meta permalink="<TMPL_VAR PERMALINK>"]] +</TMPL_IF> +<div id="change-<TMPL_VAR REV>" class="metadata"> <span class="desc"><br />Changed pages:</span> <span class="pagelinks"> <TMPL_LOOP NAME="PAGES"> @@ -16,7 +19,7 @@ <span class="desc"><br />Changed by:</span> <span class="committer"> <TMPL_IF NAME="AUTHORURL"> -<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR USER></a> +<a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a> <TMPL_ELSE> <TMPL_VAR USER> </TMPL_IF> @@ -24,19 +27,19 @@ <span class="desc"><br />Commit type:</span> <span class="committype"><TMPL_VAR COMMITTYPE></span> <span class="desc"><br />Date:</span> -<span class="changedate"><TMPL_VAR COMMITDATE></span> +<span class="changedate"><TMPL_VAR COMMITDATE> </div> <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..fb76ea004 --- /dev/null +++ b/templates/comment.tmpl @@ -0,0 +1,59 @@ +<div class="comment" id="<TMPL_VAR NAME=COMMENTID>"> + +<div class="comment-subject"> +<TMPL_IF PERMALINK> +<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a> +<TMPL_ELSE> +<TMPL_VAR TITLE> +</TMPL_IF> +</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> + +<TMPL_IF NAME="HAVE_ACTIONS"> +<div class="actions"> +<ul> +<TMPL_IF NAME="REMOVEURL"> +<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li> +</TMPL_IF> +</ul> +</div><!--.actions--> +</TMPL_IF> + +</div><!--.comment--> diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl new file mode 100644 index 000000000..e91d3146d --- /dev/null +++ b/templates/commentmoderation.tmpl @@ -0,0 +1,29 @@ +<TMPL_IF NAME="COMMENTS"> +<br /> +<form action="<TMPL_VAR CGIURL>" method="post"> +<input type="hidden" name="do" value="commentmoderation" /> +<input type="hidden" name="sid" value="<TMPL_VAR SID>" /> +<input type="submit" value="Submit" /> +<input type="checkbox" name="rejectalldefer" value="1" />Reject +all comments marked <em>Defer</em> +<br /> +<TMPL_LOOP NAME="COMMENTS"> +<div> +<div> +<TMPL_VAR VIEW> +</div> +<input type="radio" value="Defer" name="<TMPL_VAR ID>" checked />Defer +<input type="radio" value="Accept" name="<TMPL_VAR ID>" />Accept +<input type="radio" value="Reject" name="<TMPL_VAR ID>" />Reject +</div> +<br /> +</TMPL_LOOP> +<input type="submit" value="Submit" /> +<input type="checkbox" name="rejectalldefer" value="1" />Reject +all comments marked <em>Defer</em> +</form> +<TMPL_ELSE> +<p> +No comments need moderation at this time. +</p> +</TMPL_IF> diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl new file mode 100644 index 000000000..7590cdfd7 --- /dev/null +++ b/templates/editcomment.tmpl @@ -0,0 +1,30 @@ +<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_VAR WMD_PREVIEW> + +<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/editpage.tmpl b/templates/editpage.tmpl index 4b54db2d1..b1cf015a2 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -37,6 +37,7 @@ Optional comment about this change:<br /> </div> </TMPL_IF> <TMPL_VAR FORM-END> +<TMPL_VAR WMD_PREVIEW> <TMPL_IF NAME="PAGE_PREVIEW"> <hr /> diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl index 523cff001..e2d4a1f43 100644 --- a/templates/googleform.tmpl +++ b/templates/googleform.tmpl @@ -1,6 +1,6 @@ <form method="get" action="http://www.google.com/search" id="searchform"> <div> - <input name="sitesearch" value="<TMPL_VAR SITEFQDN>" type="hidden"> - <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text"> + <input name="sitesearch" value="<TMPL_VAR SITEFQDN>" type="hidden" /> + <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text" /> </div> </form> diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl index ffcb897a8..3c0b93315 100644 --- a/templates/inlinepage.tmpl +++ b/templates/inlinepage.tmpl @@ -5,9 +5,9 @@ <TMPL_IF NAME="AUTHOR"> <span class="author"> <TMPL_IF NAME="AUTHORURL"> -<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a> +<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a> <TMPL_ELSE> -<TMPL_VAR NAME=AUTHOR> +<TMPL_VAR AUTHOR> </TMPL_IF> </span> </TMPL_IF> @@ -35,7 +35,7 @@ Posted <TMPL_VAR CTIME> <span class="tags"> Tags: <TMPL_LOOP NAME="TAGS"> -<TMPL_VAR NAME=LINK> +<TMPL_VAR LINK> </TMPL_LOOP> </span> </TMPL_IF> @@ -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/misc.tmpl b/templates/misc.tmpl index 7f65217d1..0de56edeb 100644 --- a/templates/misc.tmpl +++ b/templates/misc.tmpl @@ -17,11 +17,13 @@ </head> <body> +<div class="pageheader"> <div class="header"> <span> <TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE> </span> </div> +</div> <!-- .pageheader --> <div id="content"> <TMPL_VAR PAGEBODY> diff --git a/templates/page.tmpl b/templates/page.tmpl index f2f9c34cc..29ba688c7 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -13,6 +13,7 @@ <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" /> </TMPL_IF> <TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF> +<TMPL_IF NAME="RELVCS"><TMPL_VAR RELVCS></TMPL_IF> <TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF> </head> <body> @@ -22,7 +23,7 @@ <span> <span class="parentlinks"> <TMPL_LOOP NAME="PARENTLINKS"> -<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ +<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/ </TMPL_LOOP> </span> <span class="title"> @@ -49,9 +50,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 +72,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"> @@ -74,7 +92,7 @@ <div class="tags"> Tags: <TMPL_LOOP NAME="TAGS"> -<TMPL_VAR NAME=LINK> +<TMPL_VAR LINK> </TMPL_LOOP> </div> </TMPL_IF> @@ -83,13 +101,13 @@ Tags: <div id="backlinks"> Links: <TMPL_LOOP NAME="BACKLINKS"> -<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a> +<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a> </TMPL_LOOP> <TMPL_IF NAME="MORE_BACKLINKS"> <span class="popup">... <span class="balloon"> <TMPL_LOOP NAME="MORE_BACKLINKS"> -<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a> +<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a> </TMPL_LOOP> </span> </span> @@ -112,13 +130,13 @@ License: <TMPL_VAR LICENSE> </TMPL_IF> <div class="pagedate"> -Last edited <TMPL_VAR NAME=MTIME> -<!-- Created <TMPL_VAR NAME=CTIME> --> +Last edited <TMPL_VAR MTIME> +<!-- Created <TMPL_VAR CTIME> --> </div> </div><!-- #pageinfo --> <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> -<!-- from <TMPL_VAR NAME=WIKINAME> --> +<!-- from <TMPL_VAR WIKINAME> --> </div><!-- .pagefooter #footer --> </body> 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> |