From b67f0a13468c2e640955d07e98445f8415173e1e Mon Sep 17 00:00:00 2001
From: MageFroh <lecardob+github@gmail.com>
Date: Mon, 1 Jul 2013 21:25:09 +0100
Subject: [PATCH] feed title is now a link to the feed website

---
 .../java/com/commafeed/frontend/model/Entries.java    | 11 +++++++++++
 .../commafeed/frontend/rest/resources/FeedREST.java   |  1 +
 src/main/webapp/js/controllers.js                     |  1 +
 src/main/webapp/templates/feeds.view.html             |  5 ++++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/commafeed/frontend/model/Entries.java b/src/main/java/com/commafeed/frontend/model/Entries.java
index 83820925..1ce2a0a6 100644
--- a/src/main/java/com/commafeed/frontend/model/Entries.java
+++ b/src/main/java/com/commafeed/frontend/model/Entries.java
@@ -26,6 +26,9 @@ public class Entries implements Serializable {
 	@ApiProperty("times the server tried to refresh the feed and failed")
 	private int errorCount;
 
+	@ApiProperty("URL of the website, extracted from the feed")
+	private String feedLink;
+
 	@ApiProperty("list generation timestamp")
 	private long timestamp;
 
@@ -67,6 +70,14 @@ public class Entries implements Serializable {
 		this.errorCount = errorCount;
 	}
 
+	public String getFeedLink() {
+		return feedLink;
+	}
+
+	public void setFeedLink(String feedLink) {
+		this.feedLink = feedLink;
+	}
+
 	public long getTimestamp() {
 		return timestamp;
 	}
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
index d0e91681..27c97501 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
@@ -99,6 +99,7 @@ public class FeedREST extends AbstractResourceREST {
 			entries.setName(subscription.getTitle());
 			entries.setMessage(subscription.getFeed().getMessage());
 			entries.setErrorCount(subscription.getFeed().getErrorCount());
+			entries.setFeedLink(subscription.getFeed().getLink());
 
 			List<FeedEntryStatus> list = null;
 			if (unreadOnly) {
diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index f2e0283b..380d5fc0 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -703,6 +703,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
 			$scope.timestamp = data.timestamp;
 			$scope.busy = false;
 			$scope.hasMore = data.hasMore;
+			$scope.feedLink = data.feedLink;
 		};
 		if (!$scope.keywords) {
 			var service = $scope.selectedType == 'feed' ? FeedService
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index 62da49f4..cc5cef8f 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -4,7 +4,10 @@
 			<span ng-switch on="selectedId">
 				<span ng-switch-when="all">${tree.all}</span>
 				<span ng-switch-when="starred">${tree.starred}</span>
-				<span ng-switch-default>{{name}}</span>
+				<span ng-switch-default>
+					<span ng-hide="feedLink">{{name}}</span>
+					<a ng-show="feedLink" href="{{feedLink}}" target="_blank">{{name}}</a>
+				</span>
 			</span>
 			&nbsp;
 			<span ng-show="name && selectedType == 'category'"> &#187;</span>