diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 05:28:09 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 05:28:09 +0200 |
| commit | cc1dc2ed30486780f7ac46141c731dfe2da8e2de (patch) | |
| tree | 46525f7898928fbfffa13b9e1f08754b68fd5e88 /templates/part.navigation.folder.php | |
| parent | 2c161c47ece07732b0cd1a5a0ea9e8f25bf44441 (diff) | |
working on creating folders
Diffstat (limited to 'templates/part.navigation.folder.php')
| -rw-r--r-- | templates/part.navigation.folder.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php index d524a65d0..62dbc57a2 100644 --- a/templates/part.navigation.folder.php +++ b/templates/part.navigation.folder.php @@ -1,15 +1,16 @@ <li ng-class="{ active: Navigation.isFolderActive(folder.id), - open: folder.opened && Navigation.hasFeeds(folder.id), - collapsible: Navigation.hasFeeds(folder.id), + open: folder.opened || folder.getsFeed, + collapsible: Navigation.hasFeeds(folder.id) || folder.getsFeed, unread: Navigation.getFolderUnreadCount(folder.id) > 0 }" ng-repeat="folder in Navigation.getFolders() | orderBy:'id':true" - ng-show="Navigation.getFolderUnreadCount(folder.id) != 0 + ng-show="Navigation.getFolderUnreadCount(folder.id) > 0 || Navigation.isShowAll() || Navigation.isFolderActive(folder.id) || Navigation.subFeedActive(folder.id) - || !folder.id" + || !folder.id + || folder.getsFeed" class="folder with-counter with-menu" data-id="{{ folder.id }}" news-droppable> @@ -38,10 +39,11 @@ <a ng-href="#/items/folders/{{ folder.id }}/" class="title icon-folder" - ng-hide="folder.editing || folder.error" - ng-class="{ - 'folder-loading': !folder.id - }"> + ng-show="!folder.editing && !folder.error && folder.id"> + {{ folder.name }} + </a> + + <a class="title entry-loading" ng-hide="folder.id"> {{ folder.name }} </a> |