aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-09 00:13:20 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-09 00:13:20 +0100
commitc237a4dc77fdafc5290a1fd2c50d765a691c35e1 (patch)
tree1f4f95c2121c31d20dd9d678d4b70da9c1c4c036 /app
parentff37ae8d4996b3147d7469d36b5edce0ed84cd84 (diff)
Début d'affichage du nombre de favoris non lus
Mais pas encore de mise à jour dynamique Corrige en partie https://github.com/marienfressinaud/FreshRSS/issues/222
Diffstat (limited to 'app')
-rwxr-xr-xapp/controllers/indexController.php2
-rw-r--r--app/layout/aside_flux.phtml4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index c818f1170..5dd847f34 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -64,7 +64,7 @@ class indexController extends ActionController {
$catDAO = new CategoryDAO ();
$this->view->cat_aside = $catDAO->listCategories ();
- $this->view->nb_favorites = $entryDAO->countFavorites ();
+ $this->view->nb_favorites = $entryDAO->countUnreadReadFavorites ();
$this->view->nb_total = $entryDAO->count ();
$this->view->currentName = '';
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 1c1b5559c..e6eb974d2 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -22,9 +22,9 @@
<li>
<div class="category favorites">
- <a data-unread="0" class="btn<?php echo $this->get_c == 'favoris' ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'favoris'); ?>">
+ <a data-unread="<?php echo $this->nb_favorites['unread']; ?>" class="btn<?php echo $this->get_c == 'favoris' ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'favoris'); ?>">
<i class="icon i_bookmark"></i>
- <?php echo Translate::t ('favorite_feeds', $this->nb_favorites); ?>
+ <?php echo Translate::t ('favorite_feeds', $this->nb_favorites['read'] + $this->nb_favorites['unread']); ?>
</a>
</div>
</li>