more additions

3 files changed, 17 insertions, 18 deletions

diff --git a/templates/main.php b/templates/main.php
index b9b00a4a3..f7eb60da0 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -28,8 +28,8 @@
 			<?php print_unescaped($this->inc('part.addnew')) ?>
 			<?php print_unescaped($this->inc('part.feed.unread')) ?>
 			<?php //print_unescaped($this->inc('part.feed.starred')) ?>
-			<?php //print_unescaped($this->inc('part.listfeed', ['folderId' => '0'])) ?>
-			<?php //print_unescaped($this->inc('part.listfolder')) ?>
+			<?php print_unescaped($this->inc('part.listfeed', ['folderId' => '0'])) ?>
+			<?php print_unescaped($this->inc('part.listfolder')) ?>
 		</ul>
 
 		<div id="app-settings" ng-controller="SettingsController as Settings">
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index afecddc37..96e0dafbc 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -3,11 +3,11 @@
 		unread: feedBusinessLayer.getUnreadCount(feed.id) > 0,
 		failed: feed.error
 	}"
-	ng-repeat="feed in feedBusinessLayer.getFeedsOfFolder(<?php p($_['folderId']); ?>) | orderBy:'id':true"
+	ng-repeat="feed in .getFeedsOfFolder(<?php p($_['folderId']); ?>) | orderBy:'id':true"
 	ng-show="feedBusinessLayer.isVisible(feed.id) || !feed.id"
 	data-id="{{ feed.id }}"
 	class="feed"
-	oc-draggable="{
+	news-draggable="{
 		stack: '> li',
 		zIndex: 1000,
 		axis: 'y',
@@ -17,12 +17,12 @@
 		revert: true
 	}">
 
-	<div ui-if="feed.editing" class="rename-feed">
+	<div ng-show="feed.editing" class="rename-feed">
           <input type="text" ng-model="feed.title" autofocus>
-          <button title="<?php p($l->t('Cancel')); ?>" 
+          <button title="<?php p($l->t('Cancel')); ?>"
 		ng-click="cancel(feed)"
 		class="action-button back-button action"></button>
-	  <button title="<?php p($l->t('Save')); ?>" 
+	  <button title="<?php p($l->t('Save')); ?>"
 		ng-click="feedBusinessLayer.renameFeed(feed.id, feed.title)"
 		class="action-button create-button action">
 	  </button>
@@ -38,13 +38,12 @@
 	   	href="#"
 	   	class="title"
 	   	title="{{ feed.title }}"
-	   	oc-click-focus="{selector: '#app-content'}">
 
 	   {{ feed.title }}
 	</a>
 
 	<span class="utils">
-		
+
 		<button ng-click="feedBusinessLayer.delete(feed.id)"
 			class="svg action delete-icon delete-button"
 			title="<?php p($l->t('Delete website')); ?>"
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index c104303b5..3840aa85b 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -1,20 +1,20 @@
 <li ng-class="{
-		active: folderBusinessLayer.isActive(folder.id), 
+		active: folderBusinessLayer.isActive(folder.id),
 		open: folder.opened && folderBusinessLayer.hasFeeds(folder.id),
 		collapsible: folderBusinessLayer.hasFeeds(folder.id),
 		unread: folderBusinessLayer.getUnreadCount(folder.id) != 0,
 		failed: folder.error
-	}" 
+	}"
 	ng-repeat="folder in folderBusinessLayer.getAll() | orderBy:'id':true"
 	ng-show="folderBusinessLayer.isVisible(folder.id) || !folder.id"
 	class="folder"
 	data-id="{{ folder.id }}"
 	droppable>
-	<button class="collapse" 
+	<button class="collapse"
 			ng-hide="folder.editing"
 			title="<?php p($l->t('Collapse'));?>"
 			ng-click="folderBusinessLayer.toggleFolder(folder.id)"></button>
-	<div ui-if="folder.editing" class="rename-feed">
+	<div ng-show="folder.editing" class="rename-feed">
         <input type="text" ng-model="folder.name" class="folder-input" autofocus>
         <button title="<?php p($l->t('Cancel')); ?>"
 			ng-click="folderBusinessLayer.cancel(folder.id)"
@@ -24,7 +24,7 @@
 			class="action-button create-button action">
 	  </button>
     </div>
-	<a href="#" 
+	<a href="#"
 	   class="title folder-icon"
 	   ng-hide="folder.editing"
 	   ng-click="folderBusinessLayer.load(folder.id)"
@@ -40,7 +40,7 @@
 
 		<button ng-click="folderBusinessLayer.delete(folder.id)"
 				ng-hide="folder.editing || !folder.id"
-				class="svg action delete-icon delete-button" 
+				class="svg action delete-icon delete-button"
 				title="<?php p($l->t('Delete folder')); ?>"
 				oc-tooltip></button>
 
@@ -48,8 +48,8 @@
 			ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0 && !folder.editing">
 			{{ unreadCountFormatter(folderBusinessLayer.getUnreadCount(folder.id)) }}
 		</span>
-		
-		<button class="svg action mark-read-icon" 
+
+		<button class="svg action mark-read-icon"
 				ng-show="folderBusinessLayer.getUnreadCount(folder.id) > 0 && folder.id && !folder.editing"
 				ng-click="folderBusinessLayer.markRead(folder.id)"
 				title="<?php p($l->t('Mark read')); ?>"
@@ -71,6 +71,6 @@
 	<ul>
 		<?php print_unescaped($this->inc('part.listfeed', ['folderId' => 'folder.id'])); ?>
 	</ul>
-	
+
 	<div class="message" ng-show="folder.error">{{ folder.error }}</div>
 </li>