diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-02-07 13:50:14 +0100 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-02-07 13:50:14 +0100 |
| commit | 38eab604c3a5df95be1172f8bfba195e0cecceac (patch) | |
| tree | 0777640df3a2ea19150301752f06749d1077816f | |
| parent | 48146ac1c8f25de19f3bb69271a4c540f9ad89e7 (diff) | |
hide editing tools in invalid feed dialog, fix #446
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | templates/part.listfeed.php | 11 |
2 files changed, 7 insertions, 7 deletions
@@ -1,3 +1,6 @@ +owncloud-news (1.805) +* Hide editing tools in invalid feed dialog + owncloud-news (1.804) * Make it possible to rename folders * Do not show rename action for feeds that could not be added diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 621afe4c4..d6a434e59 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -26,7 +26,7 @@ ng-click="feedBusinessLayer.renameFeed(feed.id, feed.title)" class="action-button create-button action"> </button> - </div> + </div> <a ng-style="{ backgroundImage: feed.faviconLink }" ng-click="feedBusinessLayer.load(feed.id)" @@ -46,21 +46,18 @@ <span class="utils"> <button ng-click="feedBusinessLayer.delete(feed.id)" - ng-hide="feed.editing" class="svg action delete-icon delete-button" title="<?php p($l->t('Delete website')); ?>" - ng-show="feed.id" + ng-show="feed.id && !feed.editing && !feed.error" oc-tooltip></button> <span class="unread-counter" - ng-hide="feed.editing" - ng-show="feed.id && feedBusinessLayer.getUnreadCount(feed.id) > 0"> + ng-show="feed.id && feedBusinessLayer.getUnreadCount(feed.id) > 0 && !feed.error && !feed.editing"> {{ unreadCountFormatter(feedBusinessLayer.getUnreadCount(feed.id)) }} </span> <button class="svg action mark-read-icon" - ng-hide="feed.editing" - ng-show="feedBusinessLayer.getUnreadCount(feed.id) > 0 && feed.id" + ng-show="feedBusinessLayer.getUnreadCount(feed.id) > 0 && feed.id && !feed.error && !feed.editing" ng-click="feedBusinessLayer.markRead(feed.id)" title="<?php p($l->t('Mark read')); ?>" oc-tooltip></button> |