From 0e80d4ec56bd8df6dd1f201aab312eb2048d1d0a Mon Sep 17 00:00:00 2001 From: Athou Date: Sun, 7 Apr 2013 10:41:55 +0200 Subject: [PATCH] keep unread button --- src/main/webapp/css/app.css | 10 ++++++++++ src/main/webapp/js/controllers.js | 6 +++++- src/main/webapp/templates/feeds.view.html | 6 ++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css index cc365e96..4330a3d9 100644 --- a/src/main/webapp/css/app.css +++ b/src/main/webapp/css/app.css @@ -141,6 +141,16 @@ margin-top: 5px; } +#feed-accordion .entry-buttons { + background-color: #fafafa; + padding: 3px 0px; + border-top: 1px solid #ebebeb; +} + +#feed-accordion .entry-buttons label{ + margin-bottom: 0px +} + /* admin */ .admin .users-table { height: 400px; diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js index 7309c57e..15bf642b 100644 --- a/src/main/webapp/js/controllers.js +++ b/src/main/webapp/js/controllers.js @@ -323,16 +323,20 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route, $scope.isOpen = false; $scope.entryClicked = function(entry, event) { - $scope.mark(entry, true); if (!event.ctrlKey && event.which != 2) { if ($scope.current != entry) { $scope.isOpen = true; } else { $scope.isOpen = !$scope.isOpen; } + if($scope.isOpen) { + $scope.mark(entry, true); + } $scope.current = entry; event.preventDefault(); event.stopPropagation(); + } else { + $scope.mark(entry, true); } }; diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html index 2469732e..61cc2953 100644 --- a/src/main/webapp/templates/feeds.view.html +++ b/src/main/webapp/templates/feeds.view.html @@ -20,6 +20,12 @@
+
+ +
"{{name}}" has no unread items.