removed feedcount for each item, new styling for the feedlist, moved unreadcount to the top of the current feed, cleaned up javascript

4 files changed, 17 insertions, 8 deletions

diff --git a/templates/part.feeddialog.php b/templates/part.feeddialog.php
index 8d67f2010..6df940164 100644
--- a/templates/part.feeddialog.php
+++ b/templates/part.feeddialog.php
@@ -1,5 +1,5 @@
 
-<div id="addfeed_dialog" title="<?php echo $l->t("Add Feed"); ?>">
+<div id="addfeed_dialog" title="<?php echo $l->t("Add Subscription"); ?>">
 <table width="100%" style="border: 0;">
 <tr>
 	<td>Add new feed</td>
@@ -8,7 +8,7 @@
 			<button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
 			    <?php echo $l->t('Choose folder'); ?>
 			</button>
-			<input id="inputfolderid" type="hidden" name="folderid" value="0" />
+			<input id="inputfolderid" type="hidden" placeholder="<?php echo $l->t("Link"); ?>" name="folderid" value="0" />
 			<ul class="menu" id="dropdownmenu">
 				<?php echo $this->inc("part.folderlist"); ?>
 			</ul>
diff --git a/templates/part.items.header.php b/templates/part.items.header.php
index 7291cb296..831fc54fa 100644
--- a/templates/part.items.header.php
+++ b/templates/part.items.header.php
@@ -1,11 +1,20 @@
 <?php 
 
 if(isset($_['feedid'])){
-    $feedmapper = new OCA\News\FeedMapper();
-    $feed = $feedmapper->findById($_['feedid']);
+    $feedMapper = new OCA\News\FeedMapper();
+    $feed = $feedMapper->findById($_['feedid']);
     $feedTitle = $feed->getTitle();
+    
+    $itemMapper = new OCA\News\ItemMapper();
+    $unreadItemsCount = $itemMapper->countAllStatus($_['feedid'], OCA\News\StatusFlag::UNREAD);
+    if($unreadItemsCount > 0){
+        $readClass = '';
+    } else {
+        $readClass = 'all_read';
+    }
 } else {
     $feedTitle = '';
+    $unreadItemsCount = 0;
 }
 
 // FIXME: get this setting from the database
@@ -14,7 +23,7 @@ $showOnlyUnread = true;
 ?>
 
 <div class="feed_controls">
-   
+   <span class="unreaditemcounter <?php echo $readClass; ?>"><?php echo $unreadItemsCount; ?></span>
     <div class="feed_title">
         <h1 title="<?php echo $feedTitle; ?>"><?php echo $feedTitle; ?></h1>
     </div>
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 8b64a3846..d3008bc91 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -17,7 +17,7 @@ if($unreadItemsCount == 0){
 }
 
 echo '<li class="feed" data-id="' . $feed->getId() . '">';
-echo '<a href="#" style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;" class="' . $allReadClass . '">' . $feed->getTitle() .'</a>';
+echo '<a href="#" style="background-image: url(' . $favicon . '); " class="' . $allReadClass . '">' . $feed->getTitle() .'</a>';
 	echo '<span class="unreaditemcounter ' . $allReadClass . '">' . $unreadItemsCount . '</span>';
 echo '<button class="svg action feeds_edit" title="' . $l->t('Edit feed') . '"></button>';
 echo '<button class="svg action feeds_delete" onClick="(News.Feed.delete(' . $feed->getId(). '))" title="' . $l->t('Delete feed') . '"></button>';
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index 26763090f..c24d9ae72 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -8,9 +8,9 @@ $l = new OC_l10n('news');
 echo '<li class="collapsable_container" data-id="' . $folder->getId() . '"' . (($is_root) ? 'style="margin-left: 0px !important;"' : '') . '>' .
 		'<div class="collapsable" >' .
 			'<button class="collapsable_trigger action" title="' . $folder->getName() . '"></button>' .
-			'<span class="collapsable_title">' .
+			'<a href="#" class="collapsable_title">' .
 				$folder->getName() .
-			'</span>' .
+			'</a>' .
 			( ($is_root) ?
 			''
 			: