From e2c36caeee4260ea35b79c70de79cdbb8ad5ec9d Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Wed, 3 Jan 2018 13:14:14 -0800
Subject: [PATCH] =?UTF-8?q?Move=20favicons=20in=20the=20detail=20view=20to?=
 =?UTF-8?q?=20the=20right.=20They=E2=80=99re=20show=20when=20available=20a?=
 =?UTF-8?q?nd=20there=E2=80=99s=20no=20other=20feed=20icon=20or=20user=20a?=
 =?UTF-8?q?vatar.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Evergreen/MainWindow/Detail/ArticleRenderer.swift | 8 +++++---
 Evergreen/MainWindow/Detail/template.html         | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Evergreen/MainWindow/Detail/ArticleRenderer.swift b/Evergreen/MainWindow/Detail/ArticleRenderer.swift
index e2e523b56..ca73dde0d 100644
--- a/Evergreen/MainWindow/Detail/ArticleRenderer.swift
+++ b/Evergreen/MainWindow/Detail/ArticleRenderer.swift
@@ -173,7 +173,8 @@ class ArticleRenderer {
 		d["avatars"] = ""
 		var didAddAvatar = false
 		if let avatarHTML = avatarImgTag() {
-			d["avatars"] = avatarHTML
+//			d["avatars"] = avatarHTML
+			d["avatars"] = "<td class=\"header rightAlign avatar\">\(avatarHTML)</td>";
 			didAddAvatar = true
 		}
 
@@ -187,10 +188,11 @@ class ArticleRenderer {
 		d["feedlink"] = feedLink
 		d["feedlink_withfavicon"] = feedLink
 
-		d["favicon"] = ""
+//		d["favicon"] = ""
 		if !didAddAvatar, let feed = article.feed {
 			if let favicon = faviconImgTag(forFeed: feed) {
-				d["favicon"] = favicon
+				d["avatars"] = "<td class=\"header rightAlign\">\(favicon)</td>";
+//				d["favicon"] = favicon
 			}
 		}
 
diff --git a/Evergreen/MainWindow/Detail/template.html b/Evergreen/MainWindow/Detail/template.html
index ed5dd7d00..0a04b9615 100644
--- a/Evergreen/MainWindow/Detail/template.html
+++ b/Evergreen/MainWindow/Detail/template.html
@@ -3,8 +3,8 @@
 <div class="headerContainer">
 	<table cellpadding=0 cellspacing=0 border=0 class="headerTable">
 	<tr>
-		<td class="header leftAlign">[[favicon]] <b>[[feedlink]]</b><br />[[byline]]</td>
-		<td class="header rightAlign avatar">[[avatars]]</td>
+		<td class="header leftAlign"><b>[[feedlink]]</b><br />[[byline]]</td>
+		[[avatars]]
 	</tr>
 </table>
 </div>