diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2024-12-27 12:03:59 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-12-27 12:03:59 +0100 |
| commit | 897e4a3f4a273d50c28157edb67612b2d7fa2e6f (patch) | |
| tree | 5ea452b4edb58e272522a2932f42128d581ce1d9 /app/layout | |
| parent | 1d10b3697d5fa04415d36059d5e04ad71aae0b78 (diff) | |
Search in all feeds (#7144)
* Search in all feeds
Search in PRIORITY_ARCHIVED with `&get=A`
fix https://github.com/FreshRSS/FreshRSS/discussions/7143
* Fix type
* Search in PRIORITY_ARCHIVED with `&get=Z`
* More
* Fixes
* One more fix
* Extra features in user queries
* Move i18n key
* Fix overview
* Enlarge query boxes
* Revert i18n spelling
* i18n: it
Thanks @UserRoot-Luca
Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com>
---------
Co-authored-by: UserRoot-Luca <55756898+UserRoot-Luca@users.noreply.github.com>
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/aside_feed.phtml | 2 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 18a1a9939..166d3954d 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -29,7 +29,7 @@ <form id="mark-read-aside" method="post"> <input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" /> <ul id="sidebar" class="tree scrollbar-thin"> - <li class="tree-folder category all<?= FreshRSS_Context::isCurrentGet('a') ? ' active' : '' ?>"> + <li class="tree-folder category all<?= FreshRSS_Context::isCurrentGet('a') || FreshRSS_Context::isCurrentGet('A') || FreshRSS_Context::isCurrentGet('Z') ? ' active' : '' ?>"> <a class="tree-folder-title" data-unread="<?= format_number(FreshRSS_Context::$total_unread) ?>" href="<?= _url('index', $actual_view) . $state_filter_manual ?>"> <?= _i('all') ?><span class="title" data-unread="<?= format_number(FreshRSS_Context::$total_unread) ?>"><?= _t('index.menu.main_stream') ?></span> </a> diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 685d2d48f..217239f01 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -49,7 +49,7 @@ } ?> <link rel="alternate" type="application/rss+xml" title="<?= $this->rss_title ?>" href="<?= Minz_Url::display($url_rss) ?>" /> -<?php } if (FreshRSS_Context::isAll() || FreshRSS_Context::isCategory() || FreshRSS_Context::isFeed()) { +<?php } if (FreshRSS_Context::isAll() || FreshRSS_Context::isAllAndCategories() || FreshRSS_Context::isAllAndArchived() || FreshRSS_Context::isCategory() || FreshRSS_Context::isFeed()) { $opml_rss = $url_base; $opml_rss['a'] = 'opml'; $opml_rss['params']['user'] = Minz_User::name() ?? ''; |