From b568b1d41d475ba6bec9c40190422d622795ab1d Mon Sep 17 00:00:00 2001 From: krvpb024 Date: Tue, 23 Jan 2024 10:42:10 +0800 Subject: [PATCH] improve page-header a11y add nav landmark for links labeling the purpose of nav in page-header labeling the meaning of total number in page-header title --- internal/locale/translations/de_DE.json | 8 +- internal/locale/translations/el_EL.json | 7 ++ internal/locale/translations/en_US.json | 8 ++ internal/locale/translations/es_ES.json | 9 +- internal/locale/translations/fi_FI.json | 7 ++ internal/locale/translations/fr_FR.json | 9 +- internal/locale/translations/hi_IN.json | 11 +- internal/locale/translations/id_ID.json | 9 +- internal/locale/translations/it_IT.json | 9 +- internal/locale/translations/ja_JP.json | 7 ++ internal/locale/translations/nl_NL.json | 7 ++ internal/locale/translations/pl_PL.json | 7 ++ internal/locale/translations/pt_BR.json | 7 ++ internal/locale/translations/ru_RU.json | 7 ++ internal/locale/translations/tr_TR.json | 7 ++ internal/locale/translations/uk_UA.json | 7 ++ internal/locale/translations/zh_CN.json | 6 + internal/locale/translations/zh_TW.json | 7 ++ .../templates/views/bookmark_entries.html | 6 +- .../template/templates/views/categories.html | 18 ++- .../templates/views/category_entries.html | 88 ++++++++------ .../templates/views/category_feeds.html | 56 +++++---- .../templates/views/create_category.html | 12 +- .../templates/views/edit_category.html | 24 ++-- .../template/templates/views/edit_feed.html | 38 +++--- .../templates/views/feed_entries.html | 115 ++++++++++-------- .../templates/views/history_entries.html | 40 +++--- .../templates/views/shared_entries.html | 36 +++--- .../templates/views/unread_entries.html | 50 ++++---- internal/ui/static/css/common.css | 14 +++ 30 files changed, 419 insertions(+), 217 deletions(-) diff --git a/internal/locale/translations/de_DE.json b/internal/locale/translations/de_DE.json index f63d4e1c..d4d06081 100644 --- a/internal/locale/translations/de_DE.json +++ b/internal/locale/translations/de_DE.json @@ -18,6 +18,7 @@ "action.home_screen": "Zum Startbildschirm hinzufügen", "tooltip.keyboard_shortcuts": "Tastenkürzel: %s", "tooltip.logged_user": "Angemeldet als %s", + "menu.title": "Menu", "menu.unread": "Ungelesen", "menu.starred": "Lesezeichen", "menu.history": "Verlauf", @@ -81,11 +82,14 @@ "entry.estimated_reading_time": [ "%d Minute zu lesen", "%d Minuten zu lesen" - ], + ], "entry.tags.label": "Stichworte:", "page.shared_entries.title": "Geteilte Artikel", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Ungelesen", + "page.unread.total": "Number of unread entries", "page.starred.title": "Lesezeichen", + "page.starred.total": "Number of starred entries", "page.categories.title": "Kategorien", "page.categories.no_feed": "Kein Abonnement.", "page.categories.entries": "Artikel", @@ -95,6 +99,7 @@ "Es gibt %d Abonnements." ], "page.categories.unread_counter": "Anzahl der ungelesenen Artikel", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Neue Kategorie", "page.new_user.title": "Neuer Benutzer", "page.edit_category.title": "Kategorie bearbeiten: %s", @@ -109,6 +114,7 @@ "%d Fehler" ], "page.history.title": "Verlauf", + "page.history.total": "Number of read entries", "page.import.title": "Importieren", "page.search.title": "Suchergebnisse", "page.about.title": "Über", diff --git a/internal/locale/translations/el_EL.json b/internal/locale/translations/el_EL.json index 631bc047..be48cc98 100644 --- a/internal/locale/translations/el_EL.json +++ b/internal/locale/translations/el_EL.json @@ -18,6 +18,7 @@ "action.home_screen": "Προσθήκη στην αρχική οθόνη", "tooltip.keyboard_shortcuts": "Συντόμευση πληκτρολογίου: % s", "tooltip.logged_user": "Συνδεδεμένος/η ως %s", + "menu.title": "Menu", "menu.unread": "Μη αναγνωσμένα", "menu.starred": "Αγαπημένα", "menu.history": "Ιστορικό", @@ -84,17 +85,22 @@ ], "entry.tags.label": "Ετικέτες:", "page.shared_entries.title": "Κοινόχρηστες Καταχωρήσεις", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Μη αναγνωσμένα", + "page.unread.total": "Number of unread entries", "page.starred.title": "Αγαπημένo", + "page.starred.total": "Number of starred entries", "page.categories.title": "Κατηγορίες", "page.categories.no_feed": "Καμία ροή.", "page.categories.entries": "Άρθρα", "page.categories.feeds": "Συνδρομές", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "Υπάρχει μία %d ροή.", "Υπάρχουν %d ροές." ], "page.categories.unread_counter": "Αριθμός μη αναγνωσμένων καταχωρήσεων", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Νέα Κατηγορία", "page.new_user.title": "Νέος Χρήστης", "page.edit_category.title": "Επεξεργασία κατηγορίας: % s", @@ -109,6 +115,7 @@ "%d σφάλματα" ], "page.history.title": "Ιστορικό", + "page.history.total": "Number of read entries", "page.import.title": "Εισαγωγή", "page.search.title": "Αποτελέσματα Αναζήτησης", "page.about.title": "Περί", diff --git a/internal/locale/translations/en_US.json b/internal/locale/translations/en_US.json index 66de75cb..b53e1dfb 100644 --- a/internal/locale/translations/en_US.json +++ b/internal/locale/translations/en_US.json @@ -18,6 +18,7 @@ "action.home_screen": "Add to home screen", "tooltip.keyboard_shortcuts": "Keyboard Shortcut: %s", "tooltip.logged_user": "Logged in as %s", + "menu.title": "Menu", "menu.unread": "Unread", "menu.starred": "Starred", "menu.history": "History", @@ -84,17 +85,23 @@ ], "entry.tags.label": "Tags:", "page.shared_entries.title": "Shared entries", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Unread", + "page.unread.total": "Number of unread entries", "page.starred.title": "Starred", + "page.starred.total": "Number of starred entries", "page.categories.title": "Categories", "page.categories.no_feed": "No feed.", "page.categories.entries": "Entries", "page.categories.feeds": "Feeds", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "There is %d feed.", "There are %d feeds." ], "page.categories.unread_counter": "Number of unread entries", + "page.categories.all_counter": "Number of all entries", + "page.categories.total": "Number of categories", "page.new_category.title": "New Category", "page.new_user.title": "New User", "page.edit_category.title": "Edit Category: %s", @@ -109,6 +116,7 @@ "%d errors" ], "page.history.title": "History", + "page.history.total": "Number of read entries", "page.import.title": "Import", "page.search.title": "Search Results", "page.about.title": "About", diff --git a/internal/locale/translations/es_ES.json b/internal/locale/translations/es_ES.json index 0d8825ef..afa7079e 100644 --- a/internal/locale/translations/es_ES.json +++ b/internal/locale/translations/es_ES.json @@ -18,6 +18,7 @@ "action.home_screen": "Añadir a la pantalla principal", "tooltip.keyboard_shortcuts": "Atajo de teclado: %s", "tooltip.logged_user": "Registrado como %s", + "menu.title": "Menu", "menu.unread": "No leídos", "menu.starred": "Marcadores", "menu.history": "Historial", @@ -81,20 +82,25 @@ "entry.estimated_reading_time": [ "%d minuto de lectura", "%d minutos de lectura" - ], + ], "entry.tags.label": "Etiquetas:", "page.shared_entries.title": "Artículos compartidos", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "No leídos", + "page.unread.total": "Number of unread entries", "page.starred.title": "Marcadores", + "page.starred.total": "Number of starred entries", "page.categories.title": "Categorías", "page.categories.no_feed": "Sin fuente.", "page.categories.entries": "Artículos", "page.categories.feeds": "Fuentes", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "Hay %d fuente.", "Hay %d fuentes." ], "page.categories.unread_counter": "Número de artículos no leídos", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Nueva categoría", "page.new_user.title": "Nuevo usuario", "page.edit_category.title": "Editar categoría: %s", @@ -109,6 +115,7 @@ "%d errores" ], "page.history.title": "Historial", + "page.history.total": "Number of read entries", "page.import.title": "Importar", "page.search.title": "Resultados de la búsqueda", "page.about.title": "Acerca de", diff --git a/internal/locale/translations/fi_FI.json b/internal/locale/translations/fi_FI.json index a841342e..2124eb6e 100644 --- a/internal/locale/translations/fi_FI.json +++ b/internal/locale/translations/fi_FI.json @@ -18,6 +18,7 @@ "action.home_screen": "Lisää aloitusnäytölle", "tooltip.keyboard_shortcuts": "Pikanäppäin: %s", "tooltip.logged_user": "Kirjautunut %s-käyttäjänä", + "menu.title": "Menu", "menu.unread": "Lukemattomat", "menu.starred": "Suosikit", "menu.history": "Historia", @@ -84,17 +85,22 @@ ], "entry.tags.label": "Tags:", "page.shared_entries.title": "Jaetut artikkelit", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Lukemattomat", + "page.unread.total": "Number of unread entries", "page.starred.title": "Suosikit", + "page.starred.total": "Number of starred entries", "page.categories.title": "Kategoriat", "page.categories.no_feed": "Ei syötettä.", "page.categories.entries": "Artikkelit", "page.categories.feeds": "Tilaukset", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "On %d syöte.", "On %d syötettä." ], "page.categories.unread_counter": "Lukemattomien artikkeleiden määrä", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Uusi kategoria", "page.new_user.title": "Uusi käyttäjä", "page.edit_category.title": "Muokkaa kategoria: %s", @@ -109,6 +115,7 @@ "%d virhettä" ], "page.history.title": "Historia", + "page.history.total": "Number of read entries", "page.import.title": "Tuo", "page.search.title": "Hakutulokset", "page.about.title": "Tietoja", diff --git a/internal/locale/translations/fr_FR.json b/internal/locale/translations/fr_FR.json index b8569a08..7c8c69ae 100644 --- a/internal/locale/translations/fr_FR.json +++ b/internal/locale/translations/fr_FR.json @@ -18,6 +18,7 @@ "action.home_screen": "Ajouter à l'écran d'accueil", "tooltip.keyboard_shortcuts": "Raccourci clavier : %s", "tooltip.logged_user": "Connecté en tant que %s", + "menu.title": "Menu", "menu.unread": "Non lus", "menu.starred": "Favoris", "menu.history": "Historique", @@ -81,20 +82,25 @@ "entry.estimated_reading_time": [ "%d minute de lecture", "%d minutes de lecture" - ], + ], "entry.tags.label": "Libellés :", "page.shared_entries.title": "Articles partagés", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Non lus", + "page.unread.total": "Number of unread entries", "page.starred.title": "Favoris", + "page.starred.total": "Number of starred entries", "page.categories.title": "Catégories", "page.categories.no_feed": "Aucun abonnement.", "page.categories.entries": "Articles", "page.categories.feeds": "Abonnements", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "Il y a %d abonnement.", "Il y a %d abonnements." ], "page.categories.unread_counter": "Nombre d'entrées non lues", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Nouvelle catégorie", "page.new_user.title": "Nouvel Utilisateur", "page.edit_category.title": "Modification de la catégorie : %s", @@ -109,6 +115,7 @@ "%d erreurs" ], "page.history.title": "Historique", + "page.history.total": "Number of read entries", "page.import.title": "Importation", "page.search.title": "Résultats de la recherche", "page.about.title": "À propos", diff --git a/internal/locale/translations/hi_IN.json b/internal/locale/translations/hi_IN.json index 499a3e1d..2969496e 100644 --- a/internal/locale/translations/hi_IN.json +++ b/internal/locale/translations/hi_IN.json @@ -18,6 +18,7 @@ "action.home_screen": "होम स्क्रीन में शामिल करें", "tooltip.keyboard_shortcuts": "कुंजीपटल संक्षिप्त रीति: %s", "tooltip.logged_user": "%s के रूप में लॉग इन किया", + "menu.title": "Menu", "menu.unread": "अपठित", "menu.starred": "तारांकित", "menu.history": "इतिहास", @@ -81,20 +82,25 @@ "entry.estimated_reading_time": [ "पढ़ने मे %d मिनट मागेगा", "पढ़ने मे %d मिनट मागेगा" - ], + ], "entry.tags.label": "टैग:", "page.shared_entries.title": "साझा किया हुआ प्रविष्टि", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "अपठित", + "page.unread.total": "Number of unread entries", "page.starred.title": "तारांकित", + "page.starred.total": "Number of starred entries", "page.categories.title": "श्रेणियाँ", "page.categories.no_feed": "कोई फ़ीड नहीं है।", "page.categories.entries": "विषयवस्तुया", "page.categories.feeds": "सदस्यता ले", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "%d फ़ीड बाकी है।", "%d फ़ीड बाकी है।" ], "page.categories.unread_counter": "अपठित प्रविष्टिया", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "नया श्रेणी", "page.new_user.title": "नया उपभोक्ता", "page.edit_category.title": "%s श्रेणी संपाद करे", @@ -109,6 +115,7 @@ "%d समस्याए" ], "page.history.title": "इतिहास", + "page.history.total": "Number of read entries", "page.import.title": "आयात", "page.search.title": "खोज का परिणाम", "page.about.title": "पृष्ठ के बारे में", @@ -363,7 +370,7 @@ "form.integration.pinboard_bookmark": "बुकमार्क को अपठित के रूप में चिह्नित करें", "form.integration.instapaper_activate": "विषय-वस्तु को इंस्टापेपर में सहेजें", "form.integration.instapaper_username": "इंस्टापेपर यूजरनेम", - "form.integration.instapaper_password": "इंस्टापेपर पासवर्ड", + "form.integration.instapaper_password": "इंस्टापेपर पासवर्ड", "form.integration.pocket_activate": "विषय-कविता को पॉकेट में सहेजें", "form.integration.pocket_consumer_key": "पॉकेट उपभोक्ता कुंजी", "form.integration.pocket_access_token": "पॉकेट एक्सेस टोकन", diff --git a/internal/locale/translations/id_ID.json b/internal/locale/translations/id_ID.json index 5372627d..3404dd49 100644 --- a/internal/locale/translations/id_ID.json +++ b/internal/locale/translations/id_ID.json @@ -18,6 +18,7 @@ "action.home_screen": "Tambahkan ke beranda", "tooltip.keyboard_shortcuts": "Pintasan Papan Tik: %s", "tooltip.logged_user": "Masuk sebagai %s", + "menu.title": "Menu", "menu.unread": "Belum Dibaca", "menu.starred": "Markah", "menu.history": "Riwayat", @@ -80,19 +81,24 @@ "entry.shared_entry.label": "Bagikan", "entry.estimated_reading_time": [ "%d menit untuk dibaca" - ], + ], "entry.tags.label": "Tanda:", "page.shared_entries.title": "Entri yang Dibagikan", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Belum Dibaca", + "page.unread.total": "Number of unread entries", "page.starred.title": "Markah", + "page.starred.total": "Number of starred entries", "page.categories.title": "Kategori", "page.categories.no_feed": "Tidak ada umpan.", "page.categories.entries": "Artikel", "page.categories.feeds": "Langganan", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "Ada %d umpan." ], "page.categories.unread_counter": "Jumlah entri yang belum dibaca", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Kategori Baru", "page.new_user.title": "Pengguna Baru", "page.edit_category.title": "Sunting Kategori: %s", @@ -106,6 +112,7 @@ "%d galat" ], "page.history.title": "Riwayat", + "page.history.total": "Number of read entries", "page.import.title": "Impor", "page.search.title": "Hasil Pencarian", "page.about.title": "Tentang", diff --git a/internal/locale/translations/it_IT.json b/internal/locale/translations/it_IT.json index fabf129f..9e7f0680 100644 --- a/internal/locale/translations/it_IT.json +++ b/internal/locale/translations/it_IT.json @@ -18,6 +18,7 @@ "action.home_screen": "Aggiungere alla schermata Home", "tooltip.keyboard_shortcuts": "Scorciatoia da tastiera: %s", "tooltip.logged_user": "Autenticato come %s", + "menu.title": "Menu", "menu.unread": "Da leggere", "menu.starred": "Preferiti", "menu.history": "Cronologia", @@ -81,20 +82,25 @@ "entry.estimated_reading_time": [ "%d minuto di lettura", "%d minuti di lettura" - ], + ], "entry.tags.label": "Tag:", "page.shared_entries.title": "Voci condivise", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Da leggere", + "page.unread.total": "Number of unread entries", "page.starred.title": "Preferiti", + "page.starred.total": "Number of starred entries", "page.categories.title": "Categorie", "page.categories.no_feed": "Nessun feed.", "page.categories.entries": "Articoli", "page.categories.feeds": "Abbonamenti", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "C'è %d feed.", "Ci sono %d feed." ], "page.categories.unread_counter": "Numero di voci non lette", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Nuova categoria", "page.new_user.title": "Nuovo utente", "page.edit_category.title": "Modifica categoria: %s", @@ -109,6 +115,7 @@ "%d errori" ], "page.history.title": "Cronologia", + "page.history.total": "Number of read entries", "page.import.title": "Importa", "page.search.title": "Risultati della ricerca", "page.about.title": "Informazioni", diff --git a/internal/locale/translations/ja_JP.json b/internal/locale/translations/ja_JP.json index c0b3f20e..9fac6321 100644 --- a/internal/locale/translations/ja_JP.json +++ b/internal/locale/translations/ja_JP.json @@ -18,6 +18,7 @@ "action.home_screen": "ホームスクリーンに追加", "tooltip.keyboard_shortcuts": "キーボードショートカット: %s", "tooltip.logged_user": "%s としてログイン中", + "menu.title": "Menu", "menu.unread": "未読", "menu.starred": "星付き", "menu.history": "履歴", @@ -84,17 +85,22 @@ ], "entry.tags.label": "タグ:", "page.shared_entries.title": "共有エントリ", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "未読", + "page.unread.total": "Number of unread entries", "page.starred.title": "星付き", + "page.starred.total": "Number of starred entries", "page.categories.title": "カテゴリ", "page.categories.no_feed": "フィードはありません。", "page.categories.entries": "記事一覧", "page.categories.feeds": "フィード一覧", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "%d 件のフィードがあります。", "%d 件のフィードがあります。" ], "page.categories.unread_counter": "未読記事の数", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "新規カテゴリ", "page.new_user.title": "新規ユーザー", "page.edit_category.title": "カテゴリを編集: %s", @@ -109,6 +115,7 @@ "%d 個のエラー" ], "page.history.title": "履歴", + "page.history.total": "Number of read entries", "page.import.title": "インポート", "page.search.title": "検索結果", "page.about.title": "ソフトウェア情報", diff --git a/internal/locale/translations/nl_NL.json b/internal/locale/translations/nl_NL.json index 88ae8ed9..29c5a600 100644 --- a/internal/locale/translations/nl_NL.json +++ b/internal/locale/translations/nl_NL.json @@ -18,6 +18,7 @@ "action.home_screen": "Toevoegen aan startscherm", "tooltip.keyboard_shortcuts": "Sneltoets: %s", "tooltip.logged_user": "Ingelogd als %s", + "menu.title": "Menu", "menu.unread": "Ongelezen", "menu.starred": "Favorieten", "menu.history": "Geschiedenis", @@ -84,17 +85,22 @@ ], "entry.tags.label": "Labels:", "page.shared_entries.title": "Gedeelde vermeldingen", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Ongelezen", + "page.unread.total": "Number of unread entries", "page.starred.title": "Favorieten", + "page.starred.total": "Number of starred entries", "page.categories.title": "Categorieën", "page.categories.no_feed": "Geen feeds.", "page.categories.entries": "Lidwoord", "page.categories.feeds": "Abonnementen", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "Er is %d feed.", "Er zijn %d feeds." ], "page.categories.unread_counter": "Aantal ongelezen vermeldingen", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Nieuwe categorie", "page.new_user.title": "Nieuwe gebruiker", "page.edit_category.title": "Bewerken van categorie: %s", @@ -109,6 +115,7 @@ "%d errors" ], "page.history.title": "Geschiedenis", + "page.history.total": "Number of read entries", "page.import.title": "Importeren", "page.login.title": "Inloggen", "page.search.title": "Zoekresultaten", diff --git a/internal/locale/translations/pl_PL.json b/internal/locale/translations/pl_PL.json index b77b7b67..b4a7542e 100644 --- a/internal/locale/translations/pl_PL.json +++ b/internal/locale/translations/pl_PL.json @@ -18,6 +18,7 @@ "action.home_screen": "Dodaj do ekranu głównego", "tooltip.keyboard_shortcuts": "Skróty klawiszowe: %s", "tooltip.logged_user": "Zalogowany jako %s", + "menu.title": "Menu", "menu.unread": "Nieprzeczytane", "menu.starred": "Ulubione", "menu.history": "Historia", @@ -84,18 +85,23 @@ ], "entry.tags.label": "Tagi:", "page.shared_entries.title": "Udostępnione wpisy", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Nieprzeczytane", + "page.unread.total": "Number of unread entries", "page.starred.title": "Oznaczone gwiazdką", + "page.starred.total": "Number of starred entries", "page.categories.title": "Kategorie", "page.categories.no_feed": "Brak kanałów.", "page.categories.entries": "Artykuły", "page.categories.feeds": "Subskrypcje", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "Jest %d kanał.", "Są %d kanały.", "Jest %d kanałów." ], "page.categories.unread_counter": "Liczba nieprzeczytanych wpisów", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Nowa kategoria", "page.new_user.title": "Nowy użytkownik", "page.edit_category.title": "Edycja Kategorii: %s", @@ -111,6 +117,7 @@ "%d błędów" ], "page.history.title": "Historia", + "page.history.total": "Number of read entries", "page.import.title": "Importuj", "page.search.title": "Wyniki wyszukiwania", "page.about.title": "O", diff --git a/internal/locale/translations/pt_BR.json b/internal/locale/translations/pt_BR.json index dbe02e2b..e080e4fb 100644 --- a/internal/locale/translations/pt_BR.json +++ b/internal/locale/translations/pt_BR.json @@ -18,6 +18,7 @@ "action.home_screen": "Voltar para a tela inicial", "tooltip.keyboard_shortcuts": "Atalho do teclado: %s", "tooltip.logged_user": "Autenticado como %s", + "menu.title": "Menu", "menu.unread": "Não lido", "menu.starred": "Favoritos", "menu.history": "Histórico", @@ -84,17 +85,22 @@ ], "entry.tags.label": "Etiquetas:", "page.shared_entries.title": "Itens compartilhados", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Não lidos", + "page.unread.total": "Number of unread entries", "page.starred.title": "Favoritos", + "page.starred.total": "Number of starred entries", "page.categories.title": "Categorias", "page.categories.no_feed": "Sem fonte.", "page.categories.entries": "Itens", "page.categories.feeds": "Inscrições", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "Existe %d fonte.", "Existem %d fontes." ], "page.categories.unread_counter": "Numero de itens não lidos", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Nova categoria", "page.new_user.title": "Novo usuário", "page.edit_category.title": "Editar categoria: %s", @@ -109,6 +115,7 @@ "%d erros" ], "page.history.title": "Histórico", + "page.history.total": "Number of read entries", "page.import.title": "Importar", "page.search.title": "Resultados da busca", "page.about.title": "Sobre", diff --git a/internal/locale/translations/ru_RU.json b/internal/locale/translations/ru_RU.json index 3be4e412..0718ecca 100644 --- a/internal/locale/translations/ru_RU.json +++ b/internal/locale/translations/ru_RU.json @@ -18,6 +18,7 @@ "action.home_screen": "Добавить на домашний экран", "tooltip.keyboard_shortcuts": "Сочетания клавиш: %s", "tooltip.logged_user": "Авторизован как %s", + "menu.title": "Menu", "menu.unread": "Непрочитанное", "menu.starred": "Избранное", "menu.history": "История", @@ -84,18 +85,23 @@ ], "entry.tags.label": "Теги:", "page.shared_entries.title": "Общедоступные статьи", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Непрочитанное", + "page.unread.total": "Number of unread entries", "page.starred.title": "Избранное", + "page.starred.total": "Number of starred entries", "page.categories.title": "Категории", "page.categories.no_feed": "Нет подписок.", "page.categories.entries": "Cтатьи", "page.categories.feeds": "Подписки", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "Есть %d подписка.", "Есть %d подписки.", "Есть %d подписок." ], "page.categories.unread_counter": "Количество непрочитанных статей", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Новая категория", "page.new_user.title": "Новый пользователь", "page.edit_category.title": "Изменить категорию: %s", @@ -111,6 +117,7 @@ "%d ошибок" ], "page.history.title": "История", + "page.history.total": "Number of read entries", "page.import.title": "Импорт", "page.search.title": "Результаты поиска", "page.about.title": "О приложении", diff --git a/internal/locale/translations/tr_TR.json b/internal/locale/translations/tr_TR.json index 8925ceb5..510c3203 100644 --- a/internal/locale/translations/tr_TR.json +++ b/internal/locale/translations/tr_TR.json @@ -18,6 +18,7 @@ "action.home_screen": "Ana ekrana ekle", "tooltip.keyboard_shortcuts": "Klavye Kısayolu: %s", "tooltip.logged_user": "%s olarak giriş yapıldı", + "menu.title": "Menu", "menu.unread": "Okunmadı", "menu.starred": "Yıldız", "menu.history": "Geçmiş", @@ -84,17 +85,22 @@ ], "entry.tags.label": "Etiketleri:", "page.shared_entries.title": "Paylaşılan iletiler", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Okunmadı", + "page.unread.total": "Number of unread entries", "page.starred.title": "Yıldızlı", + "page.starred.total": "Number of starred entries", "page.categories.title": "Kategoriler", "page.categories.no_feed": "Besleme yok.", "page.categories.entries": "Makaleler", "page.categories.feeds": "Abonelikler", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "%d besleme var.", "%d besleme var." ], "page.categories.unread_counter": "Okunmamış iletilerin sayısı", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Yeni Kategori", "page.new_user.title": "Yeni Kullanıcı", "page.edit_category.title": "Kategoriyi Düzenle: %s", @@ -109,6 +115,7 @@ "%d hata" ], "page.history.title": "Geçmiş", + "page.history.total": "Number of read entries", "page.import.title": "İçeri Aktar", "page.search.title": "Arama Sonuçları", "page.about.title": "Hakkında", diff --git a/internal/locale/translations/uk_UA.json b/internal/locale/translations/uk_UA.json index bbe3d071..dfa8f7b1 100644 --- a/internal/locale/translations/uk_UA.json +++ b/internal/locale/translations/uk_UA.json @@ -18,6 +18,7 @@ "action.home_screen": "Додати до головного екрану", "tooltip.keyboard_shortcuts": "Комбінація клавіш: %s", "tooltip.logged_user": "Здійснено вхід як %s", + "menu.title": "Menu", "menu.unread": "Непрочитане", "menu.starred": "З зірочкою", "menu.history": "Історія", @@ -85,18 +86,23 @@ ], "entry.tags.label": "Теги:", "page.shared_entries.title": "Спильні записи", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "Непрочитане", + "page.unread.total": "Number of unread entries", "page.starred.title": "З зірочкою", + "page.starred.total": "Number of starred entries", "page.categories.title": "Категорії", "page.categories.no_feed": "Немає стрічки.", "page.categories.entries": "Статті", "page.categories.feeds": "Підписки", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "Містить %d стрічку.", "Містить %d стрічки.", "Містить %d стрічок." ], "page.categories.unread_counter": "Кількість непрочитаних записів", + "page.categories.all_counter": "Number of all entries", "page.new_category.title": "Нова категорія", "page.new_user.title": "Новий користувач", "page.edit_category.title": "Редагування категорії: %s", @@ -112,6 +118,7 @@ "%d помилок" ], "page.history.title": "Історія", + "page.history.total": "Number of read entries", "page.import.title": "Імпорт", "page.search.title": "Результати пошуку", "page.about.title": "Про додадок", diff --git a/internal/locale/translations/zh_CN.json b/internal/locale/translations/zh_CN.json index c1c70012..36e5b6a5 100644 --- a/internal/locale/translations/zh_CN.json +++ b/internal/locale/translations/zh_CN.json @@ -18,6 +18,7 @@ "action.home_screen": "添加到主屏幕", "tooltip.keyboard_shortcuts": "快捷键: %s", "tooltip.logged_user": "当前登录 %s", + "menu.title": "Menu", "menu.unread": "未读", "menu.starred": "收藏", "menu.history": "历史", @@ -84,12 +85,16 @@ ], "entry.tags.label": "标签：", "page.shared_entries.title": "已分享的文章", + "page.shared_entries.total": "Number of shared entries", "page.unread.title": "未读", + "page.unread.total": "Number of unread entries", "page.starred.title": "收藏", + "page.starred.total": "Number of starred entries", "page.categories.title": "分类", "page.categories.no_feed": "没有源", "page.categories.entries": "查看内容", "page.categories.feeds": "查看源", + "page.categories.feeds.total": "Number of feeds", "page.categories.feed_count": [ "有 %d 个源" ], @@ -107,6 +112,7 @@ "%d 错误" ], "page.history.title": "历史", + "page.history.total": "Number of read entries", "page.import.title": "导入", "page.search.title": "搜索结果", "page.about.title": "关于", diff --git a/internal/locale/translations/zh_TW.json b/internal/locale/translations/zh_TW.json index e0560d04..10a076e2 100644 --- a/internal/locale/translations/zh_TW.json +++ b/internal/locale/translations/zh_TW.json @@ -18,6 +18,7 @@ "action.home_screen": "新增到主螢幕", "tooltip.keyboard_shortcuts": "快捷鍵: %s", "tooltip.logged_user": "當前登入 %s", + "menu.title": "導覽", "menu.unread": "未讀", "menu.starred": "收藏", "menu.history": "歷史", @@ -84,17 +85,22 @@ ], "entry.tags.label": "標籤：", "page.shared_entries.title": "已分享的文章", + "page.shared_entries.total": "已分享的文章數", "page.unread.title": "未讀", + "page.unread.total": "未讀文章數", "page.starred.title": "收藏", "page.categories.title": "分類", "page.categories.no_feed": "沒有Feed", "page.categories.entries": "檢視內容", "page.categories.feeds": "檢視Feeds", + "page.categories.feeds.total": "Feeds總數", "page.categories.feed_count": [ "有 %d 個Feed", "有 %d 個Feeds" ], "page.categories.unread_counter": "未讀文章數", + "page.categories.all_counter": "所有文章數", + "page.categories.total": "分類總數", "page.new_category.title": "新分類", "page.new_user.title": "新使用者", "page.edit_category.title": "編輯分類 : %s", @@ -109,6 +115,7 @@ "%d 錯誤" ], "page.history.title": "歷史", + "page.history.total": "已讀文章數", "page.import.title": "匯入", "page.search.title": "搜尋結果", "page.about.title": "關於", diff --git a/internal/template/templates/views/bookmark_entries.html b/internal/template/templates/views/bookmark_entries.html index d10fd391..516b90b1 100644 --- a/internal/template/templates/views/bookmark_entries.html +++ b/internal/template/templates/views/bookmark_entries.html @@ -2,7 +2,11 @@ {{ define "content"}}
-

