bring back show all button

1 files changed, 11 insertions, 9 deletions

diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index 6d02aea7a..e97de5f9b 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -1,10 +1,11 @@
 <li ng-class="{
-	active: isFeedActive(feedType.Folder, folder.id), 
-	open: folder.open,
-	collapsible: folderBl.hasFeeds(folder.id),
-	unread: getFolderUnreadCount(folder.id) != 0}" 
+		active: folderBl.isActive(folder.id), 
+		open: folder.open,
+		collapsible: folderBl.hasFeeds(folder.id),
+		unread: folderBl.getUnreadCount(folder.id) != 0
+	}" 
 	ng-repeat="folder in folders"
-	ng-show="isShown(feedType.Folder, folder.id)"
+	ng-show="folderBl.isVisible(folder.id)"
 	class="folder"
 	data-id="{{folder.id}}"
 	droppable>
@@ -13,23 +14,24 @@
 			ng-click="folderBl.toggleFolder(folder.id)"></button>
 	<a href="#" 
 	   class="title folder-icon"
-	   ng-click="loadFeed(feedType.Folder, folder.id)">
+	   ng-click="folderBl.load(folder.id)">
 	   {{folder.name}}
 	</a>
 
 	<span class="utils">
 
 		<button ng-click="folderBl.delete(folder.id)"
+				ng-hide="folderBl.hasFeeds(folder.id)"
 				class="svg action delete-icon" 
 				title="<?php p($l->t('Delete folder')); ?>"></button>
 
 		<span class="unread-counter">
-			{{ getUnreadCount(feedType.Folder, folder.id) }}
+			{{ folderBl.getUnreadCount(folder.id) }}
 		</span>
 		
 		<button class="svg action mark-read-icon" 
-				ng-show="getUnreadCount(feedType.Feed, feed.id)>0"
-				ng-click="markAllRead(feedType.Folder, folder.id)"
+				ng-show="folderBl.getUnreadCount(feedType.Feed, feed.id) > 0"
+				ng-click="folderBl.markFolderRead(folder.id)"
 				title="<?php p($l->t('Mark all read')); ?>"></button>
 		
 <!--		<button class="svg action edit-icon"