From d55f017ccd941c135055d7c3a85007b8e7e02449 Mon Sep 17 00:00:00 2001
From: Inverle <inverle@proton.me>
Date: Thu, 4 Dec 2025 08:48:03 +0100
Subject: Implement button for toggling sidebar on all views (#8201)

* Implement button for toggling sidebar on all views

Closes https://github.com/FreshRSS/FreshRSS/issues/7673, https://github.com/FreshRSS/FreshRSS/issues/7100, https://github.com/FreshRSS/FreshRSS/issues/6119, https://github.com/FreshRSS/FreshRSS/issues/5338, https://github.com/FreshRSS/FreshRSS/issues/2792, https://github.com/FreshRSS/FreshRSS/issues/4224, https://github.com/FreshRSS/FreshRSS/issues/4136

https://github.com/user-attachments/assets/0629e465-6450-440e-b38b-430e9ff73ef9

Keyboard shortcut for doing the same: <kbd>t</kbd>

* Partially fix other views

Repartition page looks broken on Swage

* Correction

`close-aside` wasn't meant to be removed

* i18n(conf): fr

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

* make fix-all

* Fix settings slider not opening in reader view

* make readme

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
---
 app/layout/aside_configure.phtml    | 7 ++++++-
 app/layout/aside_subscription.phtml | 6 +++++-
 app/layout/nav_menu.phtml           | 4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'app/layout')

diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 6ebf232e2..e4c8741dc 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -109,6 +109,11 @@
 	</ul>
 </nav>
 <a class="close-aside" href="#close">❌</a>
+
 <nav class="nav_menu nav_mobile">
-	<a class="btn toggle_aside" href="#aside_feed"><?= _i('category') ?></a>
+	<div id="nav_menu_toggle_aside" class="group">
+		<button class="btn" title="<?= _t('conf.shortcut.toggle_aside') ?>">
+			<?= _i('category') ?>
+		</button>
+	</div>
 </nav>
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index f7ed09213..6493f59c8 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -61,6 +61,10 @@
 <?php if (Minz_Request::actionName() !== 'repartition') { ?>
 	<a class="close-aside" href="#close">❌</a>
 	<nav class="nav_menu nav_mobile">
-		<a class="btn toggle_aside" href="#aside_feed"><?= _i('category') ?></a>
+		<div id="nav_menu_toggle_aside">
+			<button class="btn">
+				<?= _i('category') ?>
+			</button>
+		</div>
 	</nav>
 <?php } ?>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 4529d0df3..cc158a674 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -5,7 +5,9 @@
 <nav class="nav_menu">
 	<?php if ($actual_view === 'normal' || $actual_view === 'reader') { ?>
 		<div id="nav_menu_toggle_aside" class="group">
-			<a class="btn toggle_aside" href="#aside_feed"><?= _i('category') ?></a>
+			<button class="btn<?= $actual_view === 'normal' ? ' active' : '' ?>" title="<?= _t('conf.shortcut.toggle_aside') ?>">
+				<?= _i('category') ?>
+			</button>
 		</div>
 	<?php } ?>
 
-- 
cgit v1.2.3