garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

display error messages

Browse Source
This commit is contained in:
Athou
2013-03-31 18:47:17 +02:00
parent a9e5c50b3f
commit 5994369e01
8 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/directives/category.html
View File

@@ -3,9 +3,9 @@
ng-class="{selected: (node.id == selectedId && selectedType == 'category')}">{{formatCategoryName({category:node})}}
</label>
<ul>
<li ng-repeat="feed in node.feeds" ng-mouseenter="hovered=feed" ng-mouseleave="hovered=null">
<li ng-repeat="feed in node.feeds" ng-mouseenter="hovered=feed" ng-mouseleave="hovered=null" ng-class="{error: feed.message}">
<div class="dropdown pull-right" ng-show="hovered==feed">
<a dropdown-toggle class="pull-right feed-menu-icon"><i class="icon icon-chevron-down" ng-class="{error: feed.message}"></i> </a>
<a dropdown-toggle class="pull-right feed-menu-icon"><i class="icon icon-chevron-down"></i> </a>
<ul class="dropdown-menu">
<li>
<a ng-click="edit(feed)">Edit</a>

2
src/main/webapp/js/controllers.js
View File

@@ -106,6 +106,7 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
$scope.selectedId = $stateParams._id;
$scope.name = null;
$scope.message = null;
$scope.entries = [];
$scope.settingsService = SettingsService;
@@ -144,6 +145,7 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
$scope.entries.push(data.entries[i]);
}
$scope.name = data.name;
$scope.message = data.message;
$scope.busy = false;
$scope.hasMore = data.entries.length == limit;
});

3
src/main/webapp/templates/feeds.view.html
View File

@@ -22,6 +22,7 @@
<div ng-bind-html-unsafe="entry.content"></div>
</div>
</div>
<div class="no-entries" ng-show="entries.length.name && entries.length == 0 && !busy">"{{name}}" has no unread items.</div>
<div class="no-entries" ng-show="!message && name && entries.length == 0 && !busy">"{{name}}" has no unread items.</div>
<div ng-show="message">Error while loading this feed : {{message}}</div>
</div>
</div>