Merge branch 'comments'

master
Joey Hess 2008-12-21 12:48:14 -05:00
commit b2842b8838
5 changed files with 13 additions and 23 deletions

View File

@ -375,6 +375,7 @@ span.color {
.comment-header { .comment-header {
font-style: italic; font-style: italic;
margin-top: .3em;
} }
.comment .author { .comment .author {
font-weight: bold; font-weight: bold;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 370 B

View File

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