diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 02:10:51 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-12 02:10:51 +0200 |
| commit | 1a04a1c73540be7c7294ef86b92df65bd91c5fc8 (patch) | |
| tree | 9c0d9dfe2f49992ca4408de2a5f84ec3881caf03 /templates | |
| parent | aee7a83449230f8835c6d98838c565303b633fc1 (diff) | |
add folder styles
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/part.navigation.feed.php | 3 | ||||
| -rw-r--r-- | templates/part.navigation.folder.php | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php index 999968f58..05e1bd4e4 100644 --- a/templates/part.navigation.feed.php +++ b/templates/part.navigation.feed.php @@ -1,7 +1,6 @@ <li ng-class="{ active: Navigation.isFeedActive(feed.id), - unread: Navigation.getFeedUnreadCount(feed.id) > 0, - failed: feed.error + unread: Navigation.getFeedUnreadCount(feed.id) > 0 }" ng-repeat="feed in Navigation.getFeedsOfFolder(<?php p($_['folderId']); ?>) | orderBy:'id':true track by feed.url" ng-show="Navigation.getFeedUnreadCount(feed.id) > 0 diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php index 180b225f3..7b4194b5b 100644 --- a/templates/part.navigation.folder.php +++ b/templates/part.navigation.folder.php @@ -2,8 +2,7 @@ active: Navigation.isFolderActive(folder.id), open: folder.opened && Navigation.hasFeeds(folder.id), collapsible: Navigation.hasFeeds(folder.id), - unread: Navigation.getFolderUnreadCount(folder.id) > 0, - failed: folder.error + unread: Navigation.getFolderUnreadCount(folder.id) > 0 }" ng-repeat="folder in Navigation.getFolders() | orderBy:'id':true" ng-show="Navigation.getFolderUnreadCount(folder.id) != 0 @@ -39,7 +38,7 @@ <a ng-href="#/items/folders/{{ folder.id }}/" class="title icon-folder" - ng-hide="folder.editing" + ng-hide="folder.editing || folder.error" ng-class="{ 'icon-loading': !folder.id }"> @@ -73,9 +72,15 @@ title="<?php p($l->t('Read all')); ?>"></button></li> </ul> </div> - <ul> + <ul ng-hide="folder.error"> <?php print_unescaped($this->inc('part.navigation.feed', ['folderId' => 'folder.id'])); ?> </ul> - <div class="message" ng-show="folder.error">{{ folder.error }}</div> + <div class="error-message" ng-show="folder.error"> + <h2 class="title">{{ folder.name }}</h2> + <span class="message">{{ folder.error }}</span> + <button type="button " + title="<?php p($l->t('Dismiss')); ?>" + ng-click="Navigation.removeFolder(folder)"></button> + </div> </li> |