From 9e889c39ed9971e31dc33f4dea73a91d6938b535 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Dec 2008 20:01:08 +0000
Subject: comments: Rename COMMENTURL to ADDCOMMENTURL to avoid confusion with
 COMMENTAUTHORURL

Also refactor page.tmpl to use if/else rather than unless/if.
---
 templates/page.tmpl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'templates')

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>
-- 
cgit v1.2.3


From 045cbb2a14aa03a758fc2b5d3bf31e14113446ec Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Thu, 18 Dec 2008 20:28:41 +0000
Subject: comments_display: display (?) for anon users, {x} for OpenIDs and {*}
 for local logins

This is a mockup of Joey's idea; to do it properly, the icons should
move to the basewiki or to a comments underlay, and {x} should be
replaced with an OpenID logo (if one with clear licensing even exists).
---
 templates/comment.tmpl | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

(limited to 'templates')

diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 19698cd33..3f2978675 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="/smileys/star_off.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="/smileys/star_on.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="/smileys/question.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>
-- 
cgit v1.2.3


From f94665800c9353f2b0f190190c0490f51a897973 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Sat, 20 Dec 2008 17:39:55 +0000
Subject: comment.tmpl: make anon/OpenID/signed-in icons independent of smileys

---
 doc/wikiicons/anonymous.png | Bin 0 -> 302 bytes
 doc/wikiicons/openid.png    | Bin 0 -> 297 bytes
 doc/wikiicons/signedin.png  | Bin 0 -> 370 bytes
 templates/comment.tmpl      |   6 +++---
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 doc/wikiicons/anonymous.png
 create mode 100644 doc/wikiicons/openid.png
 create mode 100644 doc/wikiicons/signedin.png

(limited to 'templates')

diff --git a/doc/wikiicons/anonymous.png b/doc/wikiicons/anonymous.png
new file mode 100644
index 000000000..df22152e6
Binary files /dev/null and b/doc/wikiicons/anonymous.png differ
diff --git a/doc/wikiicons/openid.png b/doc/wikiicons/openid.png
new file mode 100644
index 000000000..c5535c3de
Binary files /dev/null and b/doc/wikiicons/openid.png differ
diff --git a/doc/wikiicons/signedin.png b/doc/wikiicons/signedin.png
new file mode 100644
index 000000000..969908d39
Binary files /dev/null and b/doc/wikiicons/signedin.png differ
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 3f2978675..2fb54fe7d 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -7,13 +7,13 @@ Posted by
 <span class="author">
 <TMPL_IF NAME="COMMENTOPENID">
 
-<img src="/smileys/star_off.png" width="20" height="15" alt="[OpenID]"
+<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="/smileys/star_on.png" width="15" height="15" alt="[Signed in]"
+<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>
@@ -31,7 +31,7 @@ Posted by
 <TMPL_ELSE><!-- !COMMENTIP -->
 <span class="author" title="Unauthenticated, from unknown IP address">
 </TMPL_IF>
-<img src="/smileys/question.png" width="15" height="15" alt="[Unauthenticated]" />
+<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>
-- 
cgit v1.2.3