From 6bd3848be1c8bbd15813193498e199c3bb989c85 Mon Sep 17 00:00:00 2001
From: Athou <jeremie.panzer@erasme.ulb.ac.be>
Date: Tue, 9 Apr 2013 12:03:03 +0200
Subject: [PATCH] fix #28

---
 src/main/java/com/commafeed/frontend/model/Entry.java    | 9 +++++++++
 .../commafeed/frontend/rest/resources/EntriesREST.java   | 1 +
 src/main/webapp/css/app.css                              | 3 ++-
 src/main/webapp/js/directives.js                         | 2 +-
 src/main/webapp/templates/feeds.view.html                | 7 +++++--
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/model/Entry.java b/src/main/java/com/commafeed/frontend/model/Entry.java
index f8b1ae57..bdcd7936 100644
--- a/src/main/java/com/commafeed/frontend/model/Entry.java
+++ b/src/main/java/com/commafeed/frontend/model/Entry.java
@@ -12,6 +12,7 @@ public class Entry implements Serializable {
 	private Date date;
 	private String feedId;
 	private String feedName;
+	private String feedUrl;
 	private String url;
 	private boolean read;
 	private boolean starred;
@@ -88,4 +89,12 @@ public class Entry implements Serializable {
 		this.starred = starred;
 	}
 
+	public String getFeedUrl() {
+		return feedUrl;
+	}
+
+	public void setFeedUrl(String feedUrl) {
+		this.feedUrl = feedUrl;
+	}
+
 }
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java b/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
index c5f91f0b..c95b3bb3 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/EntriesREST.java
@@ -112,6 +112,7 @@ public class EntriesREST extends AbstractREST {
 
 		entry.setFeedName(status.getSubscription().getTitle());
 		entry.setFeedId(String.valueOf(status.getSubscription().getId()));
+		entry.setFeedUrl(status.getSubscription().getFeed().getLink());
 
 		return entry;
 	}
diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css
index 4330a3d9..c45b1a66 100644
--- a/src/main/webapp/css/app.css
+++ b/src/main/webapp/css/app.css
@@ -101,6 +101,7 @@
 	white-space: nowrap;
 	position: absolute;
 	width: 145px;
+	text-overflow: ellipsis;
 }
 
 #feed-accordion .entry-heading .entry-name {
@@ -147,7 +148,7 @@
 	border-top: 1px solid #ebebeb;
 }
 
-#feed-accordion .entry-buttons label{
+#feed-accordion .entry-buttons label {
 	margin-bottom: 0px
 }
 
diff --git a/src/main/webapp/js/directives.js b/src/main/webapp/js/directives.js
index dcdf2aef..2c5a4c8f 100644
--- a/src/main/webapp/js/directives.js
+++ b/src/main/webapp/js/directives.js
@@ -8,7 +8,7 @@ module.directive('favicon', function() {
 		},
 		replace : true,
 		template : '<img ng-src="favicon?url={{url}}" width="16" height="16"></img>'
-	}
+	};
 });
 
 module.directive('ngBlur', function() {
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index d4544fa6..80e7220f 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -9,9 +9,12 @@
 		<div ng-repeat="entry in entries" class="entry" scroll-to="isOpen && current == entry" scroll-to-offset="-58">
 			<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="entryClicked(entry, $event)" 
 				ng-class="{open: current == entry, closed: current != entry}">
-				<span ui-if="keywords || selectedType == 'category'" class="feed-name">{{entry.feedName}}</span>
+				<span class="feed-name">
+					<favicon url="entry.feedUrl" />
+					{{entry.feedName}}
+				</span>
 				<span class="entry-date">{{entry.date}}</span>
-				<span class="entry-name" ng-class="{unread: entry.read == false, shrink: keywords || selectedType == 'category'}" ng-bind-html-unsafe="entry.title"></span>
+				<span class="entry-name" ng-class="{unread: entry.read == false, shrink: true}" ng-bind-html-unsafe="entry.title"></span>
 				
 			</a>
 			<div class="entry-body" ui-if="isOpen && current == entry">