From e070c3ed2bec4ea4a6c2a216a5c836d1e02ab381 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 15 Oct 2025 00:08:40 +0200
Subject: Implement search form (#8103)

* Add UI for advanced search
To help users with the seach operators.
Obviously not as powerful as a manually-written search query.
Lack in particular negation and logical *and* for now, but I might try to do something about it.

<img width="939" height="1438" alt="image" src="https://github.com/user-attachments/assets/0bcad39b-eff3-4f44-876b-a2552af2af00" />

* Consistency: allow multiple user queries like S:1,2

* Fix user query and add tests
---
 app/layout/aside_subscription.phtml | 3 +++
 app/layout/nav_menu.phtml           | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/layout')

diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index be414ff03..f7ed09213 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -9,6 +9,9 @@
 				<li class="item">
 					<a href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
 				</li>
+				<li class="item<?= Minz_Request::controllerName() === 'search' ? ' active' : '' ?>">
+					<a href="<?= _url('search', 'index') ?>"><?= _t('gen.menu.advanced_search') ?></a>
+				</li>
 			</ul>
 		</li>
 		<li class="item nav-section">
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 0c6fc7dd2..f29d0ae00 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -57,7 +57,7 @@
 									value="<?= htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search->getRawInput(), ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>"
 									placeholder="<?= _t('gen.menu.search') ?>" title="<?= _t('gen.menu.search') ?>" /><button class="btn" type="submit" title="<?= _t('index.menu.search_short') ?>"><?= _i('search') ?></button>
 							</div>
-							<p class="help"><?= _i('help') ?> <?= _t('gen.menu.search_help') ?></a></p>
+							<p class="help"><?= _i('help') ?> <a href="<?= _url('search', 'index') ?>"><?= _t('gen.menu.advanced_search') ?></a></p>
 						</form>
 					</span>
 				</li>
-- 
cgit v1.2.3