xingcheng
/
FreshRSS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev

Browse Source
pull/322/head
Marien Fressinaud 11 years ago
parent 5f478c43c2 c237a4dc77
commit ac7b805140
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/controllers/indexController.php
  2. 4
      app/layout/aside_flux.phtml

2
app/controllers/indexController.php
Unescape View File

@ -64,7 +64,7 @@ class indexController extends ActionController {
$catDAO = new CategoryDAO (); $catDAO = new CategoryDAO ();
$this->view->cat_aside = $catDAO->listCategories (); $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->nb_total = $entryDAO->count ();
$this->view->currentName = ''; $this->view->currentName = '';

4
app/layout/aside_flux.phtml
Unescape View File

@ -22,9 +22,9 @@
<li> <li>
<div class="category favorites"> <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> <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> </a>
</div> </div>
</li> </li>

Write Preview
Loading…
Cancel
Save