diff options
author | Gregor Tätzner <gregor@freenet.de> | 2012-08-03 14:59:43 +0200 |
---|---|---|
committer | Gregor Tätzner <gregor@freenet.de> | 2012-08-03 14:59:43 +0200 |
commit | df3cf447b79d81569dbf7485d6d5844120c369b2 (patch) | |
tree | 0038ca23255967a37161c96df3061fb9d82f6965 /templates | |
parent | 96088f65675d3306bebd0d2a271866dbe18ea926 (diff) |
Move unreaditemcounter code into listfeed
Diffstat (limited to 'templates')
-rw-r--r-- | templates/part.feeds.php | 9 | ||||
-rw-r--r-- | templates/part.itemcounter.php | 18 | ||||
-rw-r--r-- | templates/part.listfeed.php | 11 |
3 files changed, 16 insertions, 22 deletions
diff --git a/templates/part.feeds.php b/templates/part.feeds.php index 3d84617eb..81712a475 100644 --- a/templates/part.feeds.php +++ b/templates/part.feeds.php @@ -11,8 +11,17 @@ print_folder($child); } elseif ($child instanceOf OC_News_Feed) { //onhover $(element).attr('id', 'newID'); + $itemmapper = new OC_News_ItemMapper(); + + $items = $itemmapper->findAll($child->getId()); + $counter = 0; + foreach($items as $item) { + if(!$item->isRead()) + ++$counter; + } $tmpl_feed = new OCP\Template("news", "part.listfeed"); $tmpl_feed->assign('child', $child); + $tmpl_feed->assign('unreadItems',$counter); $tmpl_feed->printpage(); } else { diff --git a/templates/part.itemcounter.php b/templates/part.itemcounter.php deleted file mode 100644 index ba4751033..000000000 --- a/templates/part.itemcounter.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php - -function countUnreadItems($feedid) { - $itemmapper = new OC_News_ItemMapper(); - - $items = $itemmapper->findAll($feedid); - $counter = 0; - foreach($items as $item) { - if(!$item->isRead()) - ++$counter; - } - if ($counter > 0) { - echo '<span id="unreaditemcounter" class="nonzero">' . $counter . '</span>'; - } - else { - echo '<span id="unreaditemcounter" class="zero"></span>'; - } -}
\ No newline at end of file diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index b2ee7c0d2..cd280c111 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -1,18 +1,21 @@ <?php -// FIXME: somehow gets included twice -include_once("part.itemcounter.php"); - $l = new OC_l10n('news'); $child = isset($_['child']) ? $_['child'] : null; +$unreadItems = isset($_['unreadItems']) ? $_['unreadItems'] : null; $favicon = $child->getFavicon(); if ($favicon == null) { $favicon = OCP\Util::imagePath('news', 'rss.svg'); } echo '<li class="feeds_list" data-id="' . $child->getId() . '"><a href="' . OCP\Util::linkTo('news', 'index.php'). '?feedid=' . $child->getId() . '" style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;">' . $child->getTitle() .'</a>'; -countUnreadItems($child->getId()); +if ($unreadItems > 0) { + echo '<span id="unreaditemcounter" class="nonzero">' . $unreadItems . '</span>'; +} +else { + echo '<span id="unreaditemcounter" class="zero"></span>'; +} echo '<button class="svg action" id="feeds_delete" onClick="(News.Feed.delete(' . $child->getId(). '))" title="' . $l->t('Delete feed') . '"></button>'; echo '<button class="svg action" id="feeds_edit" title="' . $l->t('Edit feed') . '"></button>'; echo '</li>'; |