diff --git a/website/assets/scss/_variables_project.scss b/website/assets/scss/_variables_project.scss index d24d01db68..4daef71e75 100644 --- a/website/assets/scss/_variables_project.scss +++ b/website/assets/scss/_variables_project.scss @@ -122,6 +122,14 @@ table { background-image: url("../images/ABP_32.png") } +.Dmq-icon { + background-image: url("../images/Dnsmasq.svg") +} + +.FG-icon { + background-image: url("../images/FTNT.svg"); +} + .uBO-icon { background-image: url("../images/uBO_32.png") } @@ -154,7 +162,6 @@ table { background-image: url("../images/pfBlockerNG.jpg") } - .AGHome-icon { background-image: url("../images/AGHome.svg") } @@ -191,6 +198,7 @@ table { content: "\00a0"; } .icon-dropdown { + background-position: center center; background-size: contain; background-repeat: no-repeat; position: relative; diff --git a/website/content/pl/table_notes.md b/website/content/pl/table_notes.md index da99bca9f5..85641d3ae9 100644 --- a/website/content/pl/table_notes.md +++ b/website/content/pl/table_notes.md @@ -1,4 +1,4 @@ -`*` Jeżeli masz rozszerzenie **I don't care about cookies**, to nie musisz subskrybować listy o tej samej nazwie, ponieważ filtry **I don't care about cookies** znajdują się juz w tym dodatku. +`*` W przypadku uBO jest dostępny zestaw 2 list pod nazwą EasyList/uBO – Cookie Notices, który zalecamy zaznaczyć. `**` Jeżeli korzystasz z **Polskich Filtrów Elementów Irytujących**, to nie dodawaj listy **RODO-Ciasteczkowej**, ponieważ **Filtry RODO-Ciasteczkowe** znajdują się już w **Filtrach Elementów Irytujących**. diff --git a/website/data/FilterLists.toml b/website/data/FilterLists.toml index 4293602cc1..2b6dec78dd 100644 --- a/website/data/FilterLists.toml +++ b/website/data/FilterLists.toml @@ -37,8 +37,8 @@ subscribe = "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/ issues = "https://github.com/MajkiIT/polish-ads-filter/issues" mail = "errorsfilters@certyficate.it" home = "https://www.certyficate.it/" -requiredLocation = "https://easylist.to/easylist/easylist.txt, https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt, https://www.i-dont-care-about-cookies.eu/abp/, https://github.com/FiltersHeroes/PolishCookieConsent#how-to-install-it" -requiredTitle = "EasyList, Polskie Filtry, I don't care about cookies *, Polska Ciasteczkowa Zgoda ***" +requiredLocation = "https://easylist.to/easylist/easylist.txt, https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt, https://secure.fanboy.co.nz/fanboy-cookiemonster.txt, https://github.com/FiltersHeroes/PolishCookieConsent#how-to-install-it" +requiredTitle = "EasyList, Polskie Filtry, EasyList Cookie List *, Polska Ciasteczkowa Zgoda ***" requiredType = "abp, abp, abp, normal" adblocker = "ABP" category = "ciasteczka" @@ -51,8 +51,8 @@ desc = "Wyskakujące okienka, widgety, newslettery, powiadomienia push, strzałk subscribe = "https://raw.githubusercontent.com/FiltersHeroes/PolishAnnoyanceFilters/master/PPB.txt" issues = "https://github.com/FiltersHeroes/PolishAnnoyanceFilters/issues" home = "https://polishannoyancefilters.netlify.app/" -requiredLocation = "https://easylist.to/easylist/easylist.txt, https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt, https://www.i-dont-care-about-cookies.eu/abp/, https://github.com/FiltersHeroes/PolishCookieConsent#how-to-install-it" -requiredTitle = "EasyList, Polskie Filtry, I don't care about cookies *, Polska Ciasteczkowa Zgoda ***" +requiredLocation = "https://easylist.to/easylist/easylist.txt, https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt, https://secure.fanboy.co.nz/fanboy-cookiemonster.txt, https://github.com/FiltersHeroes/PolishCookieConsent#how-to-install-it" +requiredTitle = "EasyList, Polskie Filtry, EasyList Cookie List *, Polska Ciasteczkowa Zgoda ***" requiredType = "abp, abp, abp, normal" adblocker = "ABP" category = "irytujące, ciasteczka" @@ -216,6 +216,17 @@ home = "https://github.com/hoshsadiq/adblock-nocoin-list" adblocker = "ABP" category = "bezpieczeństwo" +[[items]] +title = "EasyList Cookie List" +desc = "Komunikaty dot. ciasteczek i polityki prywatności/RODO." +subscribe = "https://secure.fanboy.co.nz/fanboy-cookiemonster.txt" +mail = "easylist@protonmail.com" +home = "https://easylist.to/" +category = "ciasteczka" +adblocker = "ABP" +uBO_supp = "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt" +issues = "https://forums.lanik.us/" + [[items]] title = "I don't care about cookies" desc = "Komunikaty dot. ciasteczek i polityki prywatności/RODO." @@ -282,6 +293,34 @@ requiredLocation = "https://github.com/FiltersHeroes/ScriptsPlayground/blob/mast mirror = "GitLab" mirrorURL = "https://filtersheroes.gitlab.io/AssetsMirror/KADhole.txt" +[[items]] +title = "KADomains" +desc = "Przekręty SMS i oszustwa (domeny i adresy IP)." +subscribe = "https://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADomains.txt" +issues = "https://github.com/FiltersHeroes/KADhosts/issues" +form = "https://kadantiscam.netlify.app/#contact" +mail = "polishjarvis@gmail.com" +home = "https://kadantiscam.netlify.app/" +adblocker = "FG" +category = "bezpieczeństwo" +lang = "pl" +mirror = "GitLab" +mirrorURL = "https://filtersheroes.gitlab.io/AssetsMirror//KADomains.txt" + +[[items]] +title = "KAD - Dnsmasq Edition (Beta)" +desc = "Przekręty SMS i oszustwa." +subscribe = "https://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADdnsmasq.txt" +issues = "https://github.com/FiltersHeroes/KADhosts/issues" +form = "https://kadantiscam.netlify.app/#contact" +mail = "polishjarvis@gmail.com" +home = "https://kadantiscam.netlify.app/" +adblocker = "Dmq" +category = "bezpieczeństwo" +lang = "pl" +mirror = "GitLab" +mirrorURL = "https://filtersheroes.gitlab.io/AssetsMirror/KADdnsmasq.txt" + [[items]] title = "Polskie Filtry do Pi-hole" desc = "Reklamy zewnętrzne, linki afiliacyjne, skrypty śledzące i kolektory informacji." diff --git a/website/layouts/partials/FilterListsTable.html b/website/layouts/partials/FilterListsTable.html index 73be7ae68b..9699a8b739 100644 --- a/website/layouts/partials/FilterListsTable.html +++ b/website/layouts/partials/FilterListsTable.html @@ -22,6 +22,8 @@ + + @@ -60,7 +62,7 @@
- {{ if not (findRE .adblocker "hosts|Ph" ) }} + {{ if not (findRE .adblocker "hosts|Ph|Dmq|FG" ) }} {{ i18n "subscribe" }} @@ -121,7 +123,7 @@ {{ if and (not (in $filterlist.subscribe "raw.githubusercontent.com")) (not $filterlist.mirror) }} - {{ end }}
{{/* Subskrybuj */}} - {{ if not (findRE .adblocker "hosts|Ph" ) }} + {{ if not (findRE .adblocker "hosts|Ph|Dmq|FG" ) }} {{ if or (in .subscribe "raw.githubusercontent.com") (.mirror) }}
@@ -296,6 +298,14 @@ {{end}} + {{ if findRE "Dmq" .adblocker }} + + {{end}} + + {{ if findRE "FG" .adblocker }} + + {{end}} + {{ if .requiredTitle }}
diff --git a/website/static/images/Dnsmasq.svg b/website/static/images/Dnsmasq.svg new file mode 100644 index 0000000000..5b2529a492 --- /dev/null +++ b/website/static/images/Dnsmasq.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/website/static/images/FTNT.svg b/website/static/images/FTNT.svg new file mode 100644 index 0000000000..6224b4c6bb --- /dev/null +++ b/website/static/images/FTNT.svg @@ -0,0 +1,7 @@ + + fortinet-logo-svg + + + \ No newline at end of file