diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 20:56:23 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-11 20:56:23 +0200 |
commit | b06fc20ddbadbc7522cd23a83a20975f43889890 (patch) | |
tree | 252ddf454899920771466aa7d5b6376461c386e9 /templates | |
parent | ce6b20c59e1140867f2353361d3524e3baeb4580 (diff) |
allow users to discard folder and feed errors
Diffstat (limited to 'templates')
-rw-r--r-- | templates/part.listfeed.php | 11 | ||||
-rw-r--r-- | templates/part.listfolder.php | 14 |
2 files changed, 18 insertions, 7 deletions
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 1c08a4ae4..4008ca8af 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -26,21 +26,26 @@ {{ feed.title }} </a> - <span class="utils" ng-hide="feed.error"> + <span class="utils"> <span class="unread-counter"> {{ feedBl.getUnreadCount(feed.id) }} </span> <button class="svg action mark-read-icon" - ng-show="feedBl.getUnreadCount(feed.id) > 0" + ng-show="feedBl.getUnreadCount(feed.id) > 0 && feed.id" 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> + title="<?php p($l->t('Delete feed')); ?>" + ng-show="feed.id"></button> + <button class="svg action mark-read-icon" + ng-click="feedBl.markErrorRead(feed.urlHash)" + title="<?php p($l->t('Discard')); ?>" + ng-show="feed.error"></button> </span> <div class="message" ng-show="feed.error">{{ feed.error }}</div> diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index e8141021f..c4d7b0b8b 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -23,10 +23,10 @@ {{ folder.name }} </a> - <span class="utils" ng-hide="folder.error"> + <span class="utils"> <button ng-click="folderBl.delete(folder.id)" - ng-hide="folderBl.hasFeeds(folder.id)" + ng-hide="folderBl.hasFeeds(folder.id) || !folder.id" class="svg action delete-icon" title="<?php p($l->t('Delete folder')); ?>"></button> @@ -35,10 +35,16 @@ </span> <button class="svg action mark-read-icon" - ng-show="folderBl.getUnreadCount(feedType.Feed, feed.id) > 0" + ng-show="folderBl.getUnreadCount(feedType.Feed, feed.id) > 0 && + folder.id" ng-click="folderBl.markFolderRead(folder.id)" title="<?php p($l->t('Mark all read')); ?>"></button> - + + <button class="svg action mark-read-icon" + ng-click="folderBl.markErrorRead(folder.name)" + title="<?php p($l->t('Discard')); ?>" + ng-show="folder.error"></button> + <!-- <button class="svg action edit-icon" ng-click="renameFolder(folder.id)" title="<?php p($l->t('Rename folder')); ?>"></button> |