summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2008-12-21 12:48:14 -0500
committerJoey Hess <joey@gnu.kitenet.net>2008-12-21 12:48:14 -0500
commitb2842b88385acb68569f00ed45b49f0cf5383983 (patch)
tree1bfe40589d9fef93a4901838908f0f842dff1018
parent3b0aa2fcba3d9474ad58c0a3c30a3853298be692 (diff)
parent5c669ab2266429b7a9e3a69478092a4e3e7b8e74 (diff)
Merge branch 'comments'
-rw-r--r--doc/style.css1
-rw-r--r--doc/wikiicons/anonymous.pngbin302 -> 0 bytes
-rw-r--r--doc/wikiicons/openid.pngbin297 -> 0 bytes
-rw-r--r--doc/wikiicons/signedin.pngbin370 -> 0 bytes
-rw-r--r--templates/comment.tmpl35
5 files changed, 13 insertions, 23 deletions
diff --git a/doc/style.css b/doc/style.css
index 1fabf6b29..81a260afd 100644
--- 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
index df22152e6..000000000
--- a/doc/wikiicons/anonymous.png
+++ /dev/null
Binary files differ
diff --git a/doc/wikiicons/openid.png b/doc/wikiicons/openid.png
deleted file mode 100644
index c5535c3de..000000000
--- a/doc/wikiicons/openid.png
+++ /dev/null
Binary files differ
diff --git a/doc/wikiicons/signedin.png b/doc/wikiicons/signedin.png
deleted file mode 100644
index 969908d39..000000000
--- a/doc/wikiicons/signedin.png
+++ /dev/null
Binary files differ
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index b419404ea..6f2b1619e 100644
--- 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-->