From d1d775da219e79e134c55d978ebc96c728d77958 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Wed, 27 Mar 2013 17:34:12 +0100
Subject: display folders

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

diff --git a/css/owncloud.css b/css/owncloud.css
index a7bd29596..e6aa01f61 100644
--- a/css/owncloud.css
+++ b/css/owncloud.css
@@ -38,8 +38,9 @@
 #app-navigation li:hover > a { background-color: #ccc; }
 #app-navigation > ul > li:hover { border-top: 1px solid #ccc; border-bottom: 1px solid #ccc;}
 
+#app-navigation button.collapse { display: none; }
 #app-navigation li.collapsible > button.collapse {
-	display: none; position: absolute; left: 6px; top: 5px; height: 16px; width: 16px;
+	position: absolute; left: 6px; top: 5px; height: 16px; width: 16px;
 	background: none; background-image: url('%webroot%/core/img/actions/triangle-s.svg');
 	background-repeat: no-repeat; background-size: 16px 16px;
 	border: none; border-radius: 0; outline: none !important;
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index e30610d19..f237daa54 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -1,10 +1,10 @@
 <li ng-class="{
 	active: isFeedActive(feedType.Folder, folder.id), 
 	open: folder.open,
-	collapsible: hasFeeds(),
+	collapsible: hasFeeds(folder.id),
 	unread: getUnreadCount(feedType.Folder, folder.id)!=0}" 
 	ng-repeat="folder in folders"
-	ng-show="folder.show"
+	ng-show="isShown(feedType.Folder, folder.id)"
 	class="folder"
 	data-id="{{folder.id}}"
 	droppable>
-- 
cgit v1.2.3