Merge pull request FreshRSS#1773 from kevinpapst/fix-css-classes

Fix css classes for reading modes FreshRSS#1714 FreshRSS#1758
javerous · Jan 26, 2018 · e1749b8 · e1749b8
2 parents ec4346a + 3582d3f
commit e1749b8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git 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 @@ public static function getReadingModes() {
 
 		$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
@@ -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