FreshRSS/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire.git synced 2025-02-03 20:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move favicons in the detail view to the right. They’re show when available and there’s no other feed icon or user avatar.

Browse Source
This commit is contained in:
Brent Simmons 2018-01-03 13:14:14 -08:00
parent 4bb5270860
commit e2c36caeee
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Evergreen/MainWindow/Detail/ArticleRenderer.swift
View File

@ -173,7 +173,8 @@ class ArticleRenderer {
d["avatars"] = "" d["avatars"] = ""
var didAddAvatar = false var didAddAvatar = false
if let avatarHTML = avatarImgTag() { if let avatarHTML = avatarImgTag() {
d["avatars"] = avatarHTML // d["avatars"] = avatarHTML
d["avatars"] = "<td class=\"header rightAlign avatar\">\(avatarHTML)</td>";
didAddAvatar = true didAddAvatar = true
} }
@ -187,10 +188,11 @@ class ArticleRenderer {
d["feedlink"] = feedLink d["feedlink"] = feedLink
d["feedlink_withfavicon"] = feedLink d["feedlink_withfavicon"] = feedLink
d["favicon"] = "" // d["favicon"] = ""
if !didAddAvatar, let feed = article.feed { if !didAddAvatar, let feed = article.feed {
if let favicon = faviconImgTag(forFeed: feed) { if let favicon = faviconImgTag(forFeed: feed) {
d["favicon"] = favicon d["avatars"] = "<td class=\"header rightAlign\">\(favicon)</td>";
// d["favicon"] = favicon
} }
} }

4
Evergreen/MainWindow/Detail/template.html
View File

@ -3,8 +3,8 @@
<div class="headerContainer"> <div class="headerContainer">
<table cellpadding=0 cellspacing=0 border=0 class="headerTable"> <table cellpadding=0 cellspacing=0 border=0 class="headerTable">
<tr> <tr>
<td class="header leftAlign">[[favicon]] <b>[[feedlink]]</b><br />[[byline]]</td> <td class="header leftAlign"><b>[[feedlink]]</b><br />[[byline]]</td>
<td class="header rightAlign avatar">[[avatars]]</td> [[avatars]]
</tr> </tr>
</table> </table>
</div> </div>