From e53ba88bb96ba1343ffc771f6170baa4342b4e39 Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Mon, 30 Jan 2023 20:32:55 +0100
Subject: Search Improved: dropdown (#4994)

* first draft

* fix

* RTL CSS

* add link to documentation

* hide search button in desktop view

* rename .no-desktop to .only-mobile

* i18n

* add ID

* Theme: Swage

* Theme Scewdriver

* Theme Pafat

* Theme flat

* Theme: Adark

* Theme: Dark

* i18n: German

* i18n en-us

* fix i18n

* Update app/i18n/fr/gen.php

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

* Update app/layout/nav_menu.phtml

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

* Update app/layout/nav_menu.phtml

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

* Update app/layout/nav_menu.phtml

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

* wip

* mapco theme

* RTL for Ansum and Mapco

* fix

* fix

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
---
 app/i18n/cz/gen.php       |  1 +
 app/i18n/de/gen.php       |  1 +
 app/i18n/el/gen.php       |  1 +
 app/i18n/en-us/gen.php    |  1 +
 app/i18n/en/gen.php       |  1 +
 app/i18n/es/gen.php       |  1 +
 app/i18n/fr/gen.php       |  1 +
 app/i18n/he/gen.php       |  1 +
 app/i18n/id/gen.php       |  1 +
 app/i18n/it/gen.php       |  1 +
 app/i18n/ja/gen.php       |  1 +
 app/i18n/ko/gen.php       |  1 +
 app/i18n/nl/gen.php       |  1 +
 app/i18n/oc/gen.php       |  1 +
 app/i18n/pl/gen.php       |  1 +
 app/i18n/pt-br/gen.php    |  1 +
 app/i18n/ru/gen.php       |  1 +
 app/i18n/sk/gen.php       |  1 +
 app/i18n/tr/gen.php       |  1 +
 app/i18n/zh-cn/gen.php    |  1 +
 app/i18n/zh-tw/gen.php    |  1 +
 app/layout/nav_menu.phtml | 72 +++++++++++++++++++++++++++++------------------
 22 files changed, 65 insertions(+), 28 deletions(-)

(limited to 'app')

diff --git a/app/i18n/cz/gen.php b/app/i18n/cz/gen.php
index 3c9b0ec16..cf7973a3c 100644
--- a/app/i18n/cz/gen.php
+++ b/app/i18n/cz/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Uživatelské dotazy',
 		'reading' => 'Čtení',
 		'search' => 'Hledat slova nebo #štítky',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Sdílení',
 		'shortcuts' => 'Zkratky',
 		'stats' => 'Statistika',
diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php
index e3cf385fd..e4dac4282 100644
--- a/app/i18n/de/gen.php
+++ b/app/i18n/de/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Benutzerabfragen',
 		'reading' => 'Lesen',
 		'search' => 'Suche Worte oder #Tags',
+		'search_help' => 'Siehe Dokumentation zu den <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">Suchparametern</a>',
 		'sharing' => 'Teilen',
 		'shortcuts' => 'Tastaturkürzel',
 		'stats' => 'Statistiken',
diff --git a/app/i18n/el/gen.php b/app/i18n/el/gen.php
index aa1051564..d6816a5d8 100644
--- a/app/i18n/el/gen.php
+++ b/app/i18n/el/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'User queries',	// TODO
 		'reading' => 'Reading',	// TODO
 		'search' => 'Search words or #tags',	// TODO
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Sharing',	// TODO
 		'shortcuts' => 'Shortcuts',	// TODO
 		'stats' => 'Statistics',	// TODO
diff --git a/app/i18n/en-us/gen.php b/app/i18n/en-us/gen.php
index 5eb409fdc..52baba32b 100644
--- a/app/i18n/en-us/gen.php
+++ b/app/i18n/en-us/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'User queries',	// IGNORE
 		'reading' => 'Reading',	// IGNORE
 		'search' => 'Search words or #tags',	// IGNORE
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// IGNORE
 		'sharing' => 'Sharing',	// IGNORE
 		'shortcuts' => 'Shortcuts',	// IGNORE
 		'stats' => 'Statistics',	// IGNORE
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index 2ce5871e3..a30690a25 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'User queries',
 		'reading' => 'Reading',
 		'search' => 'Search words or #tags',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Sharing',
 		'shortcuts' => 'Shortcuts',
 		'stats' => 'Statistics',
diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php
index 54877d3df..a636d407a 100755
--- a/app/i18n/es/gen.php
+++ b/app/i18n/es/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Peticiones de usuario',
 		'reading' => 'Lectura',
 		'search' => 'Buscar palabras o #etiquetas',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Compartir',
 		'shortcuts' => 'Atajos',
 		'stats' => 'Estadísticas',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index fec2b7d4a..4baa93d18 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Filtres utilisateurs',
 		'reading' => 'Lecture',
 		'search' => 'Rechercher des mots ou des #tags',
+		'search_help' => 'Voir <a href="https://freshrss.github.io/FreshRSS/fr/users/03_Main_view.html#gr%C3%A2ce-au-champ-de-recherche" target="_blank">la documentation pour la syntaxe des recherches avancées</a>',
 		'sharing' => 'Partage',
 		'shortcuts' => 'Raccourcis',
 		'stats' => 'Statistiques',
diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php
index 20b93eb7e..317482a09 100644
--- a/app/i18n/he/gen.php
+++ b/app/i18n/he/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'שאילתות',
 		'reading' => 'קריאה',
 		'search' => 'חיפוש מילים או #תגים',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'שיתוף',
 		'shortcuts' => 'קיצורי דרך',
 		'stats' => 'סטטיסטיקות',
diff --git a/app/i18n/id/gen.php b/app/i18n/id/gen.php
index 3e791c607..a2baff42f 100644
--- a/app/i18n/id/gen.php
+++ b/app/i18n/id/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'User queries',	// TODO
 		'reading' => 'Reading',	// TODO
 		'search' => 'Search words or #tags',	// TODO
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Sharing',	// TODO
 		'shortcuts' => 'Shortcuts',	// TODO
 		'stats' => 'Statistics',	// TODO
diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php
index 09844d072..465b758c0 100644
--- a/app/i18n/it/gen.php
+++ b/app/i18n/it/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Ricerche personali',
 		'reading' => 'Lettura',
 		'search' => 'Ricerca parole o #tags',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Condivisione',
 		'shortcuts' => 'Comandi tastiera',
 		'stats' => 'Statistiche',
diff --git a/app/i18n/ja/gen.php b/app/i18n/ja/gen.php
index 85d130e37..7ad2f2eb8 100644
--- a/app/i18n/ja/gen.php
+++ b/app/i18n/ja/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'ユーザークエリ',
 		'reading' => 'リーディング',
 		'search' => '単語で検索するかハッシュタグで検索する',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => '共有',
 		'shortcuts' => 'ショートカット',
 		'stats' => '統計',
diff --git a/app/i18n/ko/gen.php b/app/i18n/ko/gen.php
index ba15726a3..63e3ba478 100644
--- a/app/i18n/ko/gen.php
+++ b/app/i18n/ko/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => '사용자 쿼리',
 		'reading' => '읽기',
 		'search' => '단어 또는 #태그 검색',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => '공유',
 		'shortcuts' => '단축키',
 		'stats' => '통계',
diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php
index e06e05db7..0c5122643 100644
--- a/app/i18n/nl/gen.php
+++ b/app/i18n/nl/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Gebruikers informatie',
 		'reading' => 'Lezen',
 		'search' => 'Zoek woorden of #labels',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Delen',
 		'shortcuts' => 'Snelle toegang',
 		'stats' => 'Statistieken',
diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php
index a55b2c147..281696a89 100644
--- a/app/i18n/oc/gen.php
+++ b/app/i18n/oc/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Filtres utilizaire',
 		'reading' => 'Lectura',
 		'search' => 'Recercar de mots o d’#etiquetas',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Partatge',
 		'shortcuts' => 'Acorchis',
 		'stats' => 'Estatisticas',
diff --git a/app/i18n/pl/gen.php b/app/i18n/pl/gen.php
index 56bd3c082..28863ff59 100644
--- a/app/i18n/pl/gen.php
+++ b/app/i18n/pl/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Zapisane zapytania',
 		'reading' => 'Czytanie',
 		'search' => 'Wyszukaj wyrazy lub #tagi',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Podawanie dalej',
 		'shortcuts' => 'Skróty klawiszowe',
 		'stats' => 'Statystyki',
diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php
index acf954b77..0a8c56d6a 100644
--- a/app/i18n/pt-br/gen.php
+++ b/app/i18n/pt-br/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Queries de usuário',
 		'reading' => 'Leitura',
 		'search' => 'Procurar por palavras ou #tags',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Compartilhamento',
 		'shortcuts' => 'Atalhos',
 		'stats' => 'Estatísticas',
diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php
index 9ba61ae59..3fd4b9190 100644
--- a/app/i18n/ru/gen.php
+++ b/app/i18n/ru/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Пользовательские запросы',
 		'reading' => 'Чтение',
 		'search' => 'Искать слова или #теги',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Обмен',
 		'shortcuts' => 'Горячие клавиши',
 		'stats' => 'Статистика',
diff --git a/app/i18n/sk/gen.php b/app/i18n/sk/gen.php
index aa8f1767b..4fa7a74eb 100644
--- a/app/i18n/sk/gen.php
+++ b/app/i18n/sk/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Používateľské dopyty',
 		'reading' => 'Čítanie',
 		'search' => 'Hľadajte slová alebo #značky',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Zdieľanie',
 		'shortcuts' => 'Skratky',
 		'stats' => 'Štatistiky',
diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php
index c65815e8e..bf1f18848 100644
--- a/app/i18n/tr/gen.php
+++ b/app/i18n/tr/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => 'Kullanıcı sorguları',
 		'reading' => 'Okuma',
 		'search' => 'Kelime veya #etiket ara',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => 'Paylaşım',
 		'shortcuts' => 'Kısayollar',
 		'stats' => 'İstatistikler',
diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php
index 0b6f1cba6..0732ae707 100644
--- a/app/i18n/zh-cn/gen.php
+++ b/app/i18n/zh-cn/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => '自定义查询',
 		'reading' => '阅读',
 		'search' => '搜索内容或#标签',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => '分享',
 		'shortcuts' => '快捷键',
 		'stats' => '统计',
diff --git a/app/i18n/zh-tw/gen.php b/app/i18n/zh-tw/gen.php
index 31ef0f692..cf09fa3df 100644
--- a/app/i18n/zh-tw/gen.php
+++ b/app/i18n/zh-tw/gen.php
@@ -174,6 +174,7 @@ return array(
 		'queries' => '自定義查詢',
 		'reading' => '閱讀',
 		'search' => '搜尋內容或#標簽',
+		'search_help' => 'See documentation for advanced <a href="https://freshrss.github.io/FreshRSS/en/users/10_filter.html#with-the-search-field" target="_blank">search parameters</a>',	// TODO
 		'sharing' => '分享',
 		'shortcuts' => '快捷鍵',
 		'stats' => '統計',
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index f719538fd..848144568 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -29,10 +29,53 @@
 			href="<?= Minz_Url::display($url_state) ?>"><?= _i($state_str) ?></a>
 		<?php } ?>
 
+		<div class="dropdown only-mobile" id="dropdown-search-wrapper">
+			<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+			<div id="dropdown-search" class="dropdown-target"></div>
+
+			<a id="toggle-search" class="dropdown-toggle btn<?= (strlen(FreshRSS_Context::$search) > 0) ? ' active' : ''; ?>" title="<?= _t('gen.menu.search') ?>"
+				href="#dropdown-search"><?= _i('search') ?></a>
+			<ul class="dropdown-menu">
+				<li class="item">
+					<span>
+						<form action="<?= _url('index', 'index') ?>" method="get">
+							<?php $param_a = Minz_Request::actionName(); ?>
+							<?php if (in_array($param_a, ['normal', 'global', 'reader'])) { ?>
+							<input type="hidden" name="a" value="<?= $param_a ?>" />
+							<?php } ?>
+
+							<?php $get = Minz_Request::param('get', ''); ?>
+							<?php if ($get != '') { ?>
+							<input type="hidden" name="get" value="<?= $get ?>" />
+							<?php } ?>
+
+							<?php $order = Minz_Request::param('order', ''); ?>
+							<?php if ($order != '') { ?>
+							<input type="hidden" name="order" value="<?= $order ?>" />
+							<?php } ?>
+
+							<?php $state = Minz_Request::param('state', ''); ?>
+							<?php if ($state != '') { ?>
+							<input type="hidden" name="state" value="<?= $state ?>" />
+							<?php } ?>	
+
+							<div class="stick search">
+								<input type="search" name="search" 
+									value="<?= htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search, 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>
+						</form>
+					</span>
+				</li>
+			</ul>
+			<a class="dropdown-close" href="#close">❌</a>
+		</div>
+
 		<div class="dropdown">
 			<div id="dropdown-query" class="dropdown-target"></div>
 
-			<a class="dropdown-toggle btn" href="#dropdown-query" title="<?= _t('index.menu.queries') ?>"><?= _i('bookmark-tag') ?></a>
+			<a id="toggle-userqueries" class="dropdown-toggle btn" href="#dropdown-query" title="<?= _t('index.menu.queries') ?>"><?= _i('bookmark-tag') ?></a>
 			<ul class="dropdown-menu">
 				<li class="dropdown-header">
 					<?= _t('index.menu.queries') ?>
@@ -185,33 +228,6 @@
 	</div>
 	<?php } ?>
 
