A free, self-hostable news aggregator…
Disable unread counter in tab title and favicon (refresh of #6590) (#8728)
polybjorne41611759179
diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.phpindex b90221ca8..5b4187b41 100644--- a/app/Controllers/configureController.php+++ b/app/Controllers/configureController.php@@ -74,6 +74,7 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController {FreshRSS_Context::userConf()->bottomline_date = Minz_Request::paramBoolean('bottomline_date');FreshRSS_Context::userConf()->bottomline_link = Minz_Request::paramBoolean('bottomline_link');FreshRSS_Context::userConf()->show_nav_buttons = Minz_Request::paramBoolean('show_nav_buttons');+ FreshRSS_Context::userConf()->show_title_unread = Minz_Request::paramBoolean('show_title_unread');FreshRSS_Context::userConf()->sidebar_hidden_by_default = Minz_Request::paramBoolean('sidebar_hidden_by_default');FreshRSS_Context::userConf()->html5_notif_timeout = max(0, Minz_Request::paramInt('html5_notif_timeout'));FreshRSS_Context::userConf()->html5_enable_notif = Minz_Request::paramBoolean('html5_enable_notif');diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.phpindex fe0bad8e9..fb54866bb 100644--- a/app/Controllers/indexController.php+++ b/app/Controllers/indexController.php@@ -145,7 +145,7 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {if ($search !== '') {$title = '“' . htmlspecialchars($search, ENT_COMPAT, 'UTF-8') . '”';}- if (FreshRSS_Context::$get_unread > 0) {+ if (FreshRSS_Context::userConf()->show_title_unread && FreshRSS_Context::$get_unread > 0) {$title = '(' . FreshRSS_Context::$get_unread . ') ' . $title;}if (strlen($title) > 0) {@@ -224,7 +224,7 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {$this->view->rss_title = FreshRSS_Context::$name . ' | ' . FreshRSS_View::title();$title = _t('index.feed.title_global');- if (FreshRSS_Context::$get_unread > 0) {+ if (FreshRSS_Context::userConf()->show_title_unread && FreshRSS_Context::$get_unread > 0) {$title = '(' . FreshRSS_Context::$get_unread . ') ' . $title;}FreshRSS_View::prependTitle($title . ' · ');diff --git a/app/Models/UserConfiguration.php b/app/Models/UserConfiguration.phpindex b1331969d..5e25776cf 100644--- a/app/Models/UserConfiguration.php+++ b/app/Models/UserConfiguration.php@@ -54,6 +54,7 @@ declare(strict_types=1);* @property bool $icons_as_emojis* @property int $simplify_over_n_feeds* @property bool $show_nav_buttons+ * @property bool $show_title_unread* @property bool $sidebar_hidden_by_default* @property 'big'|'small'|'none' $mark_read_button* @property 'ASC'|'DESC' $sort_orderdiff --git a/app/i18n/cs/conf.php b/app/i18n/cs/conf.phpindex dd8b1d879..804bd1aa0 100644--- a/app/i18n/cs/conf.php+++ b/app/i18n/cs/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Časový limit HTML5 oznámení',),'show_nav_buttons' => 'Zobrazit navigační tlačítka',+ 'show_title_unread' => 'Zobrazit počet nepřečtených článků v názvu','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Motiv',diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.phpindex d9e424686..b2cd6a6fd 100644--- a/app/i18n/de/conf.php+++ b/app/i18n/de/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Zeitüberschreitung für HTML5-Benachrichtigung',),'show_nav_buttons' => 'Navigations-Buttons anzeigen',+ 'show_title_unread' => 'Show number of unread articles in the title', // TODO'sidebar_hidden_by_default' => 'Seitenleiste standardmäßig ausblenden','theme' => array('_' => 'Layout',diff --git a/app/i18n/el/conf.php b/app/i18n/el/conf.phpindex 9869479f3..91dc702da 100644--- a/app/i18n/el/conf.php+++ b/app/i18n/el/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 notification timeout', // TODO),'show_nav_buttons' => 'Show the navigation buttons', // TODO+ 'show_title_unread' => 'Εμφάνιση αριθμού μη αναγνωσμένων άρθρων στον τίτλο','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Theme', // TODOdiff --git a/app/i18n/en-US/conf.php b/app/i18n/en-US/conf.phpindex 926035f8f..ba6ea3065 100644--- a/app/i18n/en-US/conf.php+++ b/app/i18n/en-US/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 notification timeout', // IGNORE),'show_nav_buttons' => 'Show the navigation buttons', // IGNORE+ 'show_title_unread' => 'Show number of unread articles in the title', // IGNORE'sidebar_hidden_by_default' => 'Hide sidebar by default', // IGNORE'theme' => array('_' => 'Theme', // IGNOREdiff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.phpindex c3e408149..efa3a28c9 100644--- a/app/i18n/en/conf.php+++ b/app/i18n/en/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 notification timeout',),'show_nav_buttons' => 'Show the navigation buttons',+ 'show_title_unread' => 'Show number of unread articles in the title','sidebar_hidden_by_default' => 'Hide sidebar by default','theme' => array('_' => 'Theme',diff --git a/app/i18n/es/conf.php b/app/i18n/es/conf.phpindex d1cf0034f..97373d79e 100644--- a/app/i18n/es/conf.php+++ b/app/i18n/es/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Notificación de fin de espera HTML5',),'show_nav_buttons' => 'Mostrar los botones de navegación',+ 'show_title_unread' => 'Mostrar el número de artículos no leídos en el título','sidebar_hidden_by_default' => 'Ocultar barra lateral por defecto','theme' => array('_' => 'Tema',diff --git a/app/i18n/fa/conf.php b/app/i18n/fa/conf.phpindex d847f0fb9..541eebd58 100644--- a/app/i18n/fa/conf.php+++ b/app/i18n/fa/conf.php@@ -54,6 +54,7 @@ return array('timeout' => ' وقفه اعلان HTML5',),'show_nav_buttons' => ' دکمه های ناوبری را نشان دهید',+ 'show_title_unread' => 'نمایش تعداد مقالات خوانده نشده در عنوان','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => ' موضوع',diff --git a/app/i18n/fi/conf.php b/app/i18n/fi/conf.phpindex 5aafb0954..520b7eb1e 100644--- a/app/i18n/fi/conf.php+++ b/app/i18n/fi/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Tauko HTML5-ilmoitusten välissä',),'show_nav_buttons' => 'Näytä siirtymispainikkeet',+ 'show_title_unread' => 'Show number of unread articles in the title', // TODO'sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Teema',diff --git a/app/i18n/fr/conf.php b/app/i18n/fr/conf.phpindex eded321a1..27a31d9a5 100644--- a/app/i18n/fr/conf.php+++ b/app/i18n/fr/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Temps d’affichage de la notification HTML5',),'show_nav_buttons' => 'Afficher les boutons de navigation',+ 'show_title_unread' => 'Afficher le nombre d’articles non lus dans le titre','sidebar_hidden_by_default' => 'Masquer la barre latérale par défaut','theme' => array('_' => 'Thème',diff --git a/app/i18n/he/conf.php b/app/i18n/he/conf.phpindex 2a23ab0a6..1544e6f28 100644--- a/app/i18n/he/conf.php+++ b/app/i18n/he/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 התראה פג תוקף',),'show_nav_buttons' => 'Show the navigation buttons', // TODO+ 'show_title_unread' => 'הצגת מספר המאמרים שלא נקראו בכותרת','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'ערכת נושא',diff --git a/app/i18n/hu/conf.php b/app/i18n/hu/conf.phpindex 51d5d31a5..d90597c20 100644--- a/app/i18n/hu/conf.php+++ b/app/i18n/hu/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 értesítés hossza',),'show_nav_buttons' => 'Navigációs gombok megjelenítése',+ 'show_title_unread' => 'A meg nem nyitott cikkek számának megjelenítése a címben','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Téma',diff --git a/app/i18n/id/conf.php b/app/i18n/id/conf.phpindex 5cba9a0ab..3bdb55952 100644--- a/app/i18n/id/conf.php+++ b/app/i18n/id/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Batas waktu pemberitahuan HTML5',),'show_nav_buttons' => 'Tampilkan tombol navigasi',+ 'show_title_unread' => 'Tampilkan jumlah artikel yang belum dibaca di judul','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Tema',diff --git a/app/i18n/it/conf.php b/app/i18n/it/conf.phpindex c2c3d1d3a..babfbb70b 100644--- a/app/i18n/it/conf.php+++ b/app/i18n/it/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Notifica timeout HTML5',),'show_nav_buttons' => 'Mostra i pulsanti di navigazione',+ 'show_title_unread' => 'Mostra il numero di articoli non letti nel titolo','sidebar_hidden_by_default' => 'Nascondi la barra laterale di default','theme' => array('_' => 'Tema',diff --git a/app/i18n/ja/conf.php b/app/i18n/ja/conf.phpindex c2eba4f42..4cfd8653b 100644--- a/app/i18n/ja/conf.php+++ b/app/i18n/ja/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 の通知タイムアウト時間',),'show_nav_buttons' => 'ナビゲーションボタンを表示する',+ 'show_title_unread' => 'タイトルに未読の記事数を表示','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'テーマ',diff --git a/app/i18n/ko/conf.php b/app/i18n/ko/conf.phpindex 7c48fc4b0..ff92acc04 100644--- a/app/i18n/ko/conf.php+++ b/app/i18n/ko/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 알림 타임아웃',),'show_nav_buttons' => '내비게이션 버튼 보이기',+ 'show_title_unread' => '제목에 읽지 않은 기사 수 표시','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => '테마',diff --git a/app/i18n/lv/conf.php b/app/i18n/lv/conf.phpindex cc970d8ab..465aebc5f 100644--- a/app/i18n/lv/conf.php+++ b/app/i18n/lv/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 paziņojuma laika ierobežojums',),'show_nav_buttons' => 'Rādīt navigācijas pogas',+ 'show_title_unread' => 'Rādīt nelasīto rakstu skaitu virsrakstā','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Tēma',diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.phpindex 4d04ee863..7743211c9 100644--- a/app/i18n/nl/conf.php+++ b/app/i18n/nl/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 notificatie stop',),'show_nav_buttons' => 'Toon navigatieknoppen',+ 'show_title_unread' => 'Aantal ongelezen artikelen in de titel weergeven','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Thema',diff --git a/app/i18n/oc/conf.php b/app/i18n/oc/conf.phpindex deff10c36..a99f59c21 100644--- a/app/i18n/oc/conf.php+++ b/app/i18n/oc/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Temps d’afichatge de las notificacions HTML5',),'show_nav_buttons' => 'Mostrar los botons de navigacion',+ 'show_title_unread' => 'Mostra lo nombre d’articles non legits dins lo títol','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Tèma',diff --git a/app/i18n/pl/conf.php b/app/i18n/pl/conf.phpindex dbd94993c..9fbd8d829 100644--- a/app/i18n/pl/conf.php+++ b/app/i18n/pl/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Czas wyświetlania powiadomienia HTML5',),'show_nav_buttons' => 'Pokaż przyciski nawigacyjne',+ 'show_title_unread' => 'Pokaż liczbę nieprzeczytanych artykułów w tytule','sidebar_hidden_by_default' => 'Ukryj pasek boczny domyślnie','theme' => array('_' => 'Motyw',diff --git a/app/i18n/pt-BR/conf.php b/app/i18n/pt-BR/conf.phpindex b572142da..7d581eb1c 100644--- a/app/i18n/pt-BR/conf.php+++ b/app/i18n/pt-BR/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Notificação em HTML5 de timeout',),'show_nav_buttons' => 'Mostrar botões de navegação',+ 'show_title_unread' => 'Mostrar o número de artigos não lidos no título','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Tema',diff --git a/app/i18n/pt-PT/conf.php b/app/i18n/pt-PT/conf.phpindex 00845c68e..1109ef601 100644--- a/app/i18n/pt-PT/conf.php+++ b/app/i18n/pt-PT/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Notificação em HTML5 de timeout',),'show_nav_buttons' => 'Mostrar botões de navegação',+ 'show_title_unread' => 'Show number of unread articles in the title', // TODO'sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Tema',diff --git a/app/i18n/ru/conf.php b/app/i18n/ru/conf.phpindex de144608f..74c99a22a 100644--- a/app/i18n/ru/conf.php+++ b/app/i18n/ru/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Таймаут уведомлений HTML5',),'show_nav_buttons' => 'Показать кнопки навигации',+ 'show_title_unread' => 'Показать количество непрочитанных статей в заголовке','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Тема',diff --git a/app/i18n/sk/conf.php b/app/i18n/sk/conf.phpindex 31cca9406..7bdbb100d 100644--- a/app/i18n/sk/conf.php+++ b/app/i18n/sk/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Limit HTML5 oznámenia',),'show_nav_buttons' => 'Zobraziť tlačidlá oznámenia',+ 'show_title_unread' => 'Zobraziť počet neprečítaných článkov v názve','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Vzhľad',diff --git a/app/i18n/tr/conf.php b/app/i18n/tr/conf.phpindex 8b6d6d546..fa9a4fcfd 100644--- a/app/i18n/tr/conf.php+++ b/app/i18n/tr/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 bildirim zaman aşımı',),'show_nav_buttons' => 'Gezinme düğmelerini göster',+ 'show_title_unread' => 'Başlıkta okunmamış makale sayısını göster','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Tema',diff --git a/app/i18n/uk/conf.php b/app/i18n/uk/conf.phpindex a531c336a..59466a6ab 100644--- a/app/i18n/uk/conf.php+++ b/app/i18n/uk/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'Тайм-аут сповіщення HTML5',),'show_nav_buttons' => 'Показати кнопки навігації',+ 'show_title_unread' => 'Show number of unread articles in the title', // TODO'sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => 'Тема',diff --git a/app/i18n/zh-CN/conf.php b/app/i18n/zh-CN/conf.phpindex 228e63d04..c26e78120 100644--- a/app/i18n/zh-CN/conf.php+++ b/app/i18n/zh-CN/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 通知超时时间',),'show_nav_buttons' => '显示导航按钮',+ 'show_title_unread' => '在标题中显示未读文章的数量','sidebar_hidden_by_default' => 'Hide sidebar by default', // TODO'theme' => array('_' => '主题',diff --git a/app/i18n/zh-TW/conf.php b/app/i18n/zh-TW/conf.phpindex ec1bb6db1..03eb21e4c 100644--- a/app/i18n/zh-TW/conf.php+++ b/app/i18n/zh-TW/conf.php@@ -54,6 +54,7 @@ return array('timeout' => 'HTML5 通知逾時',),'show_nav_buttons' => '顯示導覽按鈕',+ 'show_title_unread' => '在標題中顯示未讀文章的數量','sidebar_hidden_by_default' => '預設隱藏側邊欄','theme' => array('_' => '主題',diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtmlindex eb1bb38dd..a0cd3699b 100644--- a/app/views/configure/display.phtml+++ b/app/views/configure/display.phtml@@ -275,6 +275,17 @@</div></div>+ <div class="form-group">+ <div class="group-controls">+ <label class="checkbox" for="show_title_unread">+ <input type="checkbox" name="show_title_unread" id="show_title_unread" value="1"<?=+ FreshRSS_Context::userConf()->show_title_unread ? ' checked="checked"' : '' ?>+ data-leave-validation="<?= FreshRSS_Context::userConf()->show_title_unread ?>" />+ <?= _t('conf.display.show_title_unread') ?>+ </label>+ </div>+ </div>+<div class="form-group"><div class="group-controls"><label class="checkbox" for="sidebar_hidden_by_default">diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtmlindex 01c340c5e..d9d8052f5 100644--- a/app/views/helpers/javascript_vars.phtml+++ b/app/views/helpers/javascript_vars.phtml@@ -15,6 +15,7 @@ echo json_encode(['display_order' => Minz_Request::paramString('order') ?: FreshRSS_Context::userConf()->sort_order,'sort' => FreshRSS_Context::$sort,'display_categories' => FreshRSS_Context::userConf()->display_categories,+ 'show_title_unread' => FreshRSS_Context::userConf()->show_title_unread,'auto_mark_article' => !!$mark['article'],'auto_mark_site' => !!$mark['site'],'auto_mark_scroll' => !!$mark['scroll'],diff --git a/config-user.default.php b/config-user.default.phpindex 13b1dae04..f514db511 100644--- a/config-user.default.php+++ b/config-user.default.php@@ -33,6 +33,7 @@ return array ('default_view' => 'adaptive','default_state' => FreshRSS_Entry::STATE_NOT_READ,'show_fav_unread' => false,+ 'show_title_unread' => true,'auto_load_more' => true,'display_posts' => false,'display_categories' => 'active', //{ active, remember, all, none }diff --git a/p/scripts/main.js b/p/scripts/main.jsindex d0bf4334c..f0cc36aea 100644--- a/p/scripts/main.js+++ b/p/scripts/main.js@@ -171,10 +171,12 @@ function incUnreadsFeed(article, feed_id, nb) {return p1;}});- if (prevTitle) {- prevTitle = newTitle;- } else {- document.title = newTitle;+ if (context.show_title_unread !== false) {+ if (prevTitle) {+ prevTitle = newTitle;+ } else {+ document.title = newTitle;+ }}return isCurrentView;}@@ -2239,6 +2241,10 @@ function init_confirm_action() {}function faviconNbUnread(n) {+ if (context.show_title_unread === false) {+ return;+ }+if (typeof n === 'undefined') {const t = document.querySelector('.category.all .title');n = t ? str2int(t.getAttribute('data-unread')) : 0;