From 679e592a5ce28ca4c7d9cdb7fdbe51227483488c Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 28 Mar 2023 17:50:37 +0800 Subject: [PATCH 1/7] Add checker for html --- src/webui/www/.htmlvalidate.json | 17 +++++++++++++++++ src/webui/www/package.json | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/webui/www/.htmlvalidate.json diff --git a/src/webui/www/.htmlvalidate.json b/src/webui/www/.htmlvalidate.json new file mode 100644 index 000000000..d07cc98d3 --- /dev/null +++ b/src/webui/www/.htmlvalidate.json @@ -0,0 +1,17 @@ +{ + "extends": [ + "html-validate:recommended" + ], + "rules": { + "empty-heading": "off", + "long-title": "off", + "no-conditional-comment": "off", + "no-inline-style": "off", + "prefer-button": "off", + "prefer-tbody": "off", + "text-content": "off", + "void-style": "off", + "wcag/h63": "off", + "wcag/h71": "off" + } +} diff --git a/src/webui/www/package.json b/src/webui/www/package.json index 3370ee55e..6be44e273 100644 --- a/src/webui/www/package.json +++ b/src/webui/www/package.json @@ -7,11 +7,12 @@ }, "scripts": { "format": "js-beautify private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && prettier --write **.css", - "lint": "eslint private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && stylelint **/*.css" + "lint": "eslint private/*.html private/scripts/*.js private/views/*.html public/*.html public/scripts/*.js && stylelint **/*.css && html-validate private public" }, "devDependencies": { "eslint": "*", "eslint-plugin-html": "*", + "html-validate": "*", "js-beautify": "*", "prettier": "*", "stylelint": "*", From a36358d7d0c00247623e78c4f164ec97621c1939 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 28 Mar 2023 17:59:54 +0800 Subject: [PATCH 2/7] Remove deprecated rules --- src/webui/www/.stylelintrc.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/webui/www/.stylelintrc.json b/src/webui/www/.stylelintrc.json index f677e2fbf..55324a0dd 100644 --- a/src/webui/www/.stylelintrc.json +++ b/src/webui/www/.stylelintrc.json @@ -8,9 +8,7 @@ "color-hex-length": null, "comment-empty-line-before": null, "comment-whitespace-inside": null, - "declaration-colon-newline-after": null, "function-name-case": null, - "indentation": 4, "length-zero-no-unit": null, "no-descending-specificity": null, "order/properties-alphabetical-order": true, From eb875ac8c162530ac47c831c61833c2ccab80d30 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 28 Mar 2023 18:16:32 +0800 Subject: [PATCH 3/7] Add attributes explicitly --- src/webui/www/private/addpeers.html | 4 ++-- src/webui/www/private/download.html | 2 +- src/webui/www/private/downloadlimit.html | 2 +- src/webui/www/private/edittracker.html | 2 +- src/webui/www/private/upload.html | 2 +- src/webui/www/private/uploadlimit.html | 2 +- src/webui/www/private/views/installsearchplugin.html | 4 ++-- src/webui/www/private/views/log.html | 2 +- src/webui/www/private/views/preferences.html | 4 ++-- src/webui/www/private/views/rss.html | 8 ++++---- src/webui/www/private/views/rssDownloader.html | 6 +++--- src/webui/www/private/views/search.html | 4 ++-- src/webui/www/private/views/searchplugins.html | 6 +++--- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/webui/www/private/addpeers.html b/src/webui/www/private/addpeers.html index b665e5e75..4a23ace3d 100644 --- a/src/webui/www/private/addpeers.html +++ b/src/webui/www/private/addpeers.html @@ -62,8 +62,8 @@

QBT_TR(List of peers to add (one IP per line):)QBT_TR[CONTEXT=PeersAdditionDialog]

- - + +
diff --git a/src/webui/www/private/download.html b/src/webui/www/private/download.html index aac526fcb..913a10001 100644 --- a/src/webui/www/private/download.html +++ b/src/webui/www/private/download.html @@ -13,7 +13,7 @@ - +

diff --git a/src/webui/www/private/downloadlimit.html b/src/webui/www/private/downloadlimit.html index 4371c9fb1..fa49266dd 100644 --- a/src/webui/www/private/downloadlimit.html +++ b/src/webui/www/private/downloadlimit.html @@ -14,7 +14,7 @@
-
QBT_TR(Download limit:)QBT_TR[CONTEXT=PropertiesWidget] QBT_TR(KiB/s)QBT_TR[CONTEXT=SpeedLimitDialog]
+
QBT_TR(Download limit:)QBT_TR[CONTEXT=PropertiesWidget] QBT_TR(KiB/s)QBT_TR[CONTEXT=SpeedLimitDialog]
diff --git a/src/webui/www/private/edittracker.html b/src/webui/www/private/edittracker.html index 6d23c1956..17d2a92d2 100644 --- a/src/webui/www/private/edittracker.html +++ b/src/webui/www/private/edittracker.html @@ -61,7 +61,7 @@

QBT_TR(Tracker URL:)QBT_TR[CONTEXT=TrackerListWidget]

- +

diff --git a/src/webui/www/private/upload.html b/src/webui/www/private/upload.html index 7ae768adc..c3b8e66b5 100644 --- a/src/webui/www/private/upload.html +++ b/src/webui/www/private/upload.html @@ -11,7 +11,7 @@ - +
diff --git a/src/webui/www/private/uploadlimit.html b/src/webui/www/private/uploadlimit.html index 044a8cf05..e6cb93ef6 100644 --- a/src/webui/www/private/uploadlimit.html +++ b/src/webui/www/private/uploadlimit.html @@ -14,7 +14,7 @@
-
QBT_TR(Upload limit:)QBT_TR[CONTEXT=PropertiesWidget] QBT_TR(KiB/s)QBT_TR[CONTEXT=SpeedLimitDialog]
+
QBT_TR(Upload limit:)QBT_TR[CONTEXT=PropertiesWidget] QBT_TR(KiB/s)QBT_TR[CONTEXT=SpeedLimitDialog]
diff --git a/src/webui/www/private/views/installsearchplugin.html b/src/webui/www/private/views/installsearchplugin.html index e9526dcd4..5e8d1a0d6 100644 --- a/src/webui/www/private/views/installsearchplugin.html +++ b/src/webui/www/private/views/installsearchplugin.html @@ -20,8 +20,8 @@
- - + +
diff --git a/src/webui/www/private/views/log.html b/src/webui/www/private/views/log.html index 17679e434..e63e68339 100644 --- a/src/webui/www/private/views/log.html +++ b/src/webui/www/private/views/log.html @@ -94,7 +94,7 @@ - +
diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index e2445cbf3..d7795d1d3 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -303,7 +303,7 @@
- +
@@ -707,7 +707,7 @@
- +
diff --git a/src/webui/www/private/views/rss.html b/src/webui/www/private/views/rss.html index 56c915280..4599440b0 100644 --- a/src/webui/www/private/views/rss.html +++ b/src/webui/www/private/views/rss.html @@ -89,11 +89,11 @@ QBT_TR(Fetching of RSS feeds is disabled now! You can enable it in application settings.)QBT_TR[CONTEXT=RSSWidget]
- - - + + + - +
diff --git a/src/webui/www/private/views/rssDownloader.html b/src/webui/www/private/views/rssDownloader.html index fb396e54e..bd036e437 100644 --- a/src/webui/www/private/views/rssDownloader.html +++ b/src/webui/www/private/views/rssDownloader.html @@ -136,8 +136,8 @@
QBT_TR(Download Rules)QBT_TR[CONTEXT=AutomatedRssDownloader] - - + +
@@ -285,7 +285,7 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
-
diff --git a/src/webui/www/private/views/search.html b/src/webui/www/private/views/search.html index b37ca8541..fbae44ae8 100644 --- a/src/webui/www/private/views/search.html +++ b/src/webui/www/private/views/search.html @@ -83,7 +83,7 @@ - +
@@ -167,7 +167,7 @@
- +
diff --git a/src/webui/www/private/views/searchplugins.html b/src/webui/www/private/views/searchplugins.html index 0978887cd..6a097cbd3 100644 --- a/src/webui/www/private/views/searchplugins.html +++ b/src/webui/www/private/views/searchplugins.html @@ -65,9 +65,9 @@ QBT_TR(Warning: Be sure to comply with your country's copyright laws when downloading torrents from any of these search engines.)QBT_TR[CONTEXT=PluginSelectDlg] QBT_TR(You can get new search engine plugins here:)QBT_TR[CONTEXT=PluginSelectDlg] http://plugins.qbittorrent.org
- - - + + +
From b5c57af869cca1566e65f79977637731b11bfd52 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 28 Mar 2023 18:59:03 +0800 Subject: [PATCH 4/7] Escape special characters properly --- src/webui/www/private/views/about.html | 2 +- src/webui/www/private/views/preferences.html | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/webui/www/private/views/about.html b/src/webui/www/private/views/about.html index d60e71415..873985cd2 100644 --- a/src/webui/www/private/views/about.html +++ b/src/webui/www/private/views/about.html @@ -75,7 +75,7 @@
  • Armenian: Hrant Ohanyan (hrantohanyan@mail.am)
  • Basque: Xabier Aramendi (azpidatziak@gmail.com)
  • Belarusian: Mihas Varantsou (meequz@gmail.com)
    • -
  • Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
    • +
  • Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)
  • Catalan: Francisco Luque Contreras (frannoe@ya.com)
  • Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com)
  • Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com) and 冥王歐西里斯 s8321414(Transifex)
    • diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index d7795d1d3..665fc3ebd 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -940,7 +940,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD - +   QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog] @@ -1043,7 +1043,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD - + @@ -1067,7 +1067,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD - +   QBT_TR(MiB)QBT_TR[CONTEXT=OptionsDialog] @@ -1075,7 +1075,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD - +   QBT_TR(s)QBT_TR[CONTEXT=OptionsDialog] @@ -1091,7 +1091,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD - + - + - + From 1e1c1725abb5bc0d3c6779d06410d0375aea4460 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 28 Mar 2023 19:01:16 +0800 Subject: [PATCH 5/7] Always use quotes for attributes This is to unify coding style. --- src/webui/www/private/views/preferences.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index 665fc3ebd..b9e789224 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -20,13 +20,13 @@ - QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog] + QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog] - + QBT_TR(Use global share limit)QBT_TR[CONTEXT=UpDownRatioDialog]
    - QBT_TR(Set no share limit)QBT_TR[CONTEXT=UpDownRatioDialog]
    - QBT_TR(Set share limit to)QBT_TR[CONTEXT=UpDownRatioDialog]
    + QBT_TR(Use global share limit)QBT_TR[CONTEXT=UpDownRatioDialog]
    + QBT_TR(Set no share limit)QBT_TR[CONTEXT=UpDownRatioDialog]
    + QBT_TR(Set share limit to)QBT_TR[CONTEXT=UpDownRatioDialog]
    diff --git a/src/webui/www/private/views/about.html b/src/webui/www/private/views/about.html index 873985cd2..9f8a728ed 100644 --- a/src/webui/www/private/views/about.html +++ b/src/webui/www/private/views/about.html @@ -38,7 +38,7 @@ sledgehammer999@qbittorrent.org -
    +

    QBT_TR(Original author)QBT_TR[CONTEXT=HttpServer]