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')

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