display link to feed source (fix #355)

src/main/resources/i18n/en.properties

@@ -45,6 +45,7 @@ toolbar.about=About
 toolbar.logout=Logout
 toolbar.donate=Donate
 
+view.entry_source=from 
 view.entry_author=by 
 view.error_while_loading_feed=Error while loading this feed
 view.keep_unread=Keep unread

src/main/webapp/js/controllers.js

@@ -639,9 +639,9 @@ function($scope, $state, $filter, $timeout, CategoryService) {
 
 }]);
 
-module.controller('FeedListCtrl', ['$scope', '$stateParams', '$http', '$route', 
+module.controller('FeedListCtrl', ['$scope', '$stateParams', '$http', '$route', '$state',
 	'$window', 'EntryService', 'SettingsService', 'FeedService', 'CategoryService', 'AnalyticsService',
-function($scope, $stateParams, $http, $route, $window, EntryService, SettingsService, FeedService, CategoryService, AnalyticsService) {
+function($scope, $stateParams, $http, $route, $state, $window, EntryService, SettingsService, FeedService, CategoryService, AnalyticsService) {
 	
 	AnalyticsService.track();
 
@@ -723,6 +723,13 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
 			}, callback);
 		}
 	};
+	
+	$scope.goToFeed = function(id) {		
+		$state.transitionTo('feeds.view', {
+			_type : 'feed', 
+			_id : id
+		});
+	};
 
 	$scope.mark = function(entry, read) {
 		if (entry.read != read) {

src/main/webapp/sass/components/_entry-list.scss

@@ -133,7 +133,7 @@
 	font-weight: bold;
 }
 
-#feed-accordion .entry-body .entry-author {
+#feed-accordion .entry-body .entry-subtitle {
 	display: block;
 	font-size: 14px;
 	font-weight: normal;

src/main/webapp/templates/feeds.view.html

@@ -43,10 +43,18 @@
 				<div class="entry-header">
 					<div 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>
+						<div class="entry-subtitle">
+							<span class="entry-source" ui-if="selectedType == 'category'">
+								<span class="entry-source-prefix">${view.entry_source}</span>
+								<a ng-click="goToFeed(entry.feedId)" class="pointer">
+									<span>{{entry.feedName}}</span>
+								</a>
+							</span>
+							<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>
+						</div>
 					</div>
 				</div>