From 228d7adfdb90c3fdd179f80fbfde565eb06e0cec Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 15 Jun 2023 12:47:47 +0200
Subject: Fix slider views (#5469)

* Fix slider titles
And fix full-page view of category configuration.
FIx https://github.com/FreshRSS/FreshRSS/pull/5449#issuecomment-1590021947

* Fix user queries and user management
Implement https://github.com/FreshRSS/FreshRSS/pull/5469#issuecomment-1591957935
---
 app/layout/aside_configure.phtml    | 4 ++--
 app/layout/aside_subscription.phtml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/layout')

diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 87fd27c59..03395449b 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -47,7 +47,7 @@ function get_logout_url(): string {
 				<li class="item<?= Minz_Request::actionName() === 'shortcut' ? ' active' : '' ?>">
 					<a href="<?= _url('configure', 'shortcut') ?>"><?= _t('gen.menu.shortcuts') ?></a>
 				</li>
-				<li class="item<?= Minz_Request::actionName() === 'queries' ? ' active' : '' ?>">
+				<li class="item<?= in_array(Minz_Request::actionName(), ['queries', 'query'], true) ? ' active' : '' ?>">
 					<a href="<?= _url('configure', 'queries') ?>"><?= _t('gen.menu.queries') ?></a>
 				</li>
 				<li class="item<?= Minz_Request::controllerName() === 'extension' ? ' active' : '' ?>">
@@ -69,7 +69,7 @@ function get_logout_url(): string {
 				<li class="item<?= Minz_Request::actionName() === 'system' ? ' active' : '' ?>">
 					<a href="<?= _url('configure', 'system') ?>"><?= _t('gen.menu.system') ?></a>
 				</li>
-				<li class="item<?= Minz_Request::controllerName() === 'user' && Minz_Request::actionName() === 'manage' ? ' active' : '' ?>">
+				<li class="item<?= Minz_Request::controllerName() === 'user' && in_array(Minz_Request::actionName(), ['manage', 'details'], true) ? ' active' : '' ?>">
 					<a href="<?= _url('user', 'manage') ?>"><?= _t('gen.menu.user_management') ?></a>
 				</li>
 				<li class="item<?= Minz_Request::controllerName() === 'auth' ? ' active' : '' ?>">
diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index e1f520f34..e6329df46 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -8,7 +8,7 @@
 					<a href="<?= _url('subscription', 'add') ?>"><?= _t('sub.menu.add') ?></a>
 				</li>
 
-				<li class="item<?= Minz_Request::controllerName() === 'subscription' && Minz_Request::actionName() === 'index' ? ' active' : '' ?>">
+				<li class="item<?= Minz_Request::controllerName() === 'subscription' && in_array(Minz_Request::actionName(), ['index', 'category', 'feed'], true) ? ' active' : '' ?>">
 					<a href="<?= _url('subscription', 'index') ?>"><?= _t('sub.menu.subscription_management') ?></a>
 				</li>
 
-- 
cgit v1.2.3