{{ t "page.starred.title" }} ({{ .total }})

+

+ {{ t "page.starred.title" }} + +

+ {{ t "page.starred.total" }}: {{ .total }}
{{ if not .entries }} diff --git a/internal/template/templates/views/categories.html b/internal/template/templates/views/categories.html index c1d30e3f..ad57b081 100644 --- a/internal/template/templates/views/categories.html +++ b/internal/template/templates/views/categories.html @@ -2,12 +2,18 @@ {{ define "content"}}
-

{{ t "page.categories.title" }} ({{ .total }})

- +

+ {{ t "page.categories.title" }} + +

+ {{ t "page.categories.total" }}: {{ .total }} +
{{ if not .categories }} diff --git a/internal/template/templates/views/category_entries.html b/internal/template/templates/views/category_entries.html index 4b66431b..d51e57dd 100644 --- a/internal/template/templates/views/category_entries.html +++ b/internal/template/templates/views/category_entries.html @@ -2,44 +2,56 @@ {{ define "content"}}
-

{{ .category.Title }} ({{ .total }})

- +

+ {{ .category.Title }} + +

+ + {{ if .showOnlyUnreadEntries }} + {{ t "page.categories.unread_counter" }}: {{ .total }} + {{ else }} + {{ t "page.categories.all_counter" }}: {{ .total }} + {{ end }} + +
{{ if not .entries }} diff --git a/internal/template/templates/views/category_feeds.html b/internal/template/templates/views/category_feeds.html index 8149949d..e7d85d56 100644 --- a/internal/template/templates/views/category_feeds.html +++ b/internal/template/templates/views/category_feeds.html @@ -2,30 +2,38 @@ {{ define "content"}}
-

