up adguardhome背景色问题

2025-01-08 11:57:57 +08:00 · 2023-03-11 14:13:16 +08:00 · 2023-03-11 14:13:16 +08:00 · 9ac9aa895a
commit 9ac9aa895a
parent e6cc1c4d85
2 changed files with 117 additions and 153 deletions
--- a/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua
+++ b/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua
@ -24,7 +24,7 @@ o.placeholder=3000
 o.default=3000
 o.datatype="port"
 o.optional = false
-o.description = translate("<input type='button' style='width:210px; border-color:Teal; text-align:center; font-weight:bold;color:Green;padding: .75rem 1rem;background:#f36c21;' value='AdGuardHome Web:" .. httpport .. "' onclick=\"window.open('http://'+window.location.hostname+':" .. httpport .. "')\"/>")
+o.description = translate("<input type='button' class='cbi-button cbi-button-apply' style=' text-align:center; font-weight:bold;' value='AdGuardHome Web:" .. httpport .. "' onclick=\"window.open('http://'+window.location.hostname+':" .. httpport .. "')\"/>")
 ---- update warning not safe
 local binmtime=uci:get("AdGuardHome","AdGuardHome","binmtime") or "0"
 local e=""
--- a/luci-app-adguardhome/root/etc/AdGuardHome.yaml
+++ b/luci-app-adguardhome/root/etc/AdGuardHome.yaml
@ -2,8 +2,8 @@ bind_host: 0.0.0.0
 bind_port: 3000
 beta_bind_port: 0
 users:
- name: admin
-  password: $2y$10$vHRcARdPCieYG3RXWomV5evDYN.Nj/edtwEkQgQJZcK6z7qTLaIc6
+  - name: admin
+    password: $2y$10$vHRcARdPCieYG3RXWomV5evDYN.Nj/edtwEkQgQJZcK6z7qTLaIc6
 auth_attempts: 5
 block_auth_min: 15
 http_proxy: ""
@ -32,23 +32,23 @@ dns:
  ratelimit_whitelist: []
  refuse_any: false
  upstream_dns:
-  - 223.5.5.5
+    - 223.5.5.5
  upstream_dns_file: ""
  bootstrap_dns:
-  - 119.29.29.29
-  - 223.5.5.5
+    - 119.29.29.29
+    - 223.5.5.5
  all_servers: false
  fastest_addr: false
  fastest_timeout: 1s
  allowed_clients: []
  disallowed_clients: []
  blocked_hosts:
-  - version.bind
-  - id.server
-  - hostname.bind
+    - version.bind
+    - id.server
+    - hostname.bind
  trusted_proxies:
-  - 127.0.0.0/8
-  - ::1/128
+    - 127.0.0.0/8
+    - ::1/128
  cache_size: 4194304
  cache_ttl_min: 0
  cache_ttl_max: 0
@ -91,150 +91,114 @@ tls:
  certificate_path: ""
  private_key_path: ""
 filters:
