dont use mock folders, use html delivered from server; deleted unecessary templates and ajax files

6 files changed, 6 insertions, 34 deletions

diff --git a/templates/main.php b/templates/main.php
index 0e5680ce8..099a1a5a5 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -46,7 +46,7 @@ if($showAll){
 	</div>
 </div>
 
-<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['feedid']; ?>">
+<div id="rightcontent" class="rightcontent">
 	<?php
 			echo '<div id="feed_items">';
 				echo $this->inc("part.items");
diff --git a/templates/part.feeds.php b/templates/part.feeds.php
index b1a28ba32..0ee45ad0c 100644
--- a/templates/part.feeds.php
+++ b/templates/part.feeds.php
@@ -33,31 +33,23 @@ function print_collection_list($list) {
 
 $allfeeds = isset($_['allfeeds']) ? $_['allfeeds'] : '';
 $feedId = $_['feedid'];
+$feedType = $_['feedtype'];
 
 $itemMapper = new OCA\News\ItemMapper();
 $starredCount = $itemMapper->countEveryItemByStatus(OCA\News\StatusFlag::IMPORTANT);
 
 ?>
 
-<li class="subscriptions <?php if($feedId === -2){ echo "selected_feed"; }; ?>">
+<li class="subscriptions <?php if($feedType == OCA\News\FeedType::SUBSCRIPTIONS){ echo "active"; }; ?>">
 	<a class="title" href="#" ><?php echo $l->t('New articles'); ?></a>
 	<span class="buttons">
     	<button class="svg action feeds_markread" title="<?php echo $l->t('Mark all read'); ?>"></button>
     </span>
 </li>
-<li class="starred <?php if($feedId === -1){ echo "selected_feed"; }; ?>">
+<li class="starred <?php if($feedType == OCA\News\FeedType::STARRED){ echo "active"; }; ?>">
 	<a class="title" href="#" ><?php echo $l->t('Starred'); ?></a>
 	<span class="unread_items_counter"><?php echo $starredCount ?></span>
 </li>
 
 <?php
-	// provide mock feed and folder elements for js menu
-	$mockFolder = new OCP\Template("news", "part.listfolder");
-	$mockFolder->assign('mock', true);
-	$mockFolder->printpage();
-
-	$mockFolder = new OCP\Template("news", "part.listfeed");
-	$mockFolder->assign('mock', true);
-	$mockFolder->printpage();
-
 	print_collection_list($allfeeds);
diff --git a/templates/part.folderlist.php b/templates/part.folderlist.php
deleted file mode 100644
index f2da64737..000000000
--- a/templates/part.folderlist.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-	function print_folder_list($folderlist, $depth) {
-		foreach($folderlist as $folder) {
-			echo '<li style="margin-left:' . 10*$depth . 'px;" class="menuItem" onclick="News.DropDownMenu.selectItem(this, ' . $folder->getId() . ')">' . $folder->getName() . '</li>';
-		}
-	}
-	
-	print_folder_list($_['folderforest'], 0);
-?>
\ No newline at end of file
diff --git a/templates/part.items.new.php b/templates/part.items.new.php
deleted file mode 100644
index c2976dda9..000000000
--- a/templates/part.items.new.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$title = isset($_['title']) ? $_['title'] : '';
-
-echo	'<div class="rightcontentmsg" id="feedadded">' .
-		'You have subscribed to <b>"' . $title . '"</b>' .
-	'</div>';
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index b20cc52b9..04d67a881 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -18,9 +18,7 @@ if(isset($_['mock'])){
     }
 }
 
-$mockClass = isset($_['mock']) ? 'mock' : '';
-
-echo '<li class="feed ' . $mockClass . '" data-id="' . $feedId . '">';
+echo '<li class="feed" data-id="' . $feedId . '">';
     echo '<a style="background-image: url(' . $favicon . ');" href="#" class="title">' . $feedTitle .'</a>';
 	echo '<span class="unread_items_counter">' . $unreadItemsCount . '</span>';
     echo '<span class="buttons">';
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index cf6a1c5e1..80fda44a6 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -11,9 +11,7 @@ if(isset($_['mock'])){
 	$folderName = $folder->getName();
 }
 
-$mockClass = isset($_['mock']) ? 'mock' : '';
-
-echo '<li class="folder open ' . $mockClass . '" data-id="' . $folderId . '">';
+echo '<li class="folder open" data-id="' . $folderId . '">';
 	echo '<button class="collapsable_trigger" title="' . $l->t('Collapse') . '"></button>';
 	echo '<a href="#" class="title">' . $folderName .	'</a>';
 	echo '<span class="buttons">';