From 9419262b59bce30ee77847b84ab20b1fb79d06d8 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sat, 22 Jun 2013 21:07:06 +0200
Subject: [PATCH] display entry author if any

---
 src/main/resources/i18n/en.properties            | 1 +
 src/main/webapp/sass/components/_entry-list.scss | 6 ++++++
 src/main/webapp/templates/feeds.view.html        | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/src/main/resources/i18n/en.properties b/src/main/resources/i18n/en.properties
index e07bf3e5..767df2ac 100644
--- a/src/main/resources/i18n/en.properties
+++ b/src/main/resources/i18n/en.properties
@@ -45,6 +45,7 @@ toolbar.about=About
 toolbar.logout=Logout
 toolbar.donate=Donate
 
+view.entry_author=by 
 view.error_while_loading_feed=Error while loading this feed
 view.keep_unread=Keep unread
 view.no_unread_items=has no unread items.
diff --git a/src/main/webapp/sass/components/_entry-list.scss b/src/main/webapp/sass/components/_entry-list.scss
index b9153002..c611279b 100644
--- a/src/main/webapp/sass/components/_entry-list.scss
+++ b/src/main/webapp/sass/components/_entry-list.scss
@@ -95,6 +95,12 @@
 	margin-top: 5px;
 }
 
+#feed-accordion .entry-body .entry-author {
+	display: block;
+	font-size: 14px;
+	font-weight: normal;
+}
+
 #feed-accordion .entry-body img {
 	display: block;
 }
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index cc82db8e..8b0a1433 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -35,8 +35,13 @@
 				<div class="entry-header">
 					<h4 class="entry-title">
 						<a href="{{entry.url}}" target="_blank" ng-bind-html-unsafe="entry.title"></a>
+						<span class="entry-author" ui-if="entry.author">
+							<span class="entry-author-prefix">${view.entry_author}</span>
+							<span class="entry-author-name">{{entry.author}}</span>
+						</span>
 					</h4>
 				</div>
+
 				<div class="entry-body-content">
 					<div ng-bind-html-unsafe="entry.content"></div>
 					<video controls ui-if="entry.enclosureType && entry.enclosureType.indexOf('video') == 0">