diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-09 00:30:01 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-11-09 00:30:01 +0100 |
| commit | ac7b805140ce6b40ab5cc8ca510d51fa13b2734c (patch) | |
| tree | d834919da172c1cde63f577d55f529656e986aad /app | |
| parent | 5f478c43c2fe3b82104c89f61df277392f382dcb (diff) | |
| parent | c237a4dc77fdafc5290a1fd2c50d765a691c35e1 (diff) | |
Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev
Diffstat (limited to 'app')
| -rwxr-xr-x | app/controllers/indexController.php | 2 | ||||
| -rw-r--r-- | app/layout/aside_flux.phtml | 4 |
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> |