{{ .category.Title }} > {{ t "page.feeds.title" }} ({{ .total }})

- +

+ {{ .category.Title }} {{ t "page.feeds.title" }} + +

+ + {{ t "page.categories.feeds.total" }}: {{ .total }} + +
{{ if not .feeds }} diff --git a/internal/template/templates/views/create_category.html b/internal/template/templates/views/create_category.html index c9635966..d3e5d0a6 100644 --- a/internal/template/templates/views/create_category.html +++ b/internal/template/templates/views/create_category.html @@ -3,11 +3,13 @@ {{ define "content"}}

{{ t "page.new_category.title" }}

- +
diff --git a/internal/template/templates/views/edit_category.html b/internal/template/templates/views/edit_category.html index 16588a60..1c90b81e 100644 --- a/internal/template/templates/views/edit_category.html +++ b/internal/template/templates/views/edit_category.html @@ -3,17 +3,19 @@ {{ define "content"}}

{{ t "page.edit_category.title" .category.Title }}

- +
diff --git a/internal/template/templates/views/edit_feed.html b/internal/template/templates/views/edit_feed.html index fc621826..5836f57e 100644 --- a/internal/template/templates/views/edit_feed.html +++ b/internal/template/templates/views/edit_feed.html @@ -3,24 +3,26 @@ {{ define "content"}}

