From 496d3a1a486c23345ca5e9022980a9f89151bb49 Mon Sep 17 00:00:00 2001 From: maTh <1645099+math-GH@users.noreply.github.com> Date: Sun, 29 Sep 2024 10:28:28 +0200 Subject: Improved: Subscription management page (#6816) * i18n: Add an RSS feed -> Add a feed * manage mouse title for category * no white space between manage icon and favicon and title * add feed link: use icon instead of plus character * better CSS class for empty category and its alert text box * show muted icon and warning icon * the CSS magic incl. the themes improvements * fix * mute icon is more important than warning * feed mouse hover title * fix feed navigation sidebar: show error * fix btn with icon and text * fix aside feed: muted icon over warning icon --- app/i18n/cs/sub.php | 2 +- app/i18n/de/sub.php | 2 +- app/i18n/el/sub.php | 2 +- app/i18n/en-us/sub.php | 2 +- app/i18n/en/sub.php | 2 +- app/i18n/es/sub.php | 2 +- app/i18n/fa/sub.php | 2 +- app/i18n/fr/sub.php | 2 +- app/i18n/hu/sub.php | 2 +- app/i18n/id/sub.php | 2 +- app/i18n/it/sub.php | 2 +- app/i18n/ja/sub.php | 2 +- app/i18n/ko/sub.php | 2 +- app/i18n/lv/sub.php | 2 +- app/i18n/nl/sub.php | 2 +- app/i18n/oc/sub.php | 2 +- app/i18n/pt-br/sub.php | 2 +- app/i18n/ru/sub.php | 2 +- app/i18n/sk/sub.php | 2 +- app/i18n/tr/sub.php | 2 +- app/layout/aside_feed.phtml | 2 +- app/views/subscription/index.phtml | 22 +++++++++++++--------- 22 files changed, 34 insertions(+), 30 deletions(-) (limited to 'app') diff --git a/app/i18n/cs/sub.php b/app/i18n/cs/sub.php index a9f7d198a..cb9bd02c6 100644 --- a/app/i18n/cs/sub.php +++ b/app/i18n/cs/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Přijímat soubory cookie', 'accept_cookies_help' => 'Povolit serveru feedu nastavit soubory cookie (uložené v paměti pouze po dobu trvání požadavku).', - 'add' => 'Přidat kanál RSS', + 'add' => 'Přidat kanál', 'advanced' => 'Rozšířené', 'archiving' => 'Archivace', 'auth' => array( diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index 958107e8a..f2b8012df 100644 --- a/app/i18n/de/sub.php +++ b/app/i18n/de/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Cookies zulassen', 'accept_cookies_help' => 'Erlaubt dem Feed-Server das Setzen von Cookies (wird nur für die Dauer der Anfrage im Speicher gehalten)', - 'add' => 'Einen RSS-Feed hinzufügen', + 'add' => 'Einen Feed hinzufügen', 'advanced' => 'Erweitert', 'archiving' => 'Archivierung', 'auth' => array( diff --git a/app/i18n/el/sub.php b/app/i18n/el/sub.php index 3d95d0e31..80f420811 100644 --- a/app/i18n/el/sub.php +++ b/app/i18n/el/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Accept cookies', // TODO 'accept_cookies_help' => 'Allow the feed server to set cookies (stored in memory for the duration of the request only)', // TODO - 'add' => 'Add an RSS feed', // TODO + 'add' => 'Add a feed', // TODO 'advanced' => 'Advanced', // TODO 'archiving' => 'Archiving', // TODO 'auth' => array( diff --git a/app/i18n/en-us/sub.php b/app/i18n/en-us/sub.php index 7c574f326..7f4469ff1 100644 --- a/app/i18n/en-us/sub.php +++ b/app/i18n/en-us/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Accept cookies', // IGNORE 'accept_cookies_help' => 'Allow the feed server to set cookies (stored in memory for the duration of the request only)', // IGNORE - 'add' => 'Add an RSS feed', // IGNORE + 'add' => 'Add a feed', // IGNORE 'advanced' => 'Advanced', // IGNORE 'archiving' => 'Archiving', // IGNORE 'auth' => array( diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php index 4c514ac0c..f514df5f3 100644 --- a/app/i18n/en/sub.php +++ b/app/i18n/en/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Accept cookies', 'accept_cookies_help' => 'Allow the feed server to set cookies (stored in memory for the duration of the request only)', - 'add' => 'Add an RSS feed', + 'add' => 'Add a feed', 'advanced' => 'Advanced', 'archiving' => 'Archiving', 'auth' => array( diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php index 853684712..cfb2bf550 100644 --- a/app/i18n/es/sub.php +++ b/app/i18n/es/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Aceptar cookies', 'accept_cookies_help' => 'Permitir que el servidor de fuentes configure las cookies (guardadas en memoria únicamente para el tiempo de vida de la solicitud)', - 'add' => 'Añadir fuente RSS', + 'add' => 'Añadir fuente', 'advanced' => 'Avanzado', 'archiving' => 'Archivo', 'auth' => array( diff --git a/app/i18n/fa/sub.php b/app/i18n/fa/sub.php index 5dfd82c60..9aa388e27 100644 --- a/app/i18n/fa/sub.php +++ b/app/i18n/fa/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => ' کوکی ها را بپذیرید', 'accept_cookies_help' => ' به سرور فید اجازه دهید تا کوکی ها را تنظیم کند (فقط برای مدت زمان درخواست در حافظه ذخیره می شود)', - 'add' => ' یک فید RSS اضافه کنید', + 'add' => ' یک فید اضافه کنید', 'advanced' => ' پیشرفته', 'archiving' => ' بایگانی', 'auth' => array( diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php index 4a8c21d69..6dd205356 100644 --- a/app/i18n/fr/sub.php +++ b/app/i18n/fr/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Autoriser les cookies', 'accept_cookies_help' => 'Accepte les cookies du flux (stocké en mémoire seulement le temps de la requête)', - 'add' => 'Ajouter un flux RSS', + 'add' => 'Ajouter un flux', 'advanced' => 'Avancé', 'archiving' => 'Archivage', 'auth' => array( diff --git a/app/i18n/hu/sub.php b/app/i18n/hu/sub.php index c91a6c5b4..7c45b2951 100644 --- a/app/i18n/hu/sub.php +++ b/app/i18n/hu/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Sütik elfogadása', 'accept_cookies_help' => 'Engedélyezze hogy a hírforrás szerver beállíthasson sütiket (memóriában lesznek tárolva a kapcsolat idejére)', - 'add' => 'RSS hírforrás hozzáadása', + 'add' => 'hírforrás hozzáadása', 'advanced' => 'Haladó', 'archiving' => 'Archiválás', 'auth' => array( diff --git a/app/i18n/id/sub.php b/app/i18n/id/sub.php index 24a8dad2f..6f637c316 100644 --- a/app/i18n/id/sub.php +++ b/app/i18n/id/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Accept cookies', // TODO 'accept_cookies_help' => 'Allow the feed server to set cookies (stored in memory for the duration of the request only)', // TODO - 'add' => 'Add an RSS feed', // TODO + 'add' => 'Add a feed', // TODO 'advanced' => 'Advanced', // TODO 'archiving' => 'Archiving', // TODO 'auth' => array( diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php index 683785d45..ff1c6f36b 100644 --- a/app/i18n/it/sub.php +++ b/app/i18n/it/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Accetta i cookie', 'accept_cookies_help' => 'Consenti al server dei feed di impostare dei cookie (salvati in memoria solo per la durata della richiesta)', - 'add' => 'Aggiungi un Feed RSS', + 'add' => 'Aggiungi un Feed', 'advanced' => 'Avanzate', 'archiving' => 'Archiviazione', 'auth' => array( diff --git a/app/i18n/ja/sub.php b/app/i18n/ja/sub.php index 0395d78c9..465637307 100644 --- a/app/i18n/ja/sub.php +++ b/app/i18n/ja/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'クッキーを受け入れる', 'accept_cookies_help' => 'クッキーをこのサーバーから受け入れます(このリクエストだけにメモリへ保存されます)', - 'add' => 'RSSフィードに追加する', + 'add' => 'フィードに追加する', 'advanced' => '高度な設定', 'archiving' => 'アーカイブ', 'auth' => array( diff --git a/app/i18n/ko/sub.php b/app/i18n/ko/sub.php index 00190e9c8..470d61478 100644 --- a/app/i18n/ko/sub.php +++ b/app/i18n/ko/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => '쿠키 사용 동의', 'accept_cookies_help' => '피드 서버가 쿠키를 사용하도록 허용 (요청 지속 기간 동안에만 메모리에 저장)', - 'add' => 'RSS 피드 추가', + 'add' => '피드 추가', 'advanced' => '고급 설정', 'archiving' => '보관', 'auth' => array( diff --git a/app/i18n/lv/sub.php b/app/i18n/lv/sub.php index bacc28500..c5e5b388f 100644 --- a/app/i18n/lv/sub.php +++ b/app/i18n/lv/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Pieņemt sīkfailus', 'accept_cookies_help' => 'Atļaut barotnes serverim iestatīt sīkfailus (atmiņā tiek saglabāti tikai uz pieprasījuma laiku).', - 'add' => 'Pievienot RSS barotni', + 'add' => 'Pievienot barotni', 'advanced' => 'Advancēts', 'archiving' => 'Arhivēšana', 'auth' => array( diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php index d624d01c4..38cd24d10 100644 --- a/app/i18n/nl/sub.php +++ b/app/i18n/nl/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Cookies accepteren', 'accept_cookies_help' => 'De feed-server toestaan cookies te plaatsen (die alleen voor de duur van de aanvraag in het geheugen worden opgeslagen)', - 'add' => 'Voeg een RSS-feed toe', + 'add' => 'Voeg een feed toe', 'advanced' => 'Geavanceerd', 'archiving' => 'Archiveren', 'auth' => array( diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index 95e810171..4fcc50781 100644 --- a/app/i18n/oc/sub.php +++ b/app/i18n/oc/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Acceptar los cookies', 'accept_cookies_help' => 'Permetre al servidor del flux de definir de cookies (gardatz en memòria pendent la durada de la requèsta sonque)', - 'add' => 'Ajustar un flux RSS', + 'add' => 'Ajustar un flux', 'advanced' => 'Avançat', 'archiving' => 'Archivar', 'auth' => array( diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php index d7fef476c..2593b3648 100644 --- a/app/i18n/pt-br/sub.php +++ b/app/i18n/pt-br/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Aceitar cookies', 'accept_cookies_help' => 'Permitir que o servidor de Feed defina os cookies (sarmazenados na memória apenas durante a solicitação)', - 'add' => 'Adicionar um RSS feed', + 'add' => 'Adicionar um feed', 'advanced' => 'Avançado', 'archiving' => 'Arquivar', 'auth' => array( diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php index 6f4a4da18..a9f802738 100644 --- a/app/i18n/ru/sub.php +++ b/app/i18n/ru/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Разрешить файлы cookies', 'accept_cookies_help' => 'Разрешить серверу ленты использовать cookies (файлы будут храниться в памяти лишь в течение запроса)', - 'add' => 'Добавить RSS-ленту', + 'add' => 'Добавить ленту', 'advanced' => 'Дополнительно', 'archiving' => 'Архивирование', 'auth' => array( diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php index a3b9856cd..766d75e8f 100644 --- a/app/i18n/sk/sub.php +++ b/app/i18n/sk/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Prijať cookies', 'accept_cookies_help' => 'Povoliť serveru kanála nastaviť cookies (uložené v pamäti iba počas dopytu)', - 'add' => 'Pridať RSS kanál', + 'add' => 'Pridať kanál', 'advanced' => 'Pokročilé', 'archiving' => 'Archivovanie', 'auth' => array( diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index c08132ce4..ad68d0611 100644 --- a/app/i18n/tr/sub.php +++ b/app/i18n/tr/sub.php @@ -40,7 +40,7 @@ return array( 'feed' => array( 'accept_cookies' => 'Cookieleri kabul et', 'accept_cookies_help' => 'Akış sağlayıcısının cookieler oluşturmasına izin ver. (Sadece istek süresince bellekte depolanmak üzere)', - 'add' => 'RSS akışı ekle', + 'add' => 'akışı ekle', 'advanced' => 'Gelişmiş', 'archiving' => 'Arşiv', 'auth' => array( diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index cd0e0464c..7ca3bd3db 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -106,7 +106,7 @@ $error_class = ''; $error_title = ''; - if ($feed->inError() && !$feed->mute()) { + if ($feed->inError()) { $error_class = ' error'; $error_title = _t('sub.feed.error'); } diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index 27c6e02ef..47f549faf 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -22,7 +22,7 @@ onlyFeedsWithError && $this->signalError) { ?>
- +
@@ -34,7 +34,7 @@ ?>
- +

name() ?>kind() === FreshRSS_Category::KIND_DYNAMIC_OPML) { echo " " . _i('opml-dyn'); } ?>

@@ -81,7 +85,7 @@
- ✚

+

-- cgit v1.2.3