summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-08 17:56:53 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-08 17:56:53 +0200
commitca0864dbcd2b01a31a997c1db28aa241512dcb5f (patch)
treeb6881722220ae3f47bb3d502091d3d0dc736975a /templates
parente6d926de620a470a487010f02b47e3932512db93 (diff)
prework for adding folders
Diffstat (limited to 'templates')
-rw-r--r--templates/part.listfeed.php7
-rw-r--r--templates/part.listfolder.php2
2 files changed, 5 insertions, 4 deletions
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index a9d91718f..0c3a48a19 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -15,9 +15,6 @@
</a>
<span class="utils">
- <button ng-click="feedBl.delete(feed.id)"
- class="svg action delete-icon"
- title="<?php p($l->t('Delete feed')); ?>"></button>
<span class="unread-counter">
{{ feedBl.getUnreadCount(feed.id) }}
@@ -27,6 +24,10 @@
ng-show="feedBl.getUnreadCount(feed.id) > 0"
ng-click="feedBl.markFeedRead(feed.id)"
title="<?php p($l->t('Mark all read')); ?>"></button>
+
+ <button ng-click="feedBl.delete(feed.id)"
+ class="svg action delete-icon"
+ title="<?php p($l->t('Delete feed')); ?>"></button>
</span>
</li>
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index e932babb8..a7e2e7497 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -1,6 +1,6 @@
<li ng-class="{
active: folderBl.isActive(folder.id),
- open: folder.opened,
+ open: folder.opened && folderBl.hasFeeds(folder.id),
collapsible: folderBl.hasFeeds(folder.id),
unread: folderBl.getUnreadCount(folder.id) != 0
}"