{{ .feed.Title }}

- +
{{ if not .categories }} diff --git a/internal/template/templates/views/feed_entries.html b/internal/template/templates/views/feed_entries.html index 1c2db382..6b3011be 100644 --- a/internal/template/templates/views/feed_entries.html +++ b/internal/template/templates/views/feed_entries.html @@ -4,63 +4,72 @@

{{ .feed.Title }} - ({{ .total }}) +

- + +
{{ if ne .feed.ParsingErrorCount 0 }} diff --git a/internal/template/templates/views/history_entries.html b/internal/template/templates/views/history_entries.html index 66948748..3086b017 100644 --- a/internal/template/templates/views/history_entries.html +++ b/internal/template/templates/views/history_entries.html @@ -2,23 +2,29 @@ {{ define "content"}}
-

{{ t "page.history.title" }} ({{ .total }})

- +

+ {{ t "page.history.title" }} + +

+ {{ t "page.history.total" }}: {{ .total }} +
{{ if not .entries }} diff --git a/internal/template/templates/views/shared_entries.html b/internal/template/templates/views/shared_entries.html index eb5bd93a..ac33433f 100644 --- a/internal/template/templates/views/shared_entries.html +++ b/internal/template/templates/views/shared_entries.html @@ -2,22 +2,28 @@ {{ define "content"}}
-

