chylex/Nextcloud-News
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-News.git synced 2025-04-09 10:15:44 +02:00
Code

fixed bug that wouldnt highlight last viewed feed/folder

Browse Source
This commit is contained in:
Bernhard Posselt 2012-10-13 03:18:58 +02:00
parent 8904f6d3f5
commit 523f5304be
4 changed files with 15 additions and 6 deletions

3
templates/main.php
View File

@ -5,6 +5,9 @@
<?php
$l = $_['trans'];
$lastViewedFeedId = $_['lastViewedFeedId'];
$lastViewedFeedType = $_['lastViewedFeedType'];
if($_['showAll']) {
$viewButtonImg = 'eye_all.svg';

13
templates/part.feeds.php
View File

@ -1,13 +1,16 @@
<?php
function print_collection_list($list) {
function print_collection_list($list, $lastViewedFeedId, $lastViewedFeedType) {
foreach($list as $collection) {
if ($collection instanceOf OCA\News\Folder) {
$tmpl_folder = new OCP\Template("news", "part.listfolder");
$tmpl_folder->assign('folder', $collection);
$tmpl_folder->assign('lastViewedFeedId', $lastViewedFeedId);
$tmpl_folder->assign('lastViewedFeedType', $lastViewedFeedType);
$tmpl_folder->printpage();
print_collection_list($collection->getChildren());
print_collection_list($collection->getChildren(), $lastViewedFeedId,
$lastViewedFeedType);
echo '</ul></li>';
}
elseif ($collection instanceOf OCA\News\Feed) { //onhover $(element).attr('id', 'newID');
@ -22,6 +25,8 @@ function print_collection_list($list) {
$tmpl_feed = new OCP\Template("news", "part.listfeed");
$tmpl_feed->assign('feed', $collection);
$tmpl_feed->assign('unreadItemsCount',$counter);
$tmpl_feed->assign('lastViewedFeedId', $lastViewedFeedId);
$tmpl_feed->assign('lastViewedFeedType', $lastViewedFeedType);
$tmpl_feed->printpage();
}
else {
@ -34,7 +39,7 @@ function print_collection_list($list) {
$allfeeds = isset($_['allfeeds']) ? $_['allfeeds'] : '';
$lastViewedFeedId = $_['lastViewedFeedId'];
$lastViewedFeedType = $_['lastViewedFeedType'];
$starredCount = $_['starredCount']
$starredCount = $_['starredCount'];
?>
@ -50,4 +55,4 @@ $starredCount = $_['starredCount']
</li>
<?php
print_collection_list($allfeeds);
print_collection_list($allfeeds, $lastViewedFeedId, $lastViewedFeedType);

3
templates/part.listfeed.php
View File

@ -16,7 +16,8 @@ if ($favicon == null) {
$lastViewedFeedId = isset($_['lastViewedFeedId']) ? $_['lastViewedFeedId'] : null;
$lastViewedFeedType = isset($_['lastViewedFeedType']) ? $_['lastViewedFeedType'] : null;
if ($lastViewedFeedType === OCA\News\FeedType::FEED && $lastViewedFeedId === $feedId){
if ($lastViewedFeedType == OCA\News\FeedType::FEED && $lastViewedFeedId == $feedId){
$activeClass = 'active';
} else {
$activeClass = '';

2
templates/part.listfolder.php
View File

@ -16,7 +16,7 @@ if($folder->getOpened()){
$lastViewedFeedId = isset($_['lastViewedFeedId']) ? $_['lastViewedFeedId'] : null;
$lastViewedFeedType = isset($_['lastViewedFeedType']) ? $_['lastViewedFeedType'] : null;
if ($lastViewedFeedType === OCA\News\FeedType::FOLDER && $lastViewedFeedId === $feedId){
if ($lastViewedFeedType == OCA\News\FeedType::FOLDER && $lastViewedFeedId == $folderId){
$activeClass = 'active';
} else {
$activeClass = '';