- enabled: true
-  url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
-  name: AdGuard DNS filter
-  id: 1228750870
- enabled: true
-  url: http://sub.adtchrome.com/adt-chinalist-easylist.txt
-  name: 广告终结者使用的拦截规则，基于ChinaList+EasyList修正维护
-  id: 139789181
- enabled: true
-  url: https://easylist-downloads.adblockplus.org/easylist.txt
-  name: EasyList-去除国际网页中大多数广告，包括不需要的框架、图像和对象
-  id: 139789112
- enabled: false
-  url: https://easylist-downloads.adblockplus.org/easylistchina.txt
-  name: EasyList China-EasyList针对国内的补充规则
-  id: 139789121
- enabled: true
-  url: https://cdn.jsdelivr.net/gh/privacy-protection-tools/anti-AD@master/anti-ad-easylist.txt
-  name: anti-AD命中率最高列表
-  id: 139789122
- enabled: true
-  url: https://gitee.com/halflife/list/raw/master/ad.txt
-  name: halflife合并乘风
-  id: 139789131
- enabled: false
-  url: https://banbendalao.coding.net/p/adgk/d/ADgk/git/raw/master/ADgk.txt
-  name: adgk手机去广告规则
-  id: 139789132
- enabled: false
-  url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/rule.txt
-  name: 乘风 广告过滤规则
-  id: 139789133
- enabled: false
-  url: https://raw.githubusercontent.com/BlueSkyXN/AdGuardHomeRules/master/all.txt
-  name: 百万ADH广告拦截过滤规则
-  id: 139789141
- enabled: false
-  url: https://raw.githubusercontent.com/jerryn70/GoodbyeAds/master/Hosts/GoodbyeAds-Ultra.txt
-  name: GoodbyeAds 大全去广告
-  id: 139789142
- enabled: false
-  url: https://gitee.com/xinggsf/Adblock-Rule/raw/master/mv.txt
-  name: 乘风 视频广告过滤规则
-  id: 139789143
- enabled: false
-  url: https://raw.githubusercontent.com/Goooler/1024_hosts/master/hosts
-  name: 1024host
-  id: 139789151
- enabled: false
-  url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext
-  name: Peter Lowe’s Ad and tracking server list
-  id: 139789152
- enabled: false
-  url: https://easylist.to/easylist/fanboy-social.txt
-  name: Fanboy's Social Blocking List
-  id: 139789153
- enabled: false
-  url: https://easylist.to/easylist/fanboy-annoyance.txt
-  name: Fanboy's Annoyance List
-  id: 139789154
- enabled: false
-  url: https://secure.fanboy.co.nz/fanboy-cookiemonster.txt
-  name: EasyList Cookie List
-  id: 139789155
- enabled: false
-  url: https://fanboy.co.nz/fanboy-antifacebook.txt
-  name: Anti-Facebook List
-  id: 139789161
- enabled: false
-  url: https://filters.adtidy.org/extension/ublock/filters/14.txt
-  name: AdGuard Annoyances filter
-  id: 139789162
- enabled: false
-  url: https://www.malwaredomainlist.com/hostslist/hosts.txt
-  name: MalwareDomainList.com Hosts List
-  id: 139789163
- enabled: false
-  url: https://www.fanboy.co.nz/enhancedstats.txt
-  name: Fanboy's Enhanced Tracking List
-  id: 139789164
- enabled: false
-  url: https://filters.adtidy.org/extension/ublock/filters/3.txt
-  name: AdGuard Tracking Protection filter
-  id: 139789165
- enabled: false
-  url: https://easylist.to/easylist/easylist.txt
-  name: EasyList
-  id: 139789171
- enabled: false
-  url: https://filters.adtidy.org/extension/ublock/filters/11.txt
-  name: AdGuard Mobile Ads filter
-  id: 139789172
- enabled: false
-  url: https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt
-  name: AdGuard Base filter
-  id: 139789173
- enabled: false
-  url: https://easylist-downloads.adblockplus.org/antiadblockfilters.txt
-  name: Adblock Warning Removal List
-  id: 139789174
- enabled: false
-  url: https://fanboy.co.nz/fanboy-problematic-sites.txt
-  name: Fanboy's problematic-sites
-  id: 139789175
- enabled: false
-  url: https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt
-  name: Adbyby Lazy Rule
-  id: 139789182
- enabled: false
-  url: https://raw.githubusercontent.com/VeleSila/yhosts/master/hosts.txt
-  name: hosts
-  id: 139789183
- enabled: false
-  url: https://gitlab.com/xuhaiyang1234/AAK-Cont/raw/master/FINAL_BUILD/aak-cont-list-notubo.txt
-  name: aak-cont-list-notubo
-  id: 139789184
- enabled: false
-  url: https://adaway.org/hosts.txt
-  name: Adaway HOST
-  id: 139789187
+  - enabled: true
+    url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
+    name: AdGuard DNS filter
+    id: 1228750870
+  - enabled: true
+    url: http://sub.adtchrome.com/adt-chinalist-easylist.txt
+    name: 广告终结者使用的拦截规则，基于ChinaList+EasyList修正维护
+    id: 139789181
+  - enabled: true
+    url: https://easylist-downloads.adblockplus.org/easylist.txt
+    name: EasyList-去除国际网页中大多数广告，包括不需要的框架、图像和对象
+    id: 139789112
+  - enabled: true
+    url: https://easylist-downloads.adblockplus.org/easylistchina.txt
+    name: EasyList China-EasyList针对国内的补充规则
+    id: 139789121
+  - enabled: true
+    url: https://anti-ad.net/adguard.txt
+    name: anti-AD命中率最高列表
+    id: 139789122
+  - enabled: true
+    url: https://raw.iqiq.io/banbendalao/ADgk/master/ADgk.txt
+    name: ADgk去广告easylistchina补充规则
+    id: 139789131
+  - enabled: true
+    url: https://raw.iqiq.io/banbendalao/ADgk/master/kill-baidu-ad.txt
+    name: ADgk百度广告过滤
+    id: 139789133
+  - enabled: false
+    url: https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext
+    name: Peter Lowe’s Ad and tracking server list
+    id: 139789152
+  - enabled: false
+    url: https://easylist.to/easylist/fanboy-social.txt
+    name: Fanboy's Social Blocking List
+    id: 139789153
+  - enabled: false
+    url: https://easylist.to/easylist/fanboy-annoyance.txt
+    name: Fanboy's Annoyance List
+    id: 139789154
+  - enabled: false
+    url: https://secure.fanboy.co.nz/fanboy-cookiemonster.txt
+    name: EasyList Cookie List
+    id: 139789155
+  - enabled: false
+    url: https://fanboy.co.nz/fanboy-antifacebook.txt
+    name: Anti-Facebook List
+    id: 139789161
+  - enabled: false
+    url: https://filters.adtidy.org/extension/ublock/filters/14.txt
+    name: AdGuard Annoyances filter
+    id: 139789162
+  - enabled: false
+    url: https://www.fanboy.co.nz/enhancedstats.txt
+    name: Fanboy's Enhanced Tracking List
+    id: 139789164
+  - enabled: false
+    url: https://filters.adtidy.org/extension/ublock/filters/3.txt
+    name: AdGuard Tracking Protection filter
+    id: 139789165
+  - enabled: false
+    url: https://easylist.to/easylist/easylist.txt
+    name: EasyList
+    id: 139789171
+  - enabled: false
+    url: https://filters.adtidy.org/extension/ublock/filters/11.txt
+    name: AdGuard Mobile Ads filter
+    id: 139789172
+  - enabled: false
+    url: https://filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt
+    name: AdGuard Base filter
+    id: 139789173
+  - enabled: false
+    url: https://easylist-downloads.adblockplus.org/antiadblockfilters.txt
+    name: Adblock Warning Removal List
+    id: 139789174
+  - enabled: false
+    url: https://fanboy.co.nz/fanboy-problematic-sites.txt
+    name: Fanboy's problematic-sites
+    id: 139789175
+  - enabled: false
+    url: https://adaway.org/hosts.txt
+    name: Adaway HOST
+    id: 139789187
 whitelist_filters: []
 user_rules:
