Merge commit 'origin/comments' into comments-joey

diff --git a/doc/style.css b/doc/style.css
index 1fabf6b29fcbbab0aff9459fd1cc44b11816bea5..81a260afd78ef97a18d9ef4727c12627cc37bd00 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -375,6 +375,7 @@ span.color {
 
 .comment-header {
        font-style: italic;
+       margin-top: .3em;
 }
 .comment .author {
        font-weight: bold;

diff --git a/doc/wikiicons/anonymous.png b/doc/wikiicons/anonymous.png
deleted file mode 100644 (file)
index df22152..0000000
Binary files a/doc/wikiicons/anonymous.png and /dev/null differ

diff --git a/doc/wikiicons/openid.png b/doc/wikiicons/openid.png
deleted file mode 100644 (file)
index c5535c3..0000000
Binary files a/doc/wikiicons/openid.png and /dev/null differ

diff --git a/doc/wikiicons/signedin.png b/doc/wikiicons/signedin.png
deleted file mode 100644 (file)
index 969908d..0000000
Binary files a/doc/wikiicons/signedin.png and /dev/null differ

diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index b419404ea68a2a8e10f447c16323628300abfa39..6f2b1619ef08127f17bc2fc03049be5353bbab0d 100644 (file)
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,31 +1,29 @@
 <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">
-By
+Comment by
 
 <TMPL_IF NAME="COMMENTUSER">
-<span class="author">
 <TMPL_IF NAME="COMMENTOPENID">
-
+<span class="author" title="OpenID">
 <a href="<TMPL_VAR NAME=COMMENTOPENID>"><TMPL_VAR NAME=COMMENTAUTHOR></a>
-<img src="/wikiicons/openid.png" width="20" height="15" alt="[OpenID]"
-    title="Signed in with OpenID" />
-
+</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>
-<img src="/wikiicons/signedin.png" width="15" height="15" alt="[Signed in]"
-    title="Signed in directly" />
-
 </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 -->
@@ -36,18 +34,9 @@ By
 <TMPL_ELSE>
 <TMPL_VAR NAME=AUTHOR>
 </TMPL_IF>
-<img src="/wikiicons/anonymous.png" width="15" height="15" alt="[Unauthenticated]" />
 </span>
-
 </TMPL_IF><!-- !COMMENTUSER -->
 
-(<TMPL_VAR CTIME>)
+&mdash; <TMPL_VAR CTIME>
 </div>
-
-<div class="comment-subject"><a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a></div>
-
-<div class="inlinecontent">
-<TMPL_VAR CONTENT>
-</div>
-
 </div><!--.comment-->