From 1b25052b79d18b8b7af4eae95358ae0635da46a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?=
 <bombe@pterodactylus.net>
Date: Wed, 7 Dec 2011 07:24:12 +0100
Subject: [PATCH] Show custom avatar where applicable.

---
 src/main/resources/static/css/sone.css             | 22 ++++++++++++++++++++++
 src/main/resources/templates/include/head.html     | 20 +++++++++++++-------
 src/main/resources/templates/include/soneMenu.html |  8 +++++++-
 src/main/resources/templates/include/viewPost.html |  6 +++++-
 .../resources/templates/include/viewReply.html     |  6 +++++-
 5 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index fc09d95..d5880b1 100644
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -171,6 +171,14 @@ textarea {
 	margin-bottom: 1ex;
 }
 
+#sone .profile-avatar {
+	display: inline-block;
+	width: 80px;
+	height: 80px;
+	overflow: hidden;
+	position: absolute;
+}
+
 #sone .profile-link {
 	font-weight: bold;
 	color: rgb(28, 131, 191);
@@ -280,6 +288,13 @@ textarea {
 	margin-right: 1ex;
 }
 
+#sone .menu-avatar {
+	display: inline-block;
+	width: 48px;
+	height: 48px;
+	overflow: hidden;
+}
+
 #sone .post .sone-menu .inner-menu {
 	margin-left: 64px;
 	padding-left: 1ex;
@@ -445,6 +460,13 @@ textarea {
 	position: absolute;
 }
 
+#sone .reply-avatar {
+	display: inline-block;
+	width: 36px;
+	height: 36px;
+	overflow: hidden;
+}
+
 #sone .post .reply > .inner-part {
 	margin-left: 36px;
 	padding-left: 0.5em;
diff --git a/src/main/resources/templates/include/head.html b/src/main/resources/templates/include/head.html
index ae642dc..efb5ddf 100644
--- a/src/main/resources/templates/include/head.html
+++ b/src/main/resources/templates/include/head.html
@@ -40,13 +40,19 @@
 		</div>
 
 		<div id="profile" class="<%ifnull currentSone>offline<%else>online<%/if>">
-			<a class="picture" href="index.html">
-				<%ifnull !currentSone>
-					<img src="/WebOfTrust/GetIdenticon?identity=<% currentSone.id|html>&amp;width=80&amp;height=80" width="80" height="80" alt="Profile Avatar" />
-				<%else>
-					<img src="images/sone.png" width="80" height="80" alt="Sone is offline" />
-				<%/if>
-			</a>
+			<div class="avatar profile-avatar">
+				<a class="picture" href="index.html">
+					<%ifnull !currentSone>
+						<%ifnull !currentSone.avatar>
+							<%currentSone.avatar|image-link max-width=80 max-height=80 mode=enlarge title="Profile Avatar">
+						<%else>
+							<img src="/WebOfTrust/GetIdenticon?identity=<% currentSone.id|html>&amp;width=80&amp;height=80" width="80" height="80" alt="Profile Avatar" />
+						<%/if>
+					<%else>
+						<img src="images/sone.png" width="80" height="80" alt="Sone is offline" />
+					<%/if>
+				</a>
+			</div>
 			<%ifnull ! currentSone>
 				<div id="home-sone">
 					<% currentSone|store key=sone>
diff --git a/src/main/resources/templates/include/soneMenu.html b/src/main/resources/templates/include/soneMenu.html
index 128e389..6684ee6 100644
--- a/src/main/resources/templates/include/soneMenu.html
+++ b/src/main/resources/templates/include/soneMenu.html
@@ -1,6 +1,12 @@
 <div class="sone-menu <% class|css|html>">
 	<div class="sone-menu-id hidden"><%sone.id|html></div>
-	<img class="avatar" src="/WebOfTrust/GetIdenticon?identity=<%sone.id|html>&amp;width=64&amp;height=64" width="64" height="64" alt="Avatar Image" />
+	<div class="avatar menu-avatar">
+		<%ifnull !sone.avatar>
+			<%sone.avatar|image-link max-width=64 max-height=64 mode=enlarge title==sone.niceName>
+		<%else>
+			<img src="/WebOfTrust/GetIdenticon?identity=<%sone.id|html>&amp;width=64&amp;height=64" width="64" height="64" alt="Avatar Image" />
+		<%/if>
+	</div>
 	<div class="inner-menu">
 		<div>
 			<a class="author" href="viewSone.html?sone=<%sone.id|html>"><%sone.niceName|html></a>
diff --git a/src/main/resources/templates/include/viewPost.html b/src/main/resources/templates/include/viewPost.html
index a478bba..fd54e5d 100644
--- a/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@ -6,7 +6,11 @@
 	<%include include/soneMenu.html class=="sone-post-menu" sone=post.sone>
 	<div class="avatar post-avatar" >
 		<%if post.loaded>
-			<img src="/WebOfTrust/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
+			<%ifnull !post.sone.avatar>
+				<%post.sone.avatar|image-link max-width=48 max-height=48 mode=enlarge title="Avatar Image">
+			<%else>
+				<img src="/WebOfTrust/GetIdenticon?identity=<% post.sone.id|html>&amp;width=48&height=48" width="48" height="48" alt="Avatar Image" />
+			<%/if>
 		<%else>
 			<img src="images/sone-avatar.png" width="48" height="48" alt="Avatar Image" />
 		<%/if>
diff --git a/src/main/resources/templates/include/viewReply.html b/src/main/resources/templates/include/viewReply.html
index f8e3e64..3d9c33e 100644
--- a/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@ -5,7 +5,11 @@
 	<div class="reply-author-local hidden"><% reply.sone.local></div>
 	<%include include/soneMenu.html class=="sone-reply-menu" sone=reply.sone>
 	<div class="avatar reply-avatar">
-		<img src="/WebOfTrust/GetIdenticon?identity=<% reply.sone.id|html>&amp;width=36&height=36" width="36" height="36" alt="Avatar Image" />
+		<%ifnull !reply.sone.avatar>
+			<% reply.sone.avatar|image-link max-width=36 max-height=36 mode=enlarge title="Avatar Image">
+		<%else>
+			<img src="/WebOfTrust/GetIdenticon?identity=<% reply.sone.id|html>&amp;width=36&height=36" width="36" height="36" alt="Avatar Image" />
+		<%/if>
 	</div>
 	<div class="inner-part">
 		<div>
-- 
2.7.4