working on creating folders

2 files changed, 18 insertions, 10 deletions

diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php
index 05e1bd4e4..fc8a41a6b 100644
--- a/templates/part.navigation.feed.php
+++ b/templates/part.navigation.feed.php
@@ -9,7 +9,7 @@
             || !feed.id"
     data-id="{{ feed.id }}"
     class="feed with-counter with-menu"
-    news-draggable-disable="{{ feed.error.length > 0 }}"
+    news-draggable-disable="{{ feed.error.length > 0 || !feed.id }}"
     news-draggable="{
         stack: '> li',
         zIndex: 1000,
@@ -21,13 +21,19 @@
     }">
 
     <a  ng-style="{ backgroundImage: 'url(' + feed.faviconLink + ')'}"
-        ng-if="!feed.editing && !feed.deleted && !feed.error"
+        ng-show="!feed.editing && !feed.deleted && !feed.error && feed.id"
         ng-href="#/items/feeds/{{ feed.id }}/"
         class="title"
         title="{{ feed.title }}">
        {{ feed.title }}
     </a>
 
+    <a ng-hide="feed.id"
+        class="entry-loading title"
+        title="{{ feed.title }}">
+       {{ feed.title }}
+    </a>
+
     <div ng-if="feed.deleted" class="app-navigation-entry-deleted" news-timeout="Navigation.removeFeed(feed)">
         <div class="app-navigation-entry-deleted-description"><?php p($l->t('Deleted')); ?> {{ feed.title }}</div>
         <button class="icon-history"
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>