2 files changed, 25 insertions, 9 deletions
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 73087af28..118bdd0b8 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -1,6 +1,7 @@
 <li ng-class="{
 		active: feedBl.isActive(feed.id), 
-		unread: feedBl.getUnreadCount(feed.id) > 0
+		unread: feedBl.getUnreadCount(feed.id) > 0,
+		failed: feed.error
 	}" 
 	ng-repeat="feed in feedBl.getFeedsOfFolder(<?php p($_['folderId']); ?>)"
 	ng-show="feedBl.isVisible(feed.id)"
@@ -13,10 +14,15 @@
 		axis: 'y',
 		helper: 'clone'
 	}">
-	<a ng-style="{ backgroundImage: feed.faviconLink }"
-	   href="#"
-	   class="title"
-	   ng-click="feedBl.load(feed.id)">
+	<a 	ng-style="{ backgroundImage: feed.faviconLink }"
+		ng-click="feedBl.load(feed.id)"
+		ng-class="{
+			progress-icon: !feed.id,
+			problem-icon: feed.error
+		}"
+	   	href="#"
+	   	class="title">
+	   	
 	   {{ feed.title }}
 	</a>
 	
@@ -36,4 +42,7 @@
 			title="<?php p($l->t('Delete feed')); ?>"></button>
 
 	</span>
+
+	<div class="message" ng-show="feed.error">{{ feed.error }}</div>
 </li>
+
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index a7e2e7497..9520bf42d 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -2,7 +2,8 @@
 		active: folderBl.isActive(folder.id), 
 		open: folder.opened && folderBl.hasFeeds(folder.id),
 		collapsible: folderBl.hasFeeds(folder.id),
-		unread: folderBl.getUnreadCount(folder.id) != 0
+		unread: folderBl.getUnreadCount(folder.id) != 0,
+		failed: folder.error
 	}" 
 	ng-repeat="folder in folderBl.getAll()"
 	ng-show="folderBl.isVisible(folder.id)"
@@ -14,11 +15,15 @@
 			ng-click="folderBl.toggleFolder(folder.id)"></button>
 	<a href="#" 
 	   class="title folder-icon"
-	   ng-click="folderBl.load(folder.id)">
+	   ng-click="folderBl.load(folder.id)"
+	   ng-class="{
+			progress-icon: !folder.id,
+			problem-icon: folder.error
+		}">
 	   {{ folder.name }}
 	</a>
 
-	<span class="utils">
+	<span class="utils" ng-hide="folder.error">
 
 		<button ng-click="folderBl.delete(folder.id)"
 				ng-hide="folderBl.hasFeeds(folder.id)"
@@ -43,4 +48,6 @@
 	<ul>
 		<?php print_unescaped($this->inc('part.listfeed', array('folderId' => 'folder.id'))); ?>
 	</ul>
-</li>
-\ No newline at end of file
+	
+	<div class="message" ng-show="folder.error">{{ folder.error }}</div>
+</li>