diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/part.listfeed.php | 7 | ||||
| -rw-r--r-- | templates/part.listfolder.php | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index a9d91718f..0c3a48a19 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -15,9 +15,6 @@ </a> <span class="utils"> - <button ng-click="feedBl.delete(feed.id)" - class="svg action delete-icon" - title="<?php p($l->t('Delete feed')); ?>"></button> <span class="unread-counter"> {{ feedBl.getUnreadCount(feed.id) }} @@ -27,6 +24,10 @@ ng-show="feedBl.getUnreadCount(feed.id) > 0" ng-click="feedBl.markFeedRead(feed.id)" title="<?php p($l->t('Mark all read')); ?>"></button> + + <button ng-click="feedBl.delete(feed.id)" + class="svg action delete-icon" + title="<?php p($l->t('Delete feed')); ?>"></button> </span> </li> diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index e932babb8..a7e2e7497 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -1,6 +1,6 @@ <li ng-class="{ active: folderBl.isActive(folder.id), - open: folder.opened, + open: folder.opened && folderBl.hasFeeds(folder.id), collapsible: folderBl.hasFeeds(folder.id), unread: folderBl.getUnreadCount(folder.id) != 0 }" |