-	<div class="item search">
-		<form action="<?= _url('index', 'index') ?>" method="get">
-			<input type="search" name="search" class="extend" value="<?php
-				echo htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>" placeholder="<?= _t('index.menu.search_short') ?>" />
-
-			<?php $param_a = Minz_Request::actionName(); ?>
-			<?php if (in_array($param_a, ['normal', 'global', 'reader'])) { ?>
-			<input type="hidden" name="a" value="<?= $param_a ?>" />
-			<?php } ?>
-			
-			<?php $get = Minz_Request::param('get', ''); ?>
-			<?php if($get != '') { ?>
-			<input type="hidden" name="get" value="<?= $get ?>" />
-			<?php } ?>
-
-			<?php $order = Minz_Request::param('order', ''); ?>
-			<?php if($order != '') { ?>
-			<input type="hidden" name="order" value="<?= $order ?>" />
-			<?php } ?>
-
-			<?php $state = Minz_Request::param('state', ''); ?>
-			<?php if($state != '') { ?>
-			<input type="hidden" name="state" value="<?= $state ?>" />
-			<?php } ?>
-		</form>
-	</div>
-
 	<?php
 		if (FreshRSS_Context::$order === 'DESC') {
 			$order = 'ASC';
-- 
cgit v1.2.3