diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2008-12-20 17:58:56 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2008-12-20 17:58:56 -0500 |
| commit | 0f03af381625bc16d51140a949ded304c3686e7b (patch) | |
| tree | 4b3d2794ab490e279176337e32e416e6a4879ef7 /templates | |
| parent | 92b48bab99e04e7c041434e106179822bd2b1e88 (diff) | |
| parent | f94665800c9353f2b0f190190c0490f51a897973 (diff) | |
Merge commit 'smcv/comments'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/comment.tmpl | 37 | ||||
| -rw-r--r-- | templates/page.tmpl | 9 |
2 files changed, 31 insertions, 15 deletions
diff --git a/templates/comment.tmpl b/templates/comment.tmpl index 19698cd33..2fb54fe7d 100644 --- a/templates/comment.tmpl +++ b/templates/comment.tmpl @@ -2,27 +2,44 @@ <div class="comment-header"> Posted by + <TMPL_IF NAME="COMMENTUSER"> <span class="author"> +<TMPL_IF NAME="COMMENTOPENID"> + +<img src="/wikiicons/openid.png" width="20" height="15" alt="[OpenID]" + title="Signed in with OpenID" /> +<a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a> + +<TMPL_ELSE> + +<img src="/wikiicons/signedin.png" width="15" height="15" alt="[Signed in]" + title="Signed in directly" /> <TMPL_IF NAME="COMMENTAUTHORURL"> <a href="<TMPL_VAR NAME=COMMENTAUTHORURL>"><TMPL_VAR NAME=COMMENTAUTHOR></a> <TMPL_ELSE> -<TMPL_VAR NAME=AUTHOR> +<TMPL_VAR NAME=COMMENTAUTHOR> +</TMPL_IF> + </TMPL_IF> </span> -<TMPL_ELSE> + +<TMPL_ELSE><!-- !COMMENTUSER --> + <TMPL_IF NAME=COMMENTIP> -<span class="author"> -<TMPL_VAR NAME=COMMENTIP> -</span> +<span class="author" title="Unauthenticated, from <TMPL_VAR NAME=COMMENTIP>"> +<TMPL_ELSE><!-- !COMMENTIP --> +<span class="author" title="Unauthenticated, from unknown IP address"> +</TMPL_IF> +<img src="/wikiicons/anonymous.png" width="15" height="15" alt="[Unauthenticated]" /> +<TMPL_IF NAME="AUTHORURL"> +<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a> <TMPL_ELSE> -unknown IP address +<TMPL_VAR NAME=AUTHOR> </TMPL_IF> +</span> -<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_IF><!-- !COMMENTUSER --> (<TMPL_VAR CTIME>) </div> diff --git a/templates/page.tmpl b/templates/page.tmpl index 21abc979d..f75491127 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -74,13 +74,12 @@ <TMPL_IF COMMENTS> <div id="comments"> <TMPL_VAR COMMENTS> -<TMPL_UNLESS COMMENTURL> -<div class="addcomment">Comments on this page are closed.</div> -</TMPL_UNLESS> -<TMPL_IF COMMENTURL> +<TMPL_IF ADDCOMMENTURL> <div class="addcomment"> -<a href="<TMPL_VAR COMMENTURL>">Add a comment</a> +<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> |