diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-24 12:51:17 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2014-10-24 12:51:17 +0200 |
| commit | 0d6993fe08cf57121eadb2aa0e4208420756165a (patch) | |
| tree | 30ad643938c4ce5ff02286345694221df9d01a40 /app | |
| parent | 9fc536c28763260dd996f64e2cd451605faa64d3 (diff) | |
Reader view comes back!
See https://github.com/marienfressinaud/FreshRSS/issues/634
Diffstat (limited to 'app')
| -rwxr-xr-x | app/Controllers/indexController.php | 9 | ||||
| -rw-r--r-- | app/layout/nav_menu.phtml | 5 | ||||
| -rw-r--r-- | app/views/index/reader.phtml (renamed from app/views/helpers/view/reader_view.phtml) | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index ed5b58b45..8bc23fb70 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -70,6 +70,15 @@ class FreshRSS_index_Controller extends Minz_ActionController { } /** + * This action displays the reader view of FreshRSS. + * + * @todo: change this view into specific CSS rules? + */ + public function readerAction() { + $this->normalAction(); + } + + /** * This action displays the global view of FreshRSS. */ public function globalAction() { diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml index 6f555c3d0..075f84ca6 100644 --- a/app/layout/nav_menu.phtml +++ b/app/layout/nav_menu.phtml @@ -133,6 +133,11 @@ <?php echo _i("view-normal"); ?> </a> + <?php $url_output['a'] = 'reader'; ?> + <a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>"> + <?php echo _i("view-reader"); ?> + </a> + <?php $url_output['a'] = 'global'; ?> <a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>"> <?php echo _i("view-global"); ?> diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/index/reader.phtml index 821a50f7f..f07868488 100644 --- a/app/views/helpers/view/reader_view.phtml +++ b/app/views/index/reader.phtml @@ -13,7 +13,7 @@ if (!empty($this->entries)) { <div class="flux_content"> <div class="content <?php echo $content_width; ?>"> <?php - $feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed()); //We most likely already have the feed object in cache + $feed = FreshRSS_CategoryDAO::findFeed($this->categories, $item->feed()); //We most likely already have the feed object in cache if (empty($feed)) $feed = $item->feed(true); ?> <a href="<?php echo $item->link(); ?>"> |