summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-05-28 15:42:32 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2015-05-28 15:42:32 +0200
commitddb0d5020f4deccc2aec9d959ea434828e60a699 (patch)
tree922720c01a020ca7420c6f0fa232536194eff5b5 /templates
parent71f25d7e8a70bd017d3589ae54efb19c4ba317f5 (diff)
try to fix out of syn issue
Diffstat (limited to 'templates')
-rw-r--r--templates/part.navigation.feed.php8
-rw-r--r--templates/part.navigation.folder.php8
-rw-r--r--templates/part.navigation.starredfeed.php4
-rw-r--r--templates/part.navigation.unreadfeed.php6
4 files changed, 13 insertions, 13 deletions
diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php
index 3ee742f69..13c178b7b 100644
--- a/templates/part.navigation.feed.php
+++ b/templates/part.navigation.feed.php
@@ -1,10 +1,10 @@
<li ng-class="{
active: Navigation.isFeedActive(feed.id),
- unread: Navigation.getFeedUnreadCount(feed.id) > 0
+ unread: Navigation.isFeedUnread(feed.id)
}"
ng-repeat="feed in Navigation.getFeedsOfFolder(<?php p($_['folderId']); ?>)
| orderBy:'title.toLowerCase()' track by feed.url"
- ng-show="Navigation.getFeedUnreadCount(feed.id) > 0
+ ng-show="Navigation.isFeedUnread(feed.id)
|| Navigation.isShowAll()
|| Navigation.isFeedActive(feed.id)
|| !feed.id"
@@ -71,7 +71,7 @@
ng-show="feed.id && !feed.editing && !feed.error && !feed.deleted">
<ul>
<li class="app-navigation-entry-utils-counter"
- ng-show="feed.id && Navigation.getFeedUnreadCount(feed.id) > 0"
+ ng-show="feed.id && Navigation.isFeedUnread(feed.id)"
title="{{ Navigation.getFeedUnreadCount(feed.id) }}">
{{ Navigation.getFeedUnreadCount(feed.id) |
unreadCountFormatter }}
@@ -113,7 +113,7 @@
title="<?php p($l->t('Delete feed')); ?>">
</button>
</li>
- <li ng-show="Navigation.getFeedUnreadCount(feed.id) > 0" class="mark-read">
+ <li ng-show="Navigation.isFeedUnread(feed.id)" class="mark-read">
<button class="icon-checkmark"
ng-click="Navigation.markFeedRead(feed.id)"
title="<?php p($l->t('Mark all articles read')); ?>">
diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php
index c726f1da6..849c43d38 100644
--- a/templates/part.navigation.folder.php
+++ b/templates/part.navigation.folder.php
@@ -2,10 +2,10 @@
active: Navigation.isFolderActive(folder.id),
open: folder.opened || folder.getsFeed,
collapsible: Navigation.hasFeeds(folder.id) || folder.getsFeed,
- unread: Navigation.getFolderUnreadCount(folder.id) > 0
+ unread: Navigation.isFolderUnread(folder.id)
}"
ng-repeat="folder in Navigation.getFolders() | orderBy:'name.toLowerCase()'"
- ng-show="Navigation.getFolderUnreadCount(folder.id) > 0
+ ng-show="Navigation.isFolderUnread(folder.id)
|| Navigation.isShowAll()
|| Navigation.isFolderActive(folder.id)
|| Navigation.subFeedActive(folder.id)
@@ -96,7 +96,7 @@
<ul>
<li class="app-navigation-entry-utils-counter"
ng-show="folder.id &&
- Navigation.getFolderUnreadCount(folder.id) > 0"
+ Navigation.isFolderUnread(folder.id)"
title="{{ Navigation.getFolderUnreadCount(folder.id) }}">
{{ Navigation.getFolderUnreadCount(folder.id) |
unreadCountFormatter }}
@@ -121,7 +121,7 @@
title="<?php p($l->t('Delete folder')); ?>">
</button>
</li>
- <li ng-show="Navigation.getFolderUnreadCount(folder.id) > 0" class="mark-read">
+ <li ng-show="Navigation.isFolderUnread(folder.id)" class="mark-read">
<button class="icon-checkmark"
ng-click="Navigation.markFolderRead(folder.id)"
title="<?php p($l->t('Mark all articles read')); ?>">
diff --git a/templates/part.navigation.starredfeed.php b/templates/part.navigation.starredfeed.php
index b970c20b9..1f096d57d 100644
--- a/templates/part.navigation.starredfeed.php
+++ b/templates/part.navigation.starredfeed.php
@@ -1,6 +1,6 @@
<li ng-class="{
active: Navigation.isStarredActive(),
- unread: Navigation.getStarredCount() > 0
+ unread: Navigation.isStarredUnread()
}"
class="with-counter starred-feed">
@@ -11,7 +11,7 @@
<div class="app-navigation-entry-utils">
<ul>
<li class="app-navigation-entry-utils-counter"
- ng-show="Navigation.getStarredCount() > 0"
+ ng-show="Navigation.isStarredUnread()"
title="{{ Navigation.getStarredCount() }}">
{{ Navigation.getStarredCount() | unreadCountFormatter }}
</li>
diff --git a/templates/part.navigation.unreadfeed.php b/templates/part.navigation.unreadfeed.php
index 9c9f3c293..2f6bff1bb 100644
--- a/templates/part.navigation.unreadfeed.php
+++ b/templates/part.navigation.unreadfeed.php
@@ -1,6 +1,6 @@
<li ng-class="{
active: Navigation.isSubscriptionsActive(),
- unread: Navigation.getUnreadCount() > 0
+ unread: Navigation.isUnread()
}"
class="subscriptions-feed with-counter with-menu">
@@ -12,10 +12,10 @@
<?php p($l->t('All articles'))?>
</a>
- <div class="app-navigation-entry-utils" ng-show="Navigation.getUnreadCount() > 0">
+ <div class="app-navigation-entry-utils" ng-show="Navigation.isUnread()">
<ul>
<li class="app-navigation-entry-utils-counter"
- ng-show="Navigation.getUnreadCount() > 0"
+ ng-show="Navigation.isUnread()"
title="{{ Navigation.getUnreadCount() }}">
{{ Navigation.getUnreadCount() | unreadCountFormatter }}
</li>