From 84c78098d27de624319df37ffb1a522318ec6778 Mon Sep 17 00:00:00 2001
From: Kevin Papst <kpapst@gmx.net>
Date: Sun, 10 Dec 2017 11:31:19 +0100
Subject: added new extension hook using hook for reading modes in navigation

---
 app/layout/nav_menu.phtml | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'app/layout/nav_menu.phtml')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index f6d824d55..c0141e8a4 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -131,20 +131,38 @@
 
 	<?php $url_output = Minz_Request::currentRequest(); ?>
 	<div class="stick" id="nav_menu_views">
-		<?php $url_output['a'] = 'normal'; ?>
-		<a class="view_normal btn <?php echo $actual_view == 'normal'? 'active' : ''; ?>" title="<?php echo _t('index.menu.normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
-			<?php echo _i("view-normal"); ?>
-		</a>
+		<?php
+		$readingModes = array(
+			'normal' => array(
+				'name' => _i("view-normal"),
+				'title' => _t('index.menu.normal_view'),
+				'url' => array_merge($url_output, array('c' => Minz_Request::defaultControllerName(), 'a' => 'normal')),
+				'active' => (Minz_Request::controllerName() == Minz_Request::defaultControllerName() && $actual_view == 'normal'),
+			),
+			'global' => array(
+				'name' => _i("view-global"),
+				'title' => _t('index.menu.global_view'),
+				'url' => array_merge($url_output, array('c' => Minz_Request::defaultControllerName(), 'a' => 'global')),
+				'active' => (Minz_Request::controllerName() == Minz_Request::defaultControllerName() && $actual_view == 'global'),
+			),
+			'reader' => array(
+				'name' => _i("view-reader"),
+				'title' => _t('index.menu.reader_view'),
+				'url' => array_merge($url_output, array('c' => Minz_Request::defaultControllerName(), 'a' => 'reader')),
+				'active' => (Minz_Request::controllerName() == Minz_Request::defaultControllerName() && $actual_view == 'reader'),
+			),
+		);
 
