implemented bare itembl methods

1 files changed, 21 insertions, 20 deletions

diff --git a/templates/part.items.php b/templates/part.items.php
index 5ff6fa534..ea17d0f40 100644
--- a/templates/part.items.php
+++ b/templates/part.items.php
@@ -1,56 +1,57 @@
 <ul>
 	<li class="feed_item"
-		ng-repeat="item in items | orderBy:'id':true "
-		ng-class="{read: item.isRead}"
-		data-id="{{item.id}}"
-    	data-feed="{{item.feedId}}">
+		ng-repeat="item in itemBl.getAll() | orderBy:'id':true "
+		ng-class="{ read: item.isRead() }"
+		data-id="{{ item.id }}"
+    	data-feed="{{ item.feedId }}">
 		<h2 class="item_date">
-			<time class="timeago" datetime="">{{item.getRelativeDate()}}</time>
+			<time class="timeago" datetime="">{{ item.getRelativeDate() }}</time>
 		</h2>
 		
 		<div class="utils">
 			<ul class="primary_item_utils">
-				<li ng-class="{important: item.isImportant}"
-					ng-click="toggleImportant(item.id)"
+				<li ng-class="{ important: item.isStarred() }"
+					ng-click="itemBl.toggleStarred(item.id)"
 					class="star" 
-					title="{{item.isImportant}}">
+					title="{{ item.isStarred() }}">
 				</li>
 			</ul>
 		</div>
 
 		<h1 class="item_title">
-			<a ng-click="markRead(item.id, item.feedId)" 
-				target="_blank" href="{{item.url}}">{{item.title}}</a>
+			<a ng-click="itemBl.setRead(item.id)" 
+				target="_blank" href="{{ item.url }}">{{ item.title }}</a>
 		</h1>
 
 		<h2 class="item_author">
 			<?php p($l->t('from')) ?>
-			<a href="#" 
-				ng-click="loadFeed(item.feedId)"
-				class="from_feed">{{ getFeedTitle(item.feedId) }}</a> 
+			<a href="#"
+				ng-show="itemBl.noFeedActive()"
+				class="from_feed">{{ itemBl.getFeedTitle(item.id) }}</a> 
 			<span ui-if="item.author">
 				<?php p($l->t('by')) ?>
 				{{ item.author }}
 			</span>
 	</h2>
 
-		<div class="enclosure" ui-if="item.enclosure">
-			<audio controls="controls" ng-src="{{item.enclosure.link}}" type="{{item.enclosure.type}}">
-				<?php p($l->t('Cant play audio format')) ?> {{item.enclosure.type}}
+		<div class="enclosure" ui-if="item.enclosureLink">
+			<audio controls="controls" ng-src="{{ item.enclosureLink }}" 
+					type="{{ item.enclosureType }}">
+				<?php p($l->t('Cant play audio format')) ?> {{item.enclosureType}}
 			</audio>
 		</div>
 		
 		<div class="body" 
-				ng-click="markRead(item.id, item.feedId)" 
+				ng-click="setRead(item.id)" 
 				ng-bind-html-unsafe="item.body">
 		</div>
 
 		<div class="bottom_utils">
 			<ul class="secondary_item_utils"
-				ng-class="{show_keep_unread: isKeptUnread(item.id)}">
-				<li ng-click="keepUnread(item.id, item.feedId)" 
+				ng-class="{ show_keep_unread: itemBl.isKeptUnread(item.id) }">
+				<li ng-click="itemBl.toggleKeepUnread(item.id)" 
 					class="keep_unread"><?php p($l->t('Keep unread')); ?>
-					<input type="checkbox" ng-checked="isKeptUnread(item.id)"/>
+					<input type="checkbox" ng-checked="itemBl.isKeptUnread(item.id)"/>
 				</li>
 			</ul>
 		</div>