{{ t "page.shared_entries.title" }} ({{ .total }})

+

+ {{ t "page.shared_entries.title" }} + +

+ {{ t "page.shared_entries.total" }}: {{ .total }} {{ if .entries }} - + {{ end }}
diff --git a/internal/template/templates/views/unread_entries.html b/internal/template/templates/views/unread_entries.html index 15d9a164..dd6ecdb7 100644 --- a/internal/template/templates/views/unread_entries.html +++ b/internal/template/templates/views/unread_entries.html @@ -2,29 +2,35 @@ {{ define "content"}}
-

{{ t "page.unread.title" }} ({{ .countUnread }})

+

+ {{ t "page.unread.title" }} + +

+ {{ t "page.unread.total" }}: {{ .countUnread }} {{ if .entries }} - + {{ end }}
diff --git a/internal/ui/static/css/common.css b/internal/ui/static/css/common.css index ee511840..e89f2f4c 100644 --- a/internal/ui/static/css/common.css +++ b/internal/ui/static/css/common.css @@ -50,6 +50,20 @@ a:hover { text-decoration: none; } +.sr-only { + border: 0 !important; + clip: rect(1px, 1px, 1px, 1px) !important; + -webkit-clip-path: inset(50%) !important; + clip-path: inset(50%) !important; + height: 1px !important; + overflow: hidden !important; + margin: -1px !important; + padding: 0 !important; + position: absolute !important; + width: 1px !important; + white-space: nowrap !important; +} + /* Header and main menu */ .header { margin-top: 10px;