From 83a29a330c24d8cd354e527aafcc8d67c1dc56a8 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 8 Feb 2026 22:10:07 +0100 Subject: [PATCH 1/2] imp: Set current tab to "reading" if collection cannot be updated --- src/views/collections/show.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/collections/show.html.twig b/src/views/collections/show.html.twig index ebb01a1d9..becd6a816 100644 --- a/src/views/collections/show.html.twig +++ b/src/views/collections/show.html.twig @@ -20,7 +20,7 @@ {% else %} {% set feed_url = url_full('collection feed', { id: collection.id }) %} {% set opengraph_description = t('A collection created by %s on %s.', [owner.username, app.brand]) %} - {% set current_tab = 'links' %} + {% set current_tab = can_update ? 'links' : 'reading' %} {% endif %} {% block title %}{{ collection.name }}{% endblock %} From bc7ed80e48ca4dceaf3c9a07cf562f7ddf082908 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Sun, 8 Feb 2026 22:14:47 +0100 Subject: [PATCH 2/2] imp: Put explore menu item behind beta flag --- locales/fr_FR/LC_MESSAGES/main.mo | Bin 54129 -> 54129 bytes locales/fr_FR/LC_MESSAGES/main.po | 12 ++++++------ src/navigations/AccountNavigation.php | 4 ++-- src/navigations/ReadingNavigation.php | 15 +++++++++++---- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/locales/fr_FR/LC_MESSAGES/main.mo b/locales/fr_FR/LC_MESSAGES/main.mo index dfa4fe724db213dbe99745a2ffb55d23934bea5e..d212616d51ce96fdc308dea3350d4a80b4dbcf37 100644 GIT binary patch delta 17 ZcmeykjQQg-<_!}om<-J}Pp-HZ1prOO2u%P0 delta 17 ZcmeykjQQg-<_!}om<$XyPp-HZ1prN&2u1(^ diff --git a/locales/fr_FR/LC_MESSAGES/main.po b/locales/fr_FR/LC_MESSAGES/main.po index f9c9fe11a..c84a6daef 100644 --- a/locales/fr_FR/LC_MESSAGES/main.po +++ b/locales/fr_FR/LC_MESSAGES/main.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Flus\n" -"POT-Creation-Date: 2026-02-08 22:00+0100\n" -"PO-Revision-Date: 2026-02-08 22:00+0100\n" +"POT-Creation-Date: 2026-02-08 22:16+0100\n" +"PO-Revision-Date: 2026-02-08 22:16+0100\n" "Last-Translator: Marien Fressinaud \n" "Language-Team: \n" "Language: fr_FR\n" @@ -280,12 +280,12 @@ msgid "The name must be less than {max} characters." msgstr "Le nom ne doit pas faire plus de {max} caractères." #: models/Collection.php:139 models/Collection.php:229 -#: navigations/ReadingNavigation.php:27 +#: navigations/ReadingNavigation.php:30 msgid "Bookmarks" msgstr "Signets" #: models/Collection.php:150 models/Collection.php:231 -#: navigations/ReadingNavigation.php:34 +#: navigations/ReadingNavigation.php:37 msgid "Links read" msgstr "Liens lus" @@ -294,7 +294,7 @@ msgid "Links never to read" msgstr "Liens à ne jamais lire" #: models/Collection.php:172 models/Collection.php:233 -#: navigations/ReadingNavigation.php:20 +#: navigations/ReadingNavigation.php:23 msgid "News" msgstr "Journal" @@ -394,7 +394,7 @@ msgstr "Données" msgid "Security" msgstr "Sécurité" -#: navigations/ReadingNavigation.php:41 +#: navigations/ReadingNavigation.php:46 msgid "Explore" msgstr "Explorer" diff --git a/src/navigations/AccountNavigation.php b/src/navigations/AccountNavigation.php index bfc0cf9ef..bd58c9b35 100644 --- a/src/navigations/AccountNavigation.php +++ b/src/navigations/AccountNavigation.php @@ -2,7 +2,7 @@ namespace App\navigations; -use App\auth\CurrentUser; +use App\auth; use Minz\Template\TwigExtension; /** @@ -13,7 +13,7 @@ class AccountNavigation extends BaseNavigation { public function elements(): array { - $current_user = CurrentUser::require(); + $current_user = auth\CurrentUser::require(); $account_items = []; $data_items = []; diff --git a/src/navigations/ReadingNavigation.php b/src/navigations/ReadingNavigation.php index a571e62f5..c2ddb8a5d 100644 --- a/src/navigations/ReadingNavigation.php +++ b/src/navigations/ReadingNavigation.php @@ -2,6 +2,7 @@ namespace App\navigations; +use App\auth; use Minz\Template\TwigExtension; /** @@ -12,7 +13,9 @@ class ReadingNavigation extends BaseNavigation { public function elements(): array { - return [ + $current_user = auth\CurrentUser::require(); + + $elements = [ new Item( 'news', \Minz\Url::for('news'), @@ -33,13 +36,17 @@ public function elements(): array 'check', TwigExtension::translate('Links read'), ), + ]; - new Item( + if ($current_user->isBetaEnabled()) { + $elements[] = new Item( 'explore', \Minz\Url::for('explore'), 'compass', TwigExtension::translate('Explore'), - ), - ]; + ); + } + + return $elements; } }