garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

display link to feed source (fix #355)

Browse Source
This commit is contained in:
Athou
2013-07-08 09:37:34 +02:00
parent 5af7a7fc7b
commit 4d8f0865ba
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/i18n/en.properties
View File

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

11
src/main/webapp/js/controllers.js
View File

@@ -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', '$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(); AnalyticsService.track();
@@ -723,6 +723,13 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
}, callback); }, callback);
} }
}; };
$scope.goToFeed = function(id) {
$state.transitionTo('feeds.view', {
_type : 'feed',
_id : id
});
};
$scope.mark = function(entry, read) { $scope.mark = function(entry, read) {
if (entry.read != read) { if (entry.read != read) {

2
src/main/webapp/sass/components/_entry-list.scss
View File

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

16
src/main/webapp/templates/feeds.view.html
View File

@@ -43,10 +43,18 @@
<div class="entry-header"> <div class="entry-header">
<div class="entry-title"> <div class="entry-title">
<a href="{{entry.url}}" target="_blank" ng-bind-html-unsafe="entry.title"></a> <a href="{{entry.url}}" target="_blank" ng-bind-html-unsafe="entry.title"></a>
<span class="entry-author" ui-if="entry.author"> <div class="entry-subtitle">
<span class="entry-author-prefix">${view.entry_author}</span> <span class="entry-source" ui-if="selectedType == 'category'">
<span class="entry-author-name">{{entry.author}}</span> <span class="entry-source-prefix">${view.entry_source}</span>
</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>
</div> </div>