-		<?php $url_output['a'] = 'global'; ?>
-		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('index.menu.global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
-			<?php echo _i("view-global"); ?>
-		</a>
+		$readingModes = Minz_ExtensionManager::callHook('nav_reading_modes', $readingModes);
 
-		<?php $url_output['a'] = 'reader'; ?>
-		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('index.menu.reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
-			<?php echo _i("view-reader"); ?>
-		</a>
+		foreach($readingModes as $key => $mode) {
+				?>
+				<a class="view_normal btn <?php if ($mode['active']) { echo 'active'; } ?>" title="<?php echo $mode['title']; ?>" href="<?php echo Minz_Url::display($mode['url']); ?>">
+					<?php echo $mode['name']; ?>
+				</a>
+				<?php
+			}
+		?>
 
 		<?php
 			$url_output['a'] = 'rss';
-- 
cgit v1.2.3


From 1b7cc49d2253caf6f2ea9e3bbc5d380aeaff4ea1 Mon Sep 17 00:00:00 2001
From: Kevin Papst <kpapst@gmx.net>
Date: Sun, 10 Dec 2017 15:04:01 +0100
Subject: refactored ReadingModes to Model

---
 app/Models/ReadingMode.php | 136 +++++++++++++++++++++++++++++++++++++++++++++
 app/layout/nav_menu.phtml  |  37 +++---------
 2 files changed, 145 insertions(+), 28 deletions(-)
 create mode 100644 app/Models/ReadingMode.php

(limited to 'app/layout/nav_menu.phtml')

diff --git a/app/Models/ReadingMode.php b/app/Models/ReadingMode.php
new file mode 100644
index 000000000..06170a468
--- /dev/null
+++ b/app/Models/ReadingMode.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * Manage the reading modes in FreshRSS.
+ */
+class FreshRSS_ReadingMode {
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+	/**
+	 * @var string
+	 */
+	protected $title;
+	/**
+	 * @var string[]
+	 */
+	protected $urlParams;
+	/**
+	 * @var bool
+	 */
+	protected $isActive = false;
+
+	/**
+	 * ReadingMode constructor.
+	 * @param string $name
+	 * @param string $title
+	 * @param string[] $urlParams
+	 * @param bool $active
+	 */
+	public function __construct($name, $title, $urlParams, $active) {
+		$this->name = $name;
+		$this->title = $title;
+		$this->urlParams = $urlParams;
+		$this->isActive = $active;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName() {
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 * @return FreshRSS_ReadingMode
+	 */
+	public function setName($name) {
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTitle() {
+		return $this->title;
+	}
+
+	/**
+	 * @param string $title
+	 * @return FreshRSS_ReadingMode
+	 */
+	public function setTitle($title) {
+		$this->title = $title;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUrlParams() {
+		return $this->urlParams;
+	}
+
+	/**
+	 * @param string $urlParams
+	 * @return FreshRSS_ReadingMode
+	 */
+	public function setUrlParams($urlParams) {
+		$this->urlParams = $urlParams;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isActive() {
+		return $this->isActive;
+	}
+
+	/**
+	 * @param bool $isActive
+	 * @return FreshRSS_ReadingMode
+	 */
+	public function setIsActive($isActive) {
+		$this->isActive = $isActive;
+		return $this;
+	}
+
+	/**
+	 * Returns the built-in reading modes.
+	 * return ReadingMode[]
+	 */
+	public static function getReadingModes() {
+		$actualView = Minz_Request::actionName();
+		$defaultCtrl = Minz_Request::defaultControllerName();
+		$isDefaultCtrl = Minz_Request::controllerName() == $defaultCtrl;
+		$urlOutput = Minz_Request::currentRequest();
+
+		$readingModes = array(
+			new FreshRSS_ReadingMode(
+				_i("view-normal"),
+				_t('index.menu.normal_view'),
+				array_merge($urlOutput, array('c' => $defaultCtrl, 'a' => 'normal')),
+				($isDefaultCtrl && $actualView === 'normal')
+			),
+			new FreshRSS_ReadingMode(
+				_i("view-global"),
+				_t('index.menu.global_view'),
+				array_merge($urlOutput, array('c' => $defaultCtrl, 'a' => 'global')),
+				($isDefaultCtrl && $actualView === 'global')
+			),
+			new FreshRSS_ReadingMode(
+				_i("view-reader"),
+				_t('index.menu.reader_view'),
+				array_merge($urlOutput, array('c' => $defaultCtrl, 'a' => 'reader')),
+				($isDefaultCtrl && $actualView === 'reader')
+			),
+		);
+
+		return $readingModes;
+	}
+}
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index c0141e8a4..403ac5cd6 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -132,36 +132,17 @@
 	<?php $url_output = Minz_Request::currentRequest(); ?>
 	<div class="stick" id="nav_menu_views">
 		<?php
-		$readingModes = array(
-			'normal' => array(
-				'name' => _i("view-normal"),
-				'title' => _t('index.menu.normal_view'),
-				'url' => array_merge($url_output, array('c' => Minz_Request::defaultControllerName(), 'a' => 'normal')),
-				'active' => (Minz_Request::controllerName() == Minz_Request::defaultControllerName() && $actual_view == 'normal'),
-			),
-			'global' => array(
-				'name' => _i("view-global"),
-				'title' => _t('index.menu.global_view'),
-				'url' => array_merge($url_output, array('c' => Minz_Request::defaultControllerName(), 'a' => 'global')),
-				'active' => (Minz_Request::controllerName() == Minz_Request::defaultControllerName() && $actual_view == 'global'),
-			),
-			'reader' => array(
-				'name' => _i("view-reader"),
-				'title' => _t('index.menu.reader_view'),
-				'url' => array_merge($url_output, array('c' => Minz_Request::defaultControllerName(), 'a' => 'reader')),
-				'active' => (Minz_Request::controllerName() == Minz_Request::defaultControllerName() && $actual_view == 'reader'),
-			),
-		);
-
+		$readingModes = FreshRSS_ReadingMode::getReadingModes();
 		$readingModes = Minz_ExtensionManager::callHook('nav_reading_modes', $readingModes);
 
-		foreach($readingModes as $key => $mode) {
-				?>
-				<a class="view_normal btn <?php if ($mode['active']) { echo 'active'; } ?>" title="<?php echo $mode['title']; ?>" href="<?php echo Minz_Url::display($mode['url']); ?>">
-					<?php echo $mode['name']; ?>
-				</a>
-				<?php
-			}
+		/** @var FreshRSS_ReadingMode $mode */
+		foreach($readingModes as $mode) {
+			?>
+			<a class="view_normal btn <?php if ($mode->isActive()) { echo 'active'; } ?>" title="<?php echo $mode->getTitle(); ?>" href="<?php echo Minz_Url::display($mode->getUrlParams()); ?>">
+				<?php echo $mode->getName(); ?>
+			</a>
+			<?php
+		}
 		?>
 
 		<?php
-- 
cgit v1.2.3


From 97d4250bd308175b72785f784d5b15e41ed7b04f Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 1 Jan 2018 20:48:33 +0100
Subject: Minor syntax

---
 app/Models/ReadingMode.php | 2 +-
 app/layout/nav_menu.phtml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/layout/nav_menu.phtml')

diff --git a/app/Models/ReadingMode.php b/app/Models/ReadingMode.php
index 06170a468..1e97e228a 100644
--- a/app/Models/ReadingMode.php
+++ b/app/Models/ReadingMode.php
@@ -107,7 +107,7 @@ class FreshRSS_ReadingMode {
 	public static function getReadingModes() {
 		$actualView = Minz_Request::actionName();
 		$defaultCtrl = Minz_Request::defaultControllerName();
-		$isDefaultCtrl = Minz_Request::controllerName() == $defaultCtrl;
+		$isDefaultCtrl = Minz_Request::controllerName() === $defaultCtrl;
 		$urlOutput = Minz_Request::currentRequest();
 
 		$readingModes = array(
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 403ac5cd6..a018a7185 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -136,7 +136,7 @@
 		$readingModes = Minz_ExtensionManager::callHook('nav_reading_modes', $readingModes);
 
 		/** @var FreshRSS_ReadingMode $mode */
-		foreach($readingModes as $mode) {
+		foreach ($readingModes as $mode) {
 			?>
 			<a class="view_normal btn <?php if ($mode->isActive()) { echo 'active'; } ?>" title="<?php echo $mode->getTitle(); ?>" href="<?php echo Minz_Url::display($mode->getUrlParams()); ?>">
 				<?php echo $mode->getName(); ?>
-- 
cgit v1.2.3


From 047fa17aeb65dfb6b551bf73e610057e8d78142c Mon Sep 17 00:00:00 2001
From: Kevin Papst <kpapst@gmx.net>
Date: Wed, 24 Jan 2018 19:37:24 +0100
Subject: fixed css classes for reading mode buttons #1714

---
 app/Models/ReadingMode.php | 24 ++++++++++++++++++------
 app/layout/nav_menu.phtml  |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'app/layout/nav_menu.phtml')

diff --git a/app/Models/ReadingMode.php b/app/Models/ReadingMode.php
index 1e97e228a..06af1704c 100644
--- a/app/Models/ReadingMode.php
+++ b/app/Models/ReadingMode.php
@@ -5,6 +5,10 @@
  */
 class FreshRSS_ReadingMode {
 
+	/**
+	 * @var string
+	 */
+	protected $id;
 	/**
 	 * @var string
 	 */
@@ -24,18 +28,26 @@ class FreshRSS_ReadingMode {
 
 	/**
 	 * ReadingMode constructor.
-	 * @param string $name
+	 * @param string $id
 	 * @param string $title
 	 * @param string[] $urlParams
 	 * @param bool $active
 	 */
-	public function __construct($name, $title, $urlParams, $active) {
-		$this->name = $name;
+	public function __construct($id, $title, $urlParams, $active) {
+		$this->id = $id;
+		$this->name = _i($id);
 		$this->title = $title;
 		$this->urlParams = $urlParams;
 		$this->isActive = $active;
 	}
 
+	/**
+	 * @return string
+	 */
+	public function getId() {
+		return $this->id;
+	}
+
 	/**
 	 * @return string
 	 */
@@ -112,19 +124,19 @@ class FreshRSS_ReadingMode {
 
 		$readingModes = array(
 			new FreshRSS_ReadingMode(
-				_i("view-normal"),
+				"view-normal",
 				_t('index.menu.normal_view'),
 				array_merge($urlOutput, array('c' => $defaultCtrl, 'a' => 'normal')),
 				($isDefaultCtrl && $actualView === 'normal')
 			),
 			new FreshRSS_ReadingMode(
-				_i("view-global"),
+				"view-global",
 				_t('index.menu.global_view'),
 				array_merge($urlOutput, array('c' => $defaultCtrl, 'a' => 'global')),
 				($isDefaultCtrl && $actualView === 'global')
 			),
 			new FreshRSS_ReadingMode(
-				_i("view-reader"),
+				"view-reader",
 				_t('index.menu.reader_view'),
 				array_merge($urlOutput, array('c' => $defaultCtrl, 'a' => 'reader')),
 				($isDefaultCtrl && $actualView === 'reader')
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 7632b944c..e9128d44a 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -138,7 +138,7 @@
 		/** @var FreshRSS_ReadingMode $mode */
 		foreach ($readingModes as $mode) {
 			?>
-			<a class="view_normal btn <?php if ($mode->isActive()) { echo 'active'; } ?>" title="<?php echo $mode->getTitle(); ?>" href="<?php echo Minz_Url::display($mode->getUrlParams()); ?>">
+			<a class="<?php echo $mode->getId(); ?> btn <?php if ($mode->isActive()) { echo 'active'; } ?>" title="<?php echo $mode->getTitle(); ?>" href="<?php echo Minz_Url::display($mode->getUrlParams()); ?>">
 				<?php echo $mode->getName(); ?>
 			</a>
 			<?php
-- 
cgit v1.2.3


From 951eb708e609622f31faba591b624b5e9c901897 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 26 Jan 2018 08:17:32 +0100
Subject: Fix shortcuts for view switching

I've introduced shortcuts to switch between view in #1755. They have been broken by #1714.
Then I've made an ugly fix in #1758.

This change revert all changes to have something better.

See #1757
---
 app/layout/nav_menu.phtml | 2 +-
 p/scripts/main.js         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/layout/nav_menu.phtml')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index e9128d44a..ab82c723f 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -155,7 +155,7 @@
 				$url_output['params']['hours'] = FreshRSS_Context::$user_conf->since_hours_posts_per_rss;
 			}
 		?>
-		<a class="view_rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view-rss btn" target="_blank" rel="noreferrer" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i('rss'); ?>
 		</a>
 	</div>
diff --git a/p/scripts/main.js b/p/scripts/main.js
index fb01461c6..f8d20767a 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -705,25 +705,25 @@ function init_shortcuts() {
 	});
 
 	shortcut.add(shortcuts.normal_view, function () {
-		$('#nav_menu_views a').get(0).click();
+		$('#nav_menu_views .view-normal').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.global_view, function () {
-		$('#nav_menu_views a').get(1).click();
+		$('#nav_menu_views .view-global').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.reading_view, function () {
-		$('#nav_menu_views a').get(2).click();
+		$('#nav_menu_views .view-reader').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
 
 	shortcut.add(shortcuts.rss_view, function () {
-		$('#nav_menu_views a').get(-1).click();
+		$('#nav_menu_views .view-rss').get(0).click();
 	}, {
 		'disable_in_input': true
 	});
-- 
cgit v1.2.3