From 0d6993fe08cf57121eadb2aa0e4208420756165a Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 12:51:17 +0200
Subject: Reader view comes back!

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/views/helpers/view/reader_view.phtml | 44 --------------------------------
 app/views/index/reader.phtml             | 44 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 app/views/helpers/view/reader_view.phtml
 create mode 100644 app/views/index/reader.phtml

(limited to 'app/views')

diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
deleted file mode 100644
index 821a50f7f..000000000
--- a/app/views/helpers/view/reader_view.phtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$this->partial('nav_menu');
-
-if (!empty($this->entries)) {
-	$lazyload = FreshRSS_Context::$conf->lazyload;
-	$content_width = FreshRSS_Context::$conf->content_width;
-?>
-
-<div id="stream" class="reader">
-	<?php foreach ($this->entries as $item) { ?>
-
-	<div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
-		<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
-					if (empty($feed)) $feed = $item->feed(true);
-				?>
-				<a href="<?php echo $item->link(); ?>">
-					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span>
-				</a>
-				<h1 class="title"><?php echo $item->title(); ?></h1>
-
-				<div class="author"><?php
-					$author = $item->author();
-					echo $author != '' ? _t('by_author', $author) . ' — ' : '',
-						$item->date();
-				?></div>
-
-				<?php echo $item->content(); ?>
-			</div>
-		</div>
-	</div>
-	<?php } ?>
-
-	<?php $this->renderHelper('pagination'); ?>
-</div>
-
-<?php } else { ?>
-<div id="stream" class="prompt alert alert-warn reader">
-	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
-</div>
-<?php } ?>
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
new file mode 100644
index 000000000..f07868488
--- /dev/null
+++ b/app/views/index/reader.phtml
@@ -0,0 +1,44 @@
+<?php
+$this->partial('nav_menu');
+
+if (!empty($this->entries)) {
+	$lazyload = FreshRSS_Context::$conf->lazyload;
+	$content_width = FreshRSS_Context::$conf->content_width;
+?>
+
+<div id="stream" class="reader">
+	<?php foreach ($this->entries as $item) { ?>
+
+	<div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
+		<div class="flux_content">
+			<div class="content <?php echo $content_width; ?>">
+				<?php
+					$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(); ?>">
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span>
+				</a>
+				<h1 class="title"><?php echo $item->title(); ?></h1>
+
+				<div class="author"><?php
+					$author = $item->author();
+					echo $author != '' ? _t('by_author', $author) . ' — ' : '',
+						$item->date();
+				?></div>
+
+				<?php echo $item->content(); ?>
+			</div>
+		</div>
+	</div>
+	<?php } ?>
+
+	<?php $this->renderHelper('pagination'); ?>
+</div>
+
+<?php } else { ?>
+<div id="stream" class="prompt alert alert-warn reader">
+	<h2><?php echo _t('no_feed_to_display'); ?></h2>
+	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
+</div>
+<?php } ?>
-- 
cgit v1.2.3