From f8cc87e8ee68d83eced465e90e9fd657646ad3c8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 20 Dec 2008 18:46:56 -0500
Subject: [PATCH 1/2] remove signin icons, use title

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

diff --git a/doc/wikiicons/anonymous.png b/doc/wikiicons/anonymous.png
deleted file mode 100644
index df22152e637c79cac1712bb3df68482a86085e07..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K13?z9tQY(N|V1Q4EE0F&GisAn`hW{rS{>^3h
zzlGudU*Z4%CcnSUP+tm^WVnBp;s5{R=l3!2^D*pS&+z{#gT6My{7FE;*YYw9@!<^j
zH!!^4!?1rkLw*{AtE=m)?jB2^HpY@5zhDN3XE)M7oFs2|7p{y8U&4T#I!_nJ5RU7i
z{hnfn4LF>2=T!8xFME09FMrgA*RES1d4FI?4q0R5edhb&>Zra6#S9tJZ1VS>elBdA
zfAC&w)luzKf$TQ|OZmPsYx4>zi!4~ev0K|Y^p&npS+l76<Row27gqMYLYt46d=o6a
td0|&9yWq{|zqbawzwdhczWeL_`rGW-cW!aIxEJUW22WQ%mvv4FO#nBOcM<>q

diff --git a/doc/wikiicons/openid.png b/doc/wikiicons/openid.png
deleted file mode 100644
index c5535c3de1c3f6beb21d50f9522c57f737239ea3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K23?xtf=%@rz1_3@Hu1`cc&OHA8>i7TMxBqRt
z_V4oB|CgTpT66i|wj2KrKKy^=-k*D~e%$%=f9H+AH=h6e|Nnn;p>_&TFJnoNUoeBi
zvm0q3PLj8~3quF1tOt<8S>O>_%)r1c48n{Iv*t(u1=&kHeO=kFGV_RXFa)M@9tR2)
zdAc};a9mGLNJtQfKfu7aj!$4#Zk<BQ!J0VcGvXru|HlUOG#*TPcI1D2y5GJ70l(x~
z{)reYInpfQE+nyIcH<ZS`~_KY3no~3NVos{|3BWLNB95!fB)w&q;UMpFZ`9vkg~=`
nZ-QJE<B5uk#}Cx1HZn3?J)(cUuzclDpzREvu6{1-oD!M<<o|oV

diff --git a/doc/wikiicons/signedin.png b/doc/wikiicons/signedin.png
deleted file mode 100644
index 969908d39e264e561d47c409eb10917f4929c6fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K13?z9tQY(N|LV!<*>rWmIG10lxC#dM^T?z>Z
z?w$DJ|8KE>KlJ^4*Gftr)6<QfJ3a2-SN@X+6m!!1N($E(=NU}uoA&fJ>$@kMYd5}i
zbiVfa1^d3kA7;&aRoD3J_T`{`+gMJW{}klk9uvJQKJg**stRGCU5q6`e!&b5&u*lF
zI7!~_E({&4vK~MVXMsm#F#`iPP!+c@Bg3pY5<o%r5>H=O_N&Z1q8zeD$*FQcp>9tX
z#}E!#--D4%%?doM2aXFFaD`pexFz<k{`9VzE0Pa36&{@|DapU{$NRSZR=fNPPP?R(
ziB~G0YVgo}`ZV^%>`NOOs_P3BE#9l2K9Q5W!zX_=$B&M#hZ|m8TVvt*-if2zbcg5j
zpjm2XcdSYCzx7Ha^jK#0r3F1w_qII>iC)by^LALltll#WVTnw2QB~}V=X^5Z13HVr
M)78&qol`;+0MD|KUjP6A

diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index b419404ea..f26cf6d05 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -4,28 +4,20 @@
 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,9 +28,7 @@ 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>)

From 5c669ab2266429b7a9e3a69478092a4e3e7b8e74 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 21 Dec 2008 01:04:19 -0500
Subject: [PATCH 2/2] comment layout change

I saw a layout similar to this on blogger, and I sorta like it

The dash avoids parens sitting next to each other in some cases.
---
 doc/style.css          |  1 +
 templates/comment.tmpl | 17 ++++++++---------
 2 files changed, 9 insertions(+), 9 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/templates/comment.tmpl b/templates/comment.tmpl
index f26cf6d05..6f2b1619e 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -1,7 +1,13 @@
 <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">
 <TMPL_IF NAME="COMMENTOPENID">
@@ -31,13 +37,6 @@ By
 </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-->