diff options
-rw-r--r-- | ajax/loadfeed.php | 2 | ||||
-rw-r--r-- | index.php | 8 | ||||
-rw-r--r-- | js/news.js | 6 | ||||
-rw-r--r-- | templates/main.php | 4 | ||||
-rw-r--r-- | templates/part.feeddialog.php | 2 | ||||
-rw-r--r-- | templates/part.items.header.php | 31 | ||||
-rw-r--r-- | templates/part.nofeeds.php | 2 |
7 files changed, 40 insertions, 15 deletions
diff --git a/ajax/loadfeed.php b/ajax/loadfeed.php index 03f143fe1..adcdb6f07 100644 --- a/ajax/loadfeed.php +++ b/ajax/loadfeed.php @@ -18,6 +18,8 @@ OCP\JSON::callCheck(); $userid = OCP\USER::getUser(); $feedId = trim($_POST['feedId']); +OCP\Config::setUserValue(OCP\USER::getUser(), 'news', 'lastViewedFeed', $feedId); + $l = OC_L10N::get('news'); @@ -35,8 +35,12 @@ $folderforest = $foldermapper->childrenOf(0); //retrieve all the folders if ($allfeeds) { $feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null; if ($feedid == null) { - $feedmapper = new OCA\News\FeedMapper(OCP\USER::getUser($userid)); - $feedid = $feedmapper->mostRecent(); + if(OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'lastViewedFeed') == null){ + $feedmapper = new OCA\News\FeedMapper(OCP\USER::getUser($userid)); + $feedid = $feedmapper->mostRecent(); + } else { + $feedid = OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'lastViewedFeed'); + } } } else { diff --git a/js/news.js b/js/news.js index aa4c2ba78..6c5bda448 100644 --- a/js/news.js +++ b/js/news.js @@ -278,7 +278,11 @@ News={ $feedHandler.setUnreadCount(jsonData.data.unreadItemCount); // select new feed $('li#selected_feed').attr('id', ''); - $('li.feed[data-id="' + feedId + '"]').attr('id', 'selected_feed'); + if(feedId < 0){ + $('li[data-id="' + feedId + '"]').attr('id', 'selected_feed'); + } else { + $('li.feed[data-id="' + feedId + '"]').attr('id', 'selected_feed'); + } // refresh callbacks transformCollapsableTrigger(); bindItemEventListeners(); diff --git a/templates/main.php b/templates/main.php index d895e04fb..037865466 100644 --- a/templates/main.php +++ b/templates/main.php @@ -12,8 +12,8 @@ echo $this->inc("part.items.header"); <div id="leftcontent" class="leftcontent"> <div id="feeds"> <ul data-id="0"> - <li data-id="-2" class="subscriptions folder"><a href="#" ><?php echo $l->t('New articles'); ?></a></li> - <li data-id="-1" class="starred folder"><a href="#" ><?php echo $l->t('Starred'); ?></a></li> + <li data-id="-2" class="subscriptions folder" id="<?php if($_['feedid'] == -2){ echo 'selected_feed'; } ?>"><a href="#" ><?php echo $l->t('New articles'); ?></a></li> + <li data-id="-1" class="starred folder" id="<?php if($_['feedid'] == -1){ echo 'selected_feed'; } ?>"><a href="#" ><?php echo $l->t('Starred'); ?></a></li> <?php echo $this->inc("part.feeds"); ?> </ul> </div> diff --git a/templates/part.feeddialog.php b/templates/part.feeddialog.php index 31628e12a..f2c6317c8 100644 --- a/templates/part.feeddialog.php +++ b/templates/part.feeddialog.php @@ -16,7 +16,7 @@ </td> </tr> <tr> - <td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('Link'); ?>" class="news_input" /></td> + <td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('Address'); ?>" class="news_input" /></td> <td><input type="submit" value="<?php echo $l->t('Add'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td> </tr> </table>
\ No newline at end of file diff --git a/templates/part.items.header.php b/templates/part.items.header.php index 8a2043288..0a49b9e91 100644 --- a/templates/part.items.header.php +++ b/templates/part.items.header.php @@ -1,20 +1,35 @@ <?php if(isset($_['feedid'])){ - $feedMapper = new OCA\News\FeedMapper(); - $feed = $feedMapper->findById($_['feedid']); - $feedTitle = $feed->getTitle(); - + $feedId = $_['feedid']; $itemMapper = new OCA\News\ItemMapper(); - $unreadItemsCount = $itemMapper->countAllStatus($_['feedid'], OCA\News\StatusFlag::UNREAD); - if($unreadItemsCount > 0){ + switch ($feedId) { + case -1: + $feedTitle = $l->t('Starred'); + $unreadItemCount = $itemMapper->countAllStatus($feedId, OCA\News\StatusFlag::IMPORTANT); + break; + + case -2: + $feedTitle = $l->t('New articles'); + $unreadItemCount = $itemMapper->countEveryItemByStatus(OCA\News\StatusFlag::UNREAD); + break; + + default: + $feedMapper = new OCA\News\FeedMapper(); + $feed = $feedMapper->findById($feedId); + $feedTitle = $feed->getTitle(); + $unreadItemCount = $itemMapper->countAllStatus($feedId, OCA\News\StatusFlag::UNREAD); + break; + } + + if($unreadItemCount > 0){ $readClass = ''; } else { $readClass = 'all_read'; } } else { $feedTitle = ''; - $unreadItemsCount = 0; + $unreadItemCount = 0; } $showAll = OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'showAll'); @@ -22,7 +37,7 @@ $showAll = OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'showAll'); ?> <div class="feed_controls"> - <span title="<?php echo $l->t('Unread items'); ?>" class="unreaditemcounter <?php echo $readClass; ?>"><?php echo $unreadItemsCount; ?></span> + <span title="<?php echo $l->t('Unread items'); ?>" class="unreaditemcounter <?php echo $readClass; ?>"><?php echo $unreadItemCount; ?></span> <div class="feed_title"> <h1 title="<?php echo $feedTitle; ?>"><?php echo $feedTitle; ?></h1> </div> diff --git a/templates/part.nofeeds.php b/templates/part.nofeeds.php index 82743f17c..409198f3e 100644 --- a/templates/part.nofeeds.php +++ b/templates/part.nofeeds.php @@ -19,7 +19,7 @@ </td> </tr> <tr> - <td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('Link'); ?>" class="news_input" /></td> + <td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('Address'); ?>" class="news_input" /></td> <td><input type="submit" value="<?php echo $l->t('Add'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td> </tr> </table> |