diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-10-31 01:17:37 +0100 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-10-31 01:17:37 +0100 |
commit | 1378ff21cea89531d1d59e656fd32cf5d149f5f4 (patch) | |
tree | 6dd58872c0354b680663dc16e924cb40311bbea3 | |
parent | e00bc4b65f3bb89ba55bd314167431170872563b (diff) |
set unread items correctly for new items and starred items
-rw-r--r-- | css/news.css | 2 | ||||
-rw-r--r-- | js/menu.js | 2 | ||||
-rw-r--r-- | templates/part.feeds.php | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/css/news.css b/css/news.css index 146bcb72b..c67fef7d9 100644 --- a/css/news.css +++ b/css/news.css @@ -73,7 +73,7 @@ div.add_parentfolder { font-size: 9pt; } - #feeds .feed:hover .unread_items_counter, #feeds .feed.all_read .unread_items_counter { + #feeds li:hover > .unread_items_counter, #feeds .all_read > .unread_items_counter { display: none; } diff --git a/js/menu.js b/js/menu.js index 2b986afac..2d60d9e87 100644 --- a/js/menu.js +++ b/js/menu.js @@ -841,7 +841,7 @@ var News = News || {}; Menu.prototype._applyUnreadCountStyle = function(type, id, unreadCount) { var $node = this._getNodeFromTypeAndId(type, id); - if(type === MenuNodeType.Feed){ + if(type !== MenuNodeType.Folder){ $node.children('.unread_items_counter').html(unreadCount); } diff --git a/templates/part.feeds.php b/templates/part.feeds.php index c2b129ee8..553e45f74 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -46,6 +46,7 @@ $starredCount = $_['starredCount']; <li class="subscriptions <?php if($lastViewedFeedType == OCA\News\FeedType::SUBSCRIPTIONS) { echo "active"; }; ?>"> <a class="title" href="#" ><?php echo $l->t('New articles'); ?></a> + <span class="unread_items_counter"><?php echo $starredCount ?></span> <span class="buttons"> <button class="svg action feeds_markread" title="<?php echo $l->t('Mark all read'); ?>"></button> </span> |