From 54a67849bd6fe0608c9940bfa1b87b24c07ba41e Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Fri, 5 Apr 2013 11:38:12 +0200
Subject: brought back feeds and folders

---
 templates/part.listfeed.php   | 4 ++--
 templates/part.listfolder.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 84b99ddee..a9d91718f 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -1,9 +1,9 @@
 <li ng-class="{
 		active: feedBl.isActive(feed.id), 
-		unread: feedBl.getUnreadCount(feed.id) != 0
+		unread: feedBl.getUnreadCount(feed.id) > 0
 	}" 
 	ng-repeat="feed in feedBl.getFeedsOfFolder(<?php p($_['folderId']); ?>)"
-	ng-show="feedBl.isShown(feed.id)"
+	ng-show="feedBl.isVisible(feed.id)"
 	data-id="{{ feed.id }}"
 	class="feed"
 	draggable>
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index e97de5f9b..897cea41b 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -4,7 +4,7 @@
 		collapsible: folderBl.hasFeeds(folder.id),
 		unread: folderBl.getUnreadCount(folder.id) != 0
 	}" 
-	ng-repeat="folder in folders"
+	ng-repeat="folder in folderBl.getAll()"
 	ng-show="folderBl.isVisible(folder.id)"
 	class="folder"
 	data-id="{{folder.id}}"
-- 
cgit v1.2.3