From 983aa587ee71a83d21b17de29d2a26763b18292e Mon Sep 17 00:00:00 2001
From: Patrick Crandol <patrick@crandol.com>
Date: Sat, 15 Dec 2018 04:56:38 -0500
Subject: Add aside_feed to reader view (#2180)

* Add Nav menu to reader mode

At this point, it appears to be non-functional in reader mode.

* Add aside_feed toggle to reader view

* make init_column_categories work in reader view

* Make sidebar links redirect to proper view

* CSS to support toggleable sidebar in reader view

* remove unneeded !important
---
 app/views/index/reader.phtml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/views/index/reader.phtml')

diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index c15b936ee..2f03331b7 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -1,4 +1,5 @@
 <?php
+$this->partial('aside_feed');
 $this->partial('nav_menu');
 
 flush();
-- 
cgit v1.2.3


From 1b26a873db5a892deadb24b129f248b57d2ca5e7 Mon Sep 17 00:00:00 2001
From: Patrick Crandol <patrick@crandol.com>
Date: Mon, 17 Dec 2018 17:38:26 -0500
Subject: Add New Article banner to reader mode (#2188)

---
 app/views/index/reader.phtml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/views/index/reader.phtml')

diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index 2f03331b7..1485a1997 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -12,8 +12,11 @@ if (!empty($this->entries)) {
 	$content_width = FreshRSS_Context::$user_conf->content_width;
 ?>
 
-<div id="stream" class="reader"><?php
-	foreach ($this->entries as $item) {
+<div id="stream" class="reader">
+	<div id="new-article">
+		<a href="<?php echo Minz_Url::display(Minz_Request::currentRequest()); ?>"><?php echo _t('gen.js.new_article'); /* TODO: move string in JS*/ ?></a>
+	</div>
+	<?php foreach ($this->entries as $item) {
 		$item = Minz_ExtensionManager::callHook('entry_before_display', $item);
 		if (is_null($item)) {
 			continue;
-- 
cgit v1.2.3