bring back show all button

5 files changed, 37 insertions, 35 deletions

diff --git a/templates/part.feed.starred.php b/templates/part.feed.starred.php
index 4bd0a5fef..3d0adde03 100644
--- a/templates/part.feed.starred.php
+++ b/templates/part.feed.starred.php
@@ -1,13 +1,13 @@
-<li ng-class="{	active: isFeedActive(feedType.Starred, 0) }" 
-	ng-show="isShown(feedType.Starred, 0)">
+<li ng-class="{	active: starredBl.isActive(0) }" 
+	ng-show="starredBl.isVisible(0)">
 	<a class="starred-icon"
 		href="#"
-		ng-click="loadFeed(feedType.Starred, 0)">
+		ng-click="starredBl.load(0)">
 	   <?php p($l->t('Starred')) ?>
 	</a>
 	<span class="utils">
 		<span class="unread-counter">
-			{{ getStarredCount() }}
+			{{ starredBl.getStarredCount() }}
 		</span>
 	</span>
 </li>
\ No newline at end of file
diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php
index 85f4c8766..67c57e369 100644
--- a/templates/part.feed.unread.php
+++ b/templates/part.feed.unread.php
@@ -1,26 +1,26 @@
 <li ng-class="{
-		active: isFeedActive(feedType.Subscriptions, 0),
-		unread: getUnreadCount(feedType.Subscriptions, 0)!=0
+		active: subscriptionsBl.isActive(0),
+		unread: subscriptionsBl.getUnreadCount(0) > 0
 	}" 
-	ng-show="isShown(feedType.Subscriptions, 0)">
+	ng-show="subscriptionsBl.isVisible(0)">
 	<a class="rss-icon" 
 	   href="#" 
-	   ui-if="!isShowAll()"
-	   ng-click="loadFeed(feedType.Subscriptions, 0)">
+	   ui-if="!feedBl.isShowAll()"
+	   ng-click="subscriptionsBl.load(0)">
 	   <?php p($l->t('Unread articles'))?>
 	</a>
 		<a class="rss-icon" 
 	   href="#" 
-	   ui-if="isShowAll()"
-	   ng-click="loadFeed(feedType.Subscriptions, 0)">
+	   ui-if="feedBl.isShowAll()"
+	   ng-click="subscriptionsBl.load(0)">
 	   <?php p($l->t('All articles'))?>
 	</a>
 	<span class="utils">
 		<span class="unread-counter">
-			{{ getUnreadCount() }}
+			{{ subscriptionsBl.getUnreadCount() }}
 		</span>
 		<button class="svg action mark-read-icon" 
-			ng-click="feedBl.markAllRead()"
+			ng-click="subscriptionsBl.markAllRead()"
 			title="<?php p($l->t('Mark all read')) ?>"></button>
 	</span>
 </li>
\ No newline at end of file
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 4db9cd385..84b99ddee 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -1,17 +1,17 @@
 <li ng-class="{
-		active: isFeedActive(feedType.Feed, feed.id), 
-		unread: feed.unreadCount!=0
+		active: feedBl.isActive(feed.id), 
+		unread: feedBl.getUnreadCount(feed.id) != 0
 	}" 
 	ng-repeat="feed in feedBl.getFeedsOfFolder(<?php p($_['folderId']); ?>)"
-	ng-show="isShown(feedType.Feed, feed.id)"
-	data-id="{{feed.id}}"
+	ng-show="feedBl.isShown(feed.id)"
+	data-id="{{ feed.id }}"
 	class="feed"
 	draggable>
-	<a ng-style="{backgroundImage: feed.faviconLink}"
+	<a ng-style="{ backgroundImage: feed.faviconLink }"
 	   href="#"
 	   class="title"
-	   ng-click="loadFeed(feedType.Feed, feed.id)">
-	   {{feed.title}}
+	   ng-click="feedBl.load(feed.id)">
+	   {{ feed.title }}
 	</a>
 	
 	<span class="utils">
@@ -20,11 +20,11 @@
 			title="<?php p($l->t('Delete feed')); ?>"></button>
 
 		<span class="unread-counter">
-			{{ getFeedUnreadCount(feed.id) }}
+			{{ feedBl.getUnreadCount(feed.id) }}
 		</span>
 
 		<button class="svg action mark-read-icon"
-			ng-show="feed.unreadCount > 0"
+			ng-show="feedBl.getUnreadCount(feed.id) > 0"
 			ng-click="feedBl.markFeedRead(feed.id)"
 			title="<?php p($l->t('Mark all read')); ?>"></button>
 
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" 
diff --git a/templates/part.showall.php b/templates/part.showall.php
index 6555bfa79..a99e821ee 100644
--- a/templates/part.showall.php
+++ b/templates/part.showall.php
@@ -1,7 +1,7 @@
-<li ui-if="!isShowAll() && isShown(feedType.Subscriptions, 0)" class="show-all">
-	<a ng-click="setShowAll(true)" href="#"><?php p($l->t('Show all')); ?></a>
+<li ui-if="!feedBl.isShowAll() && subscriptionsBl.isVisible(0)" class="show-all">
+	<a ng-click="feedBl.setShowAll(true)" href="#"><?php p($l->t('Show all')); ?></a>
 </li>
 
-<li ui-if="isShowAll() && isShown(feedType.Subscriptions, 0)" class="show-all">
-	<a ng-click="setShowAll(false)" href="#"><?php p($l->t('Show only unread')); ?></a>
+<li ui-if="feedBl.isShowAll() && subscriptionsBl.isVisible(0)" class="show-all">
+	<a ng-click="feedBl.setShowAll(false)" href="#"><?php p($l->t('Show only unread')); ?></a>
 </li>