From d9197d7e32a97f29829ffd4cf4371b1853e51fa2 Mon Sep 17 00:00:00 2001 From: Inverle Date: Fri, 8 Aug 2025 17:39:38 +0200 Subject: New JS attribute: `data-auto-leave-validation` (#7785) Instead of a repeating pattern like: ``, you can now put a `data-auto-leave-validation="1"` attribute on a `
` for example, and it will automatically set the `data-leave-validation` attributes inside the form elements. `data_auto_leave_validation(parent)` from `extra.js` is called on slider open and page load. --------- Co-authored-by: Alexandre Alapetite Co-authored-by: Frans de Jonge --- app/i18n/cs/gen.php | 1 + app/i18n/de/gen.php | 1 + app/i18n/el/gen.php | 1 + app/i18n/en-us/gen.php | 1 + app/i18n/en/gen.php | 1 + app/i18n/es/gen.php | 1 + app/i18n/fa/gen.php | 1 + app/i18n/fi/gen.php | 1 + app/i18n/fr/gen.php | 1 + app/i18n/he/gen.php | 1 + app/i18n/hu/gen.php | 1 + app/i18n/id/gen.php | 1 + app/i18n/it/gen.php | 1 + app/i18n/ja/gen.php | 1 + app/i18n/ko/gen.php | 1 + app/i18n/lv/gen.php | 1 + app/i18n/nl/gen.php | 1 + app/i18n/oc/gen.php | 1 + app/i18n/pl/gen.php | 1 + app/i18n/pt-br/gen.php | 1 + app/i18n/pt-pt/gen.php | 1 + app/i18n/ru/gen.php | 1 + app/i18n/sk/gen.php | 1 + app/i18n/tr/gen.php | 1 + app/i18n/zh-cn/gen.php | 1 + app/i18n/zh-tw/gen.php | 1 + app/views/auth/index.phtml | 12 ++--- app/views/configure/archiving.phtml | 29 ++++------- app/views/configure/display.phtml | 70 ++++++++++--------------- app/views/configure/integration.phtml | 6 +-- app/views/configure/privacy.phtml | 5 +- app/views/configure/reading.phtml | 86 ++++++++++++------------------- app/views/configure/shortcut.phtml | 71 +++++++++----------------- app/views/configure/system.phtml | 21 +++----- app/views/helpers/category/update.phtml | 36 +++++-------- app/views/helpers/configure/query.phtml | 2 +- app/views/helpers/feed/update.phtml | 90 +++++++++++++-------------------- app/views/helpers/javascript_vars.phtml | 1 + app/views/importExport/index.phtml | 4 +- app/views/subscription/add.phtml | 2 +- app/views/tag/index.phtml | 2 +- app/views/tag/update.phtml | 2 +- app/views/user/details.phtml | 2 +- app/views/user/manage.phtml | 2 +- app/views/user/profile.phtml | 4 +- 45 files changed, 195 insertions(+), 278 deletions(-) (limited to 'app') diff --git a/app/i18n/cs/gen.php b/app/i18n/cs/gen.php index 232251ab2..540970b56 100644 --- a/app/i18n/cs/gen.php +++ b/app/i18n/cs/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Prázdná kategorie', 'confirm_action' => 'Opravdu chcete provést tuto akci? Toto nelze zrušit!', 'confirm_action_feed_cat' => 'Opravdu chcete provést tuto akci? Přijdete o související oblíbené položky a uživatelské dotazy. Toto nelze zrušit!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'Ve FreshRSS je %%d nových článků k přečtení.', 'body_unread_articles' => '(nepřečtené: %%d)', diff --git a/app/i18n/de/gen.php b/app/i18n/de/gen.php index b373b38f2..1ead9abeb 100644 --- a/app/i18n/de/gen.php +++ b/app/i18n/de/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Kategorie leeren', 'confirm_action' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Diese Aktion kann nicht abgebrochen werden!', 'confirm_action_feed_cat' => 'Sind Sie sicher, dass Sie diese Aktion durchführen wollen? Sie werden zugehörige Favoriten und Benutzerabfragen verlieren. Dies kann nicht abgebrochen werden!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'Es gibt %%d neue Artikel zum Lesen auf FreshRSS.', 'body_unread_articles' => '(Ungelesen: %%d)', diff --git a/app/i18n/el/gen.php b/app/i18n/el/gen.php index a8a22e699..1d67b514d 100644 --- a/app/i18n/el/gen.php +++ b/app/i18n/el/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Empty category', // TODO 'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!', // TODO 'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favourites and user queries. It cannot be cancelled!', // TODO + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'There are %%d new articles to read on FreshRSS.', // TODO 'body_unread_articles' => '(unread: %%d)', // TODO diff --git a/app/i18n/en-us/gen.php b/app/i18n/en-us/gen.php index f272f9d12..c6305a248 100644 --- a/app/i18n/en-us/gen.php +++ b/app/i18n/en-us/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Empty category', // IGNORE 'confirm_action' => 'Are you sure you want to perform this action? It cannot be canceled!', 'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favorites and user queries. It cannot be canceled!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // IGNORE 'feedback' => array( 'body_new_articles' => 'There are %%d new articles to read on FreshRSS.', // IGNORE 'body_unread_articles' => '(unread: %%d)', // IGNORE diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php index 3b3872561..9c6bd5070 100644 --- a/app/i18n/en/gen.php +++ b/app/i18n/en/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Empty category', 'confirm_action' => 'Are you sure you want to perform this action? It cannot be cancelled!', 'confirm_action_feed_cat' => 'Are you sure you want to perform this action? You will lose related favourites and user queries. It cannot be cancelled!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', 'feedback' => array( 'body_new_articles' => 'There are %%d new articles to read on FreshRSS.', 'body_unread_articles' => '(unread: %%d)', diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php index bca993c13..ae606ad37 100644 --- a/app/i18n/es/gen.php +++ b/app/i18n/es/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Vaciar categoría', 'confirm_action' => '¿Seguro que quieres hacerlo? No hay marcha atrás…', 'confirm_action_feed_cat' => '¿Seguro que quieres hacerlo? Perderás todos los favoritos relacionados y las peticiones de usuario. ¡Y no hay marcha atrás!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'Hay %%d nuevos artículos para leer en FreshRSS.', 'body_unread_articles' => '(No leídos: %%d)', diff --git a/app/i18n/fa/gen.php b/app/i18n/fa/gen.php index 99a411f4e..d9dda44d4 100644 --- a/app/i18n/fa/gen.php +++ b/app/i18n/fa/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => ' دسته خالی', 'confirm_action' => ' آیا مطمئن هستید که می خواهید این عمل را انجام دهید؟ نمی توان آن را لغو کرد!', 'confirm_action_feed_cat' => ' آیا مطمئن هستید که می خواهید این عمل را انجام دهید؟ موارد دلخواه و درخواست های کاربر مرتبط را از دست خواهید داد. نمی توان آن را لغو کرد!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => ' %%d مقاله جدید برای خواندن در FreshRSS وجود دارد.', 'body_unread_articles' => ' (خوانده نشده: %%d)', diff --git a/app/i18n/fi/gen.php b/app/i18n/fi/gen.php index b8a8ad905..c74a3dd68 100644 --- a/app/i18n/fi/gen.php +++ b/app/i18n/fi/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Tyhjennä luokka', 'confirm_action' => 'Haluatko varmasti toteuttaa toiminnon? Sitä ei voi peruuttaa!', 'confirm_action_feed_cat' => 'Haluatko varmasti toteuttaa toiminnon? Luokkaan kuuluvat suosikit ja kyselyt poistetaan. Tätä ei voi peruuttaa!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'FreshRSS-sovelluksessa on %%d uutta artikkelia luettavana.', 'body_unread_articles' => '(lukematta: %%d)', diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php index 282fc82c9..100910bbe 100644 --- a/app/i18n/fr/gen.php +++ b/app/i18n/fr/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Catégorie vide', 'confirm_action' => 'Êtes-vous sûr(e) de vouloir continuer ? Cette action ne peut être annulée !', 'confirm_action_feed_cat' => 'Êtes-vous sûr(e) de vouloir continuer ? Vous perdrez les favoris et les filtres associés. Cette action ne peut être annulée !', + 'confirm_exit_slider' => 'Êtes-vous sûr de vouloir abandonner les paramètres non enregistrés ?', 'feedback' => array( 'body_new_articles' => 'Il y a %%d nouveaux articles à lire sur FreshRSS.', 'body_unread_articles' => '(non lus : %%d)', diff --git a/app/i18n/he/gen.php b/app/i18n/he/gen.php index 1ce9b7bdb..5bdfad088 100644 --- a/app/i18n/he/gen.php +++ b/app/i18n/he/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Empty category', // TODO 'confirm_action' => 'האם אתם בטוחים שברצונכם לבצע פעולה זו? אין אפשרות לבטל אותה!', 'confirm_action_feed_cat' => 'האם אתם בטוחים שברצוניכם לבצע פעולה זו? מועדפים ושאילתות עשויות לאבוד. אין אפשרות לבטל אותה!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'ישנם \\d מאמרים חדשים לקרוא ב FreshRSS.', 'body_unread_articles' => '(unread: %%d)', // TODO diff --git a/app/i18n/hu/gen.php b/app/i18n/hu/gen.php index 54a2eaf56..8ccc9441e 100755 --- a/app/i18n/hu/gen.php +++ b/app/i18n/hu/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Üres kategória', 'confirm_action' => 'Biztos vagy benne hogy végrehajtod ezt a műveletet? A művelet nem megszakítható!', 'confirm_action_feed_cat' => 'Biztos hogy végrehajtod ezt a műveletet? Minden kapcsolódó kedvenc és lekérdezés törölve lesz. Nem lehet megszakítani!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => '%%d db új cikk olvasható a FreshRSS-ben.', 'body_unread_articles' => '(olvasatlan: %%d)', diff --git a/app/i18n/id/gen.php b/app/i18n/id/gen.php index d62166902..1a331df2c 100644 --- a/app/i18n/id/gen.php +++ b/app/i18n/id/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Kategori kosong', 'confirm_action' => 'Apakah Anda yakin ingin melakukan ini? Ini tidak dapat dibatalkan!', 'confirm_action_feed_cat' => 'Apakah Anda yakin ingin melakukan ini? Anda akan kehilangan favorit dan pencarian pengguna terkait. Ini tidak dapat dibatalkan.', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'Ada %%d artikel baru untuk dibaca di FreshRSS.', 'body_unread_articles' => '(belum dibaca: %%d)', diff --git a/app/i18n/it/gen.php b/app/i18n/it/gen.php index 485f51371..f6c4ff621 100644 --- a/app/i18n/it/gen.php +++ b/app/i18n/it/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Categoria vuota', 'confirm_action' => 'Sei sicuro di voler continuare?', 'confirm_action_feed_cat' => 'Sei sicuro di voler continuare? Verranno persi i preferiti e le ricerche utente correlate!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'Ci sono %%d nuovi articoli da leggere.', 'body_unread_articles' => '(non letti: %%d)', diff --git a/app/i18n/ja/gen.php b/app/i18n/ja/gen.php index 5debea06f..02de4ac2a 100644 --- a/app/i18n/ja/gen.php +++ b/app/i18n/ja/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => '空白のカテゴリ', 'confirm_action' => '本当に実行してもいいですか?キャンセルはできません!', 'confirm_action_feed_cat' => '本当に実行してもいいですか? あなたは関連するお気に入りとユーザークエリを失います。キャンセルできません!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => '%%d の新規記事がFreshRSSにはあります。', 'body_unread_articles' => '(未読: %%d)', diff --git a/app/i18n/ko/gen.php b/app/i18n/ko/gen.php index 803f02ff9..9d4a4a82d 100644 --- a/app/i18n/ko/gen.php +++ b/app/i18n/ko/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => '빈 카테고리', 'confirm_action' => '정말 이 작업을 수행하시겠습니까? 이 작업은 되돌릴 수 없습니다!', 'confirm_action_feed_cat' => '정말 이 작업을 수행하시겠습니까? 관련된 즐겨찾기와 사용자 쿼리가 삭제됩니다. 이 작업은 되돌릴 수 없습니다!!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => '%%d 개의 새 글이 FreshRSS에 있습니다.', 'body_unread_articles' => '(%%d 개 읽지 않음)', diff --git a/app/i18n/lv/gen.php b/app/i18n/lv/gen.php index dd3ed807f..1544e3834 100644 --- a/app/i18n/lv/gen.php +++ b/app/i18n/lv/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Tukša kategorija', 'confirm_action' => 'Vai esat pārliecināts, ka vēlaties veikt šo darbību? To nevar atcelt!', 'confirm_action_feed_cat' => 'Vai esat pārliecināts, ka vēlaties veikt šo darbību? Jūs zaudēsiet saistītos mīļākos rakstus un lietotāja pieprasījumus. To nevar atcelt!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'FreshRSS ir %%d jauni raksti lasīšanai.', 'body_unread_articles' => '(neizlasīti: %%d)', diff --git a/app/i18n/nl/gen.php b/app/i18n/nl/gen.php index d259edb30..70b9cfd27 100644 --- a/app/i18n/nl/gen.php +++ b/app/i18n/nl/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Lege categorie', 'confirm_action' => 'Weet u zeker dat u dit wilt doen? Het kan niet ongedaan worden gemaakt!', 'confirm_action_feed_cat' => 'Weet u zeker dat u dit wilt doen? U verliest alle gereleteerde favorieten en gebruikers informatie. Het kan niet ongedaan worden gemaakt!', + 'confirm_exit_slider' => 'Weet u zeker dat u de niet opgeslagen instellingen wilt negeren?', 'feedback' => array( 'body_new_articles' => 'Er zijn %%d nieuwe artikelen om te lezen op FreshRSS.', 'body_unread_articles' => '(ongelezen: %%d)', diff --git a/app/i18n/oc/gen.php b/app/i18n/oc/gen.php index 22d9918e7..14146c291 100644 --- a/app/i18n/oc/gen.php +++ b/app/i18n/oc/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Categoria voida', 'confirm_action' => 'Volètz vertadièrament contunhar ? Aquesta accion se pòt pas anullar !', 'confirm_action_feed_cat' => 'Volètz vertadièrament contunhar ? Perdretz los favorits e filtres ligats. Aquesta accion se pòt pas anullar !', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'I a %%d nòus articles per legir sus FreshRSS.', 'body_unread_articles' => '(unread: %%d)', // TODO diff --git a/app/i18n/pl/gen.php b/app/i18n/pl/gen.php index 4630abdf3..249ac54b7 100644 --- a/app/i18n/pl/gen.php +++ b/app/i18n/pl/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Pusta kategoria', 'confirm_action' => 'Czy jesteś pewien, że chcesz przeprowadzić daną operację? Nie można cofnąć jej rezultatów!', 'confirm_action_feed_cat' => 'Czy jesteś pewien, że chcesz przeprowadzić daną operację? Stracisz powiązane zapytania i ulubione wiadomości. Tych zmian nie można wycofać!', + 'confirm_exit_slider' => 'Czy na pewno chcesz odrzucić niezapisane ustawienia?', 'feedback' => array( 'body_new_articles' => 'W FreshRSS znajduje się %%d wiadomości do przeczytania.', 'body_unread_articles' => '(Nieprzeczytane: %%d)', diff --git a/app/i18n/pt-br/gen.php b/app/i18n/pt-br/gen.php index 77e3acb5f..0e7ebf851 100644 --- a/app/i18n/pt-br/gen.php +++ b/app/i18n/pt-br/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Categoria vazia', 'confirm_action' => 'Você tem certeza que deseja efetuar esta ação? Ela não poderá ser cancelada!', 'confirm_action_feed_cat' => 'Você tem certeza que deseja efetuar esta ação ? Você irá perder favoritos e queries de usuários. Não poderá ser cancelado!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'Há %%d novos artigos para ler no FreshRSS.', 'body_unread_articles' => '(não lido: %%d)', diff --git a/app/i18n/pt-pt/gen.php b/app/i18n/pt-pt/gen.php index 893a174aa..7dabdc800 100644 --- a/app/i18n/pt-pt/gen.php +++ b/app/i18n/pt-pt/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Categoria vazia', 'confirm_action' => 'Tem certeza que deseja efetuar esta ação? Ela não poderá ser revertida!', 'confirm_action_feed_cat' => 'Tem certeza que deseja efetuar esta ação ? vai perder favoritos e pesquisas personalizadas. Não poderá ser revertida!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'Há %%d novos artigos para ler no FreshRSS.', 'body_unread_articles' => '(não lido: %%d)', diff --git a/app/i18n/ru/gen.php b/app/i18n/ru/gen.php index 68bfa7cba..3d367e43e 100644 --- a/app/i18n/ru/gen.php +++ b/app/i18n/ru/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Пустая категория', 'confirm_action' => 'Вы уверены, что хотите выполнить это действие? Это нельзя отменить!', 'confirm_action_feed_cat' => 'Вы уверены, что хотите выполнить это действие? Вы потеряете связанные избранные статьи и пользовательские запросы. Это нельзя отменить!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => '%%d новых статей в FreshRSS.', 'body_unread_articles' => '(Непрочитанные: %%d)', diff --git a/app/i18n/sk/gen.php b/app/i18n/sk/gen.php index 54e8c8cb2..611ff5918 100644 --- a/app/i18n/sk/gen.php +++ b/app/i18n/sk/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Prázdna kategória', 'confirm_action' => 'Určite chcete vykonať túto akciu? Zmeny budú nezvratné!', 'confirm_action_feed_cat' => 'Určite chcete vykonať túto akciu? Prídete o súvisiace obľúbené a používateľské dopyty. Zmeny budú nezvratné!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'Počet nových článkov v čítačke FreshRSS: %%d', 'body_unread_articles' => '(neprečítané: %%d)', diff --git a/app/i18n/tr/gen.php b/app/i18n/tr/gen.php index 3525cd6b0..e6d96c532 100644 --- a/app/i18n/tr/gen.php +++ b/app/i18n/tr/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => 'Boş kategori', 'confirm_action' => 'Bu eylemi gerçekleştirmek istediğinizden emin misiniz? Bu işlem geri alınamaz!', 'confirm_action_feed_cat' => 'Bu eylemi gerçekleştirmek istediğinizden emin misiniz? İlgili favoriler ve kullanıcı sorguları kaybolacak. Bu işlem geri alınamaz!', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'FreshRSS’de okunacak %%d yeni makale var.', 'body_unread_articles' => '(okunmamış: %%d)', diff --git a/app/i18n/zh-cn/gen.php b/app/i18n/zh-cn/gen.php index ec910a012..91b38d9e0 100644 --- a/app/i18n/zh-cn/gen.php +++ b/app/i18n/zh-cn/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => '清空分类', 'confirm_action' => '你确定要执行此操作吗？这将不可撤销！', 'confirm_action_feed_cat' => '你确定要执行此操作吗？你将丢失相关的收藏和自定义查询，这将不可撤销！', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'FreshRSS 中有 %%d 篇文章等待阅读。', 'body_unread_articles' => '(未读: %%d)', diff --git a/app/i18n/zh-tw/gen.php b/app/i18n/zh-tw/gen.php index 82e70b730..ed36c6cbc 100644 --- a/app/i18n/zh-tw/gen.php +++ b/app/i18n/zh-tw/gen.php @@ -145,6 +145,7 @@ return array( 'category_empty' => '清空分類', 'confirm_action' => '你確定要執行此操作嗎？這將不可撤銷！', 'confirm_action_feed_cat' => '你確定要執行此操作嗎？你將丟失相關的收藏和自定義查詢。這將不可撤銷！', + 'confirm_exit_slider' => 'Are you sure you want to discard unsaved settings?', // TODO 'feedback' => array( 'body_new_articles' => 'FreshRSS 中有 %%d 篇文章等待閱讀。', 'body_unread_articles' => '(未讀: %%d)', diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml index c36134177..a0aa28256 100644 --- a/app/views/auth/index.phtml +++ b/app/views/auth/index.phtml @@ -5,13 +5,13 @@ ?>

- +
- auth_type, ['form', 'http_auth', 'none'], true)) { ?> @@ -29,7 +29,7 @@
@@ -40,7 +40,7 @@
@@ -51,7 +51,7 @@ @@ -63,7 +63,7 @@ diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml index 10f8774cd..2b4152a7e 100644 --- a/app/views/configure/archiving.phtml +++ b/app/views/configure/archiving.phtml @@ -7,13 +7,13 @@

- +
- archiving['keep_max']) ? '' : ' checked="checked"' ?> - data-leave-validation="archiving['keep_max']) ? 0 : 1 ?>"/> + empty(FreshRSS_Context::userConf()->archiving['keep_max']) ? '' : ' checked="checked"' ?> /> archiving['keep_max']) ? 200 : FreshRSS_Context::userConf()->archiving['keep_max']; ?> - +
@@ -55,12 +54,10 @@
@@ -88,8 +84,7 @@
@@ -99,8 +94,7 @@
@@ -110,8 +104,7 @@
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index 995d54006..27231c2f0 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -6,13 +6,13 @@

- +
- @@ -24,7 +24,7 @@
- timezone, $timezones, true)) { @@ -53,8 +53,7 @@ } else { $checked = ''; } ?> - value="" - data-leave-validation="theme === $theme['id']) ? 1 : 0 ?>" /> + value="" />
  • @@ -89,7 +88,7 @@ - +
  • @@ -108,7 +107,7 @@
    - @@ -120,7 +119,7 @@
    - @@ -141,7 +140,7 @@
    - @@ -162,7 +161,7 @@
    - @@ -201,54 +200,39 @@ topline_read ? ' checked="checked"' : '' ?> - data-leave-validation="topline_read ?>" /> + FreshRSS_Context::userConf()->topline_read ? ' checked="checked"' : '' ?> /> topline_favorite ? ' checked="checked"' : '' ?> - data-leave-validation="topline_favorite ?>" /> + FreshRSS_Context::userConf()->topline_favorite ? ' checked="checked"' : '' ?> /> topline_myLabels ? ' checked="checked"' : '' ?> - data-leave-validation="topline_myLabels ?>" /> + FreshRSS_Context::userConf()->topline_myLabels ? ' checked="checked"' : '' ?> /> topline_sharing ? ' checked="checked"' : '' ?> - data-leave-validation="topline_sharing ?>" /> + FreshRSS_Context::userConf()->topline_sharing ? ' checked="checked"' : '' ?> /> topline_summary ? 'checked="checked"' : '' ?> - data-leave-validation="topline_summary ?>" /> + FreshRSS_Context::userConf()->topline_summary ? 'checked="checked"' : '' ?> /> topline_display_authors ? ' checked="checked"' : '' ?> - data-leave-validation="topline_display_authors ?>" /> + FreshRSS_Context::userConf()->topline_display_authors ? ' checked="checked"' : '' ?> /> topline_date ? ' checked="checked"' : '' ?> - data-leave-validation="topline_date ?>" /> - topline_link ? ' checked="checked"' : '' ?> - data-leave-validation="topline_link ?>" /> + FreshRSS_Context::userConf()->topline_date ? ' checked="checked"' : '' ?> /> + topline_link ? ' checked="checked"' : '' ?> /> bottomline_read ? ' checked="checked"' : '' ?> - data-leave-validation="bottomline_read ?>" /> + FreshRSS_Context::userConf()->bottomline_read ? ' checked="checked"' : '' ?> /> bottomline_favorite ? ' checked="checked"' : '' ?> - data-leave-validation="bottomline_favorite ?>" /> + FreshRSS_Context::userConf()->bottomline_favorite ? ' checked="checked"' : '' ?> /> bottomline_myLabels ? ' checked="checked"' : '' ?> - data-leave-validation="bottomline_myLabels ?>" /> + FreshRSS_Context::userConf()->bottomline_myLabels ? ' checked="checked"' : '' ?> /> bottomline_tags ? ' checked="checked"' : '' ?> - data-leave-validation="bottomline_tags ?>" /> + FreshRSS_Context::userConf()->bottomline_tags ? ' checked="checked"' : '' ?> /> bottomline_sharing ? ' checked="checked"' : '' ?> - data-leave-validation="bottomline_sharing ?>" /> + FreshRSS_Context::userConf()->bottomline_sharing ? ' checked="checked"' : '' ?> /> bottomline_date ? ' checked="checked"' : '' ?> - data-leave-validation="bottomline_date ?>" /> + FreshRSS_Context::userConf()->bottomline_date ? ' checked="checked"' : '' ?> /> bottomline_link ? ' checked="checked"' : '' ?> - data-leave-validation="bottomline_link ?>" /> + FreshRSS_Context::userConf()->bottomline_link ? ' checked="checked"' : '' ?> /> @@ -259,8 +243,7 @@
    + FreshRSS_Context::userConf()->html5_notif_timeout ?>" />
    @@ -268,8 +251,7 @@
    diff --git a/app/views/configure/integration.phtml b/app/views/configure/integration.phtml index 8368f916b..c45533214 100644 --- a/app/views/configure/integration.phtml +++ b/app/views/configure/integration.phtml @@ -77,8 +77,7 @@
    - +
    @@ -90,8 +89,7 @@
    - +

    diff --git a/app/views/configure/privacy.phtml b/app/views/configure/privacy.phtml index 6daf8a62b..b9bae1540 100644 --- a/app/views/configure/privacy.phtml +++ b/app/views/configure/privacy.phtml @@ -6,15 +6,14 @@

    - +
    retrieve_extension_list !== false ? ' checked="checked"' : '' ?> - data-leave-validation="retrieve_extension_list !== false ? 1 : 0 ?>"/> + FreshRSS_Context::userConf()->retrieve_extension_list !== false ? ' checked="checked"' : '' ?> />
    diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml index c31cfda0b..e9a21839c 100644 --- a/app/views/configure/reading.phtml +++ b/app/views/configure/reading.phtml @@ -6,14 +6,14 @@

    - +
    - |null $viewModes */ @@ -34,7 +34,7 @@
    - @@ -47,8 +47,7 @@
    + FreshRSS_Context::userConf()->posts_per_page ?>" min="5" max="500" />

    @@ -57,8 +56,7 @@
    @@ -68,7 +66,7 @@
    - @@ -79,7 +77,7 @@
    - @@ -93,7 +91,7 @@
    -
    @@ -63,40 +60,35 @@
    - +
    - +
    - +
    - +
    - +
    @@ -105,16 +97,14 @@
    - +
    - +
    @@ -126,8 +116,7 @@

    - +
    @@ -136,24 +125,21 @@
    - +
    - +
    - +

    @@ -161,24 +147,21 @@
    - +
    - +
    - +
    @@ -189,32 +172,28 @@
    - +
    - +
    - +
    - +

    @@ -222,16 +201,14 @@
    - +
    - +
    diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index 60c5b5362..6269b5c95 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -6,22 +6,20 @@

    - +
    - +
    - +

    @@ -47,24 +45,21 @@
    - +
    - +
    - +

    @@ -86,8 +81,7 @@
    - + (= )(= )
    @@ -120,7 +114,6 @@ id="force-email-validation" value="1" force_email_validation ? 'checked="checked"' : '' ?> - data-leave-validation="force_email_validation ?>" /> diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml index 5b81b6737..3776ffd79 100644 --- a/app/views/helpers/category/update.phtml +++ b/app/views/helpers/category/update.phtml @@ -15,7 +15,7 @@
    - +
    @@ -82,12 +82,11 @@
    @@ -161,8 +160,7 @@
    @@ -170,23 +168,19 @@ @@ -548,8 +532,7 @@
    - +

    @@ -557,8 +540,7 @@
    - +

    @@ -566,16 +548,14 @@
    - +
    - +
    @@ -589,7 +569,7 @@
    - +

    @@ -599,7 +579,7 @@
    - +

    @@ -607,14 +587,14 @@
    - +
    • - +

    @@ -622,7 +602,7 @@
    - +

    @@ -630,7 +610,7 @@
    - +

    @@ -638,14 +618,14 @@
    - +
    - +

    @@ -653,7 +633,7 @@
    - +

    @@ -661,14 +641,14 @@
    - +
    - +
    @@ -686,8 +666,7 @@
    - +
    @@ -720,8 +699,7 @@
    - +

    diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index 65846b001..831c67f89 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -68,6 +68,7 @@ echo json_encode([ ], 'i18n' => [ 'confirmation_default' => _t('gen.js.confirm_action'), + 'confirm_exit_slider' => _t('gen.js.confirm_exit_slider'), 'notif_title_articles' => _t('gen.js.feedback.title_new_articles'), 'notif_body_new_articles' => _t('gen.js.feedback.body_new_articles'), 'notif_body_unread_articles' => _t('gen.js.feedback.body_unread_articles'), diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml index 7a8e56b4a..60acee31b 100644 --- a/app/views/importExport/index.phtml +++ b/app/views/importExport/index.phtml @@ -16,7 +16,7 @@

    - +