diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-01-25 22:52:05 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-01-25 22:52:05 +0100 |
| commit | cfe273796d26946a87a7c0f8bc1422bcd7380a7a (patch) | |
| tree | 2ae0435706f85bef084b36110541600d5a73bf9a /app/layout | |
| parent | 84c30445d4fbfcb0ecc3a61aedc94844f84bf171 (diff) | |
| parent | 0233d1d22296dff29e5fac71614a6cb677fa4049 (diff) | |
Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_flux.phtml | 2 | ||||
| -rw-r--r-- | app/layout/header.phtml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index f7d8b12b9..1e3211886 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -23,7 +23,7 @@ <div class="category all"> <a data-unread="<?php echo $this->nb_not_read; ?>" class="btn<?php echo $this->get_c == 'a' ? ' active' : ''; ?>" href="<?php echo Minz_Url::display($arUrl); ?>"> <?php echo FreshRSS_Themes::icon('all'); ?> - <?php echo Minz_Translate::t ('all_feeds'); ?> + <?php echo Minz_Translate::t ('main_stream'); ?> </a> </div> </li> diff --git a/app/layout/header.phtml b/app/layout/header.phtml index b00c30e71..eef53a3fd 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -74,6 +74,7 @@ if (Minz_Configuration::canLogIn()) { <li class="separator"></li> <li class="item"><a href="<?php echo _url ('configure', 'users'); ?>"><?php echo Minz_Translate::t ('users'); ?></a></li> <li class="separator"></li> + <li class="item"><a href="<?php echo _url ('index', 'stats'); ?>"><?php echo Minz_Translate::t ('stats'); ?></a></li> <li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Minz_Translate::t ('about'); ?></a></li> <li class="item"><a href="<?php echo _url ('index', 'logs'); ?>"><?php echo Minz_Translate::t ('logs'); ?></a></li> <?php |