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
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/wikiicons/anonymous.png
 create mode 100644 doc/wikiicons/openid.png
 create mode 100644 doc/wikiicons/signedin.png

(limited to 'doc/wikiicons')

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


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: 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

(limited to 'doc/wikiicons')

diff --git a/doc/wikiicons/anonymous.png b/doc/wikiicons/anonymous.png
deleted file mode 100644
index df22152e6..000000000
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
index c5535c3de..000000000
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
index 969908d39..000000000
Binary files a/doc/wikiicons/signedin.png and /dev/null differ
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>)
-- 
cgit v1.2.3


From c256a53fcbc8fb6faafefd71dcdb0059db085dd9 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 28 Dec 2008 16:19:47 -0500
Subject: Replace blank OpenID placeholder logo with an unofficial OpenID logo
 developed by Anna Hess. The official logo does not seem destined to be free.

---
 debian/changelog                 |   3 +++
 doc/wikiicons/openidlogin-bg.gif | Bin 142 -> 336 bytes
 2 files changed, 3 insertions(+)

(limited to 'doc/wikiicons')

diff --git a/debian/changelog b/debian/changelog
index 66db70288..cba0276c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ ikiwiki (3.00) UNRELEASED; urgency=low
   * embed: This plugin is deprecated, use htmlscrubber_skip instead.
     Closes: ##462970.
   * Version 3.00 of the plugin API.
+  * Replace blank OpenID placeholder logo with an unofficial OpenID
+    logo developed by Anna Hess. The official logo does not seem destined to
+    be free.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500
 
diff --git a/doc/wikiicons/openidlogin-bg.gif b/doc/wikiicons/openidlogin-bg.gif
index c8f43d08e..a3bfe1098 100644
Binary files a/doc/wikiicons/openidlogin-bg.gif and b/doc/wikiicons/openidlogin-bg.gif differ
-- 
cgit v1.2.3