diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-13 01:19:39 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-13 01:19:39 +0200 |
commit | 8c38ef40bd9b1ff794de218ea71d43971bef4c59 (patch) | |
tree | 5547ceda7b7dd350d379073b1cdf7a423e6c7d16 /templates | |
parent | 72c4fc9acb1380021eb4665af78ef8e26058c86a (diff) |
delete feed + undo
Diffstat (limited to 'templates')
-rw-r--r-- | templates/part.navigation.feed.php | 20 | ||||
-rw-r--r-- | templates/part.navigation.folder.php | 23 |
2 files changed, 20 insertions, 23 deletions
diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php index 4613e389f..764a3c606 100644 --- a/templates/part.navigation.feed.php +++ b/templates/part.navigation.feed.php @@ -35,14 +35,13 @@ {{ feed.title }} </a> - <div ng-if="feed.deleted" class="app-navigation-entry-deleted" news-timeout="Navigation.removeFeed(feed)"> - <div class="app-navigation-entry-deleted-description"><?php p($l->t('Deleted')); ?> {{ feed.title }}</div> + <div ng-if="feed.deleted" + class="app-navigation-entry-deleted" + news-timeout="Navigation.deleteFeed(feed)"> + <div class="app-navigation-entry-deleted-description"><?php p($l->t('Deleted feed')); ?> {{ feed.title }}</div> <button class="icon-history" - title="<?php p($l->t('Undo')); ?>" - ng-click="Navigation.undeleteFeed(feed)"></button> - <button class="icon-close" - title="<?php p($l->t('Remove notification')); ?>" - ng-click="Navigation.removeFeed(feed)"></button> + title="<?php p($l->t('Undo delete feed')); ?>" + ng-click="Navigation.undoDeleteFeed(feed)"></button> </div> <div ng-if="feed.editing" class="app-navigation-entry-edit"> @@ -77,11 +76,10 @@ <li><button ng-click="feed.editing=true" class="icon-rename" title="<?php p($l->t('Rename feed')); ?>"></button></li> - <li><button ng-click="Navigation.deleteFeed(feed)" + <li><button ng-click="Navigation.reversiblyDeleteFeed(feed)" class="icon-delete" title="<?php p($l->t('Delete feed')); ?>"></button></li> - <li><button ng-show="Navigation.getFeedUnreadCount(feed.id) > 0" - class="icon-checkmark" + <li ng-show="Navigation.getFeedUnreadCount(feed.id) > 0"><button class="icon-checkmark" ng-click="Navigation.markFeedRead(feed.id)" title="<?php p($l->t('Read all')); ?>"></button></li> </ul> @@ -92,7 +90,7 @@ <span class="message">{{ feed.error }}</span> <button type="button " title="<?php p($l->t('Dismiss')); ?>" - ng-click="Navigation.removeFeed(feed)"></button> + ng-click="Navigation.deleteFeed(feed)"></button> </div> </li> diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php index c9d19ed67..99fbb588a 100644 --- a/templates/part.navigation.folder.php +++ b/templates/part.navigation.folder.php @@ -16,18 +16,17 @@ data-id="{{ folder.id }}" news-droppable> <button class="collapse" - ng-hide="folder.editing" + ng-hide="folder.editing || folder.deleted" title="<?php p($l->t('Collapse'));?>" ng-click="Navigation.toggleFolder(folder.name)"></button> - <div ng-if="folder.deleted" class="app-navigation-entry-deleted" news-timeout="Navigation.removeFeed(feed)"> - <div class="app-navigation-entry-deleted-description"><?php p($l->t('Deleted')); ?> {{ feed.title }}</div> + <div ng-if="folder.deleted" + class="app-navigation-entry-deleted" + news-timeout="Navigation.deleteFolder(folder)"> + <div class="app-navigation-entry-deleted-description"><?php p($l->t('Deleted folder')); ?> {{ folder.name }}</div> <button class="icon-history" - title="<?php p($l->t('Undo')); ?>" - ng-click="Navigation.undeleteFolder(folder)"></button> - <button class="icon-close" - title="<?php p($l->t('Remove notification')); ?>" - ng-click="Navigation.removeFolder(folder)"></button> + title="<?php p($l->t('Undo delete folder')); ?>" + ng-click="Navigation.undoDeleteFolder(folder)"></button> </div> <div ng-if="folder.editing" class="app-navigation-entry-edit" @@ -58,7 +57,7 @@ <a ng-href="#/items/folders/{{ folder.id }}/" class="title icon-folder" - ng-show="!folder.editing && !folder.error && folder.id"> + ng-show="!folder.editing && !folder.error && !folder.deleted && folder.id"> {{ folder.name }} </a> @@ -84,7 +83,7 @@ <li><button ng-click="folder.editing=true" class="icon-rename" title="<?php p($l->t('Rename folder')); ?>"></button></li> - <li><button ng-click="Navigation.deleteFolder(folder)" + <li><button ng-click="Navigation.reversiblyDeleteFolder(folder)" class="icon-delete" title="<?php p($l->t('Delete folder')); ?>"></button></li> <li ng-show="Navigation.getFolderUnreadCount(folder.id) > 0"><button class="icon-checkmark" @@ -92,7 +91,7 @@ title="<?php p($l->t('Read all')); ?>"></button></li> </ul> </div> - <ul ng-hide="folder.error"> + <ul ng-hide="folder.error || folder.deleted"> <?php print_unescaped($this->inc('part.navigation.feed', ['folderId' => 'folder.id'])); ?> </ul> @@ -101,6 +100,6 @@ <span class="message">{{ folder.error }}</span> <button type="button " title="<?php p($l->t('Dismiss')); ?>" - ng-click="Navigation.removeFolder(folder)"></button> + ng-click="Navigation.deleteFolder(folder)"></button> </div> </li> |