Implement dynamic folder adding in the same way like feed adding

1 files changed, 10 insertions, 17 deletions

diff --git a/templates/part.feeds.php b/templates/part.feeds.php
index df781767c..3d84617eb 100644
--- a/templates/part.feeds.php
+++ b/templates/part.feeds.php
@@ -1,26 +1,19 @@
 <?php
 
-	function print_folder(OC_News_Folder $folder, $depth){
-		$l = new OC_l10n('news');
-		echo '<ul class="folders"' . (($depth == 0) ? 'style="margin-left: 0px !important;"' : '') .'> <li class="folder_list" >' .
-			'<div class="collapsable_container" data-id="' . $folder->getId() . '">' .
-				'<div class="collapsable" >' . strtoupper($folder->getName()) .
-				    ( ($depth != 0) ?
-				'<button class="svg action" id="feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '"></button>' .
-				'<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>'
-				: '' ) .
-				'</div>' .
-				'<ul>';
+	function print_folder(OC_News_Folder $folder){
+		$tmpl_folder = new OCP\Template("news", "part.listfolder");
+		$tmpl_folder->assign('folder', $folder);
+		$tmpl_folder->printpage();
 
 		$children = $folder->getChildren();
 		foreach($children as $child) {
 			if ($child instanceOf OC_News_Folder){
-				print_folder($child, $depth+1);
+				print_folder($child);
 			}
 			elseif ($child instanceOf OC_News_Feed) { //onhover $(element).attr('id', 'newID');
-				$tmpl = new OCP\Template("news", "part.listfeed");
-				$tmpl->assign('child', $child);
-				$tmpl->printpage();
+				$tmpl_feed = new OCP\Template("news", "part.listfeed");
+				$tmpl_feed->assign('child', $child);
+				$tmpl_feed->printpage();
 			}
 			else {
 			//TODO:handle error in this case
@@ -28,6 +21,6 @@
 		}
 		echo '</ul></div></li></ul>';
 	}
-	
-	print_folder($_['allfeeds'], 0);
+
+	print_folder($_['allfeeds']);
 ?>
\ No newline at end of file