- '@@||taobao.com^$important'
- '@@||tmall.com^$important'
- '@@||jd.com^important'
- '@@||flyme.cn^$important'
- '@@||meizu.com^$important'
- '@@||wl.jd.com^$important'
- '@@||flydigi.com^'
- '@@||pv.sohu.com^$important'
- /googleads.$~script,domain=~googleads.github.io
- /pagead/lvz?
- '||google.com/pagead/'
- '||static.doubleclick.net^$domain=youtube.com'
- '||youtube.com/get_midroll_'
- '||5hz.org^'
- '@@||000714.xyz^'
- '@@||blueskyxn.com^'
- '||topnewsfeeds.net^'
- '||nbryb.com^'
- '||superbdolly.com^'
- '||salutationcheerlessdemote.com^'
- '||buildingdoodlesquare.com^'
- '||colonistnobilityheroic.com^'
+  - '@@||taobao.com^$important'
+  - '@@||tmall.com^$important'
+  - '@@||jd.com^important'
+  - '@@||flyme.cn^$important'
+  - '@@||meizu.com^$important'
+  - '@@||wl.jd.com^$important'
+  - '@@||flydigi.com^'
+  - '@@||pv.sohu.com^$important'
+  - /googleads.$~script,domain=~googleads.github.io
+  - /pagead/lvz?
+  - '||google.com/pagead/'
+  - '||static.doubleclick.net^$domain=youtube.com'
+  - '||youtube.com/get_midroll_'
+  - '||5hz.org^'
+  - '@@||000714.xyz^'
+  - '@@||blueskyxn.com^'
+  - '||topnewsfeeds.net^'
+  - '||nbryb.com^'
+  - '||superbdolly.com^'
+  - '||salutationcheerlessdemote.com^'
+  - '||buildingdoodlesquare.com^'
+  - '||colonistnobilityheroic.com^'
 dhcp:
  enabled: false
  interface_name: ""