diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua index 95f89c8992..746e76349d 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua @@ -78,6 +78,7 @@ o.rmempty = false o = s:option(Value, "adblock_url", translate("adblock_url")) o.default = "https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf" +o.description = translate("Support AdGuardHome and DNSMASQ format list") -- [[ chnroute ]] s = m:section(TypedSection, "global", translate("Chnroute Setting")) diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status.htm index 9dd45779f8..0b2110b178 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status.htm +++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status.htm @@ -16,7 +16,7 @@ math.randomseed(os.time())
-

<%:Client%>
<%:Not Running%>

+

<%:Client%>
<%:Not Running%>✘

@@ -29,7 +29,7 @@ math.randomseed(os.time())
-

<%:foreign websites%>
<%:Problem detected%>

+

<%:foreign websites%>
<%:Problem detected%>✘

@@ -42,7 +42,7 @@ math.randomseed(os.time())
-

<%:domestic website%>
<%:Problem detected%>

+

<%:domestic website%>
<%:Problem detected%>✘

@@ -56,7 +56,7 @@ math.randomseed(os.time())
-

<%:Game Mode%>
<%:Not Running%>

+

<%:Game Mode%>
<%:Not Running%>✘

@@ -68,7 +68,7 @@ math.randomseed(os.time())
-

π‚π‘π’π§πšπƒππ’
<%:Not Running%>

+

π‚π‘π’π§πšπƒππ’
<%:Not Running%>✘

@@ -80,7 +80,7 @@ math.randomseed(os.time())
-

π™Žπ™Šπ˜Ύπ™†π™Ž5
<%:Not Running%>

+

π™Žπ™Šπ˜Ύπ™†π™Ž5
<%:Not Running%>✘

@@ -112,34 +112,34 @@ math.randomseed(os.time()) var tb5 = document.getElementById('socks5_status'); if (data && tb) { if (data.global) { - tb.innerHTML = '<%:Client%>
<%:Running%>'; + tb.innerHTML = '<%:Client%>
<%:Running%>βœ”'; } else { - tb.innerHTML = '<%:Client%>
<%:Not Running%>'; + tb.innerHTML = '<%:Client%>
<%:Not Running%>✘'; } if (data.google) { - tb1.innerHTML = '<%:foreign websites%>
<%:Connect OK%>'; + tb1.innerHTML = '<%:foreign websites%>
<%:Connect OK%>βœ”'; } else { - tb1.innerHTML = '<%:foreign websites%>
<%:Problem detected%>'; + tb1.innerHTML = '<%:foreign websites%>
<%:Problem detected%>✘'; } if (data.baidu) { - tb2.innerHTML = '<%:domestic website%>
<%:Connect OK%>'; + tb2.innerHTML = '<%:domestic website%>
<%:Connect OK%>βœ”'; } else { - tb2.innerHTML = '<%:domestic website%>
<%:Problem detected%>'; + tb2.innerHTML = '<%:domestic website%>
<%:Problem detected%>✘'; } if (data.game) { - tb3.innerHTML = '<%:Game Mode%>
<%:Running%>'; + tb3.innerHTML = '<%:Game Mode%>
<%:Running%>βœ”'; } else { - tb3.innerHTML = '<%:Game Mode%>
<%:Not Running%>'; + tb3.innerHTML = '<%:Game Mode%>
<%:Not Running%>✘'; } if (data.chinadns) { - tb4.innerHTML = 'π‚π‘π’π§πšπƒππ’
<%:Running%>'; + tb4.innerHTML = 'π‚π‘π’π§πšπƒππ’
<%:Running%>βœ”'; } else { - tb4.innerHTML = 'π‚π‘π’π§πšπƒππ’
<%:Not Running%>'; + tb4.innerHTML = 'π‚π‘π’π§πšπƒππ’
<%:Not Running%>✘'; } if (data.socks5) { - tb5.innerHTML = 'π™Žπ™Šπ˜Ύπ™†π™Ž5
<%:Running%>'; + tb5.innerHTML = 'π™Žπ™Šπ˜Ύπ™†π™Ž5
<%:Running%>βœ”'; } else { - tb5.innerHTML = 'π™Žπ™Šπ˜Ύπ™†π™Ž5
<%:Not Running%>'; + tb5.innerHTML = 'π™Žπ™Šπ˜Ύπ™†π™Ž5
<%:Not Running%>✘'; } } } diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm index c745689588..7afff98602 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm +++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm @@ -3,89 +3,21 @@ <%:Running Status%> - - - - + +
-

<%:Client%>
<%:Not Running%>

+

<%:Client%>
<%:Not Running%>✘

@@ -98,7 +30,7 @@
-

<%:domestic website%>
<%:Problem detected%>

+

<%:domestic website%>
<%:Problem detected%>✘

@@ -110,7 +42,7 @@
-

<%:foreign websites%>
<%:Problem detected%>

+

<%:foreign websites%>
<%:Problem detected%>✘

@@ -123,7 +55,7 @@
-

<%:SS Servers%>
<%:Not Running%>

+

<%:SS Servers%>
<%:Not Running%>✘

@@ -135,7 +67,7 @@
-

<%:SSR Servers%>
<%:Not Running%>

+

<%:SSR Servers%>
<%:Not Running%>✘

@@ -148,7 +80,7 @@
-

<%:V2 Servers%>
<%:Not Running%>

+

<%:V2 Servers%>
<%:Not Running%>✘

@@ -166,12 +98,12 @@ XHR.poll(5, '<%=url([[admin]], [[vpn]], [[vssr]], [[run]])%>', null, function (x, data) { if (data) { - document.getElementById('vssr_status').innerHTML = data.global?'<%:Client%>
<%:Running%>':'<%:Client%>
<%:Not Running%>'; - document.getElementById('baidu_status').innerHTML = data.baidu?'<%:domestic website%>
<%:Connect OK%>':'<%:domestic website%>
<%:Problem detected%>'; - document.getElementById('google_status').innerHTML = data.google?'<%:foreign websites%>
<%:Connect OK%>':'<%:foreign websites%>
<%:Problem detected%>'; - document.getElementById('ss_server_status').innerHTML = data.ss_server?'<%:SS Servers%>
<%:Running%>':'<%:SS Servers%>
<%:Not Running%>'; - document.getElementById('ssr_server_status').innerHTML = data.ssr_server?'<%:SSR Servers%>
<%:Running%>':'<%:SSR Servers%>
<%:Not Running%>'; - document.getElementById('v2_server_status').innerHTML = data.v2_server?'<%:V2 Servers%>
<%:Running%>':'<%:V2 Servers%>
<%:Not Running%>'; + document.getElementById('vssr_status').innerHTML = data.global?'<%:Client%>
<%:Running%>βœ”':'<%:Client%>
<%:Not Running%>✘'; + document.getElementById('baidu_status').innerHTML = data.baidu?'<%:domestic website%>
<%:Connect OK%>βœ”':'<%:domestic website%>
<%:Problem detected%>✘'; + document.getElementById('google_status').innerHTML = data.google?'<%:foreign websites%>
<%:Connect OK%>βœ”':'<%:foreign websites%>
<%:Problem detected%>✘'; + document.getElementById('ss_server_status').innerHTML = data.ss_server?'<%:SS Servers%>
<%:Running%>βœ”':'<%:SS Servers%>
<%:Not Running%>✘'; + document.getElementById('ssr_server_status').innerHTML = data.ssr_server?'<%:SSR Servers%>
<%:Running%>βœ”':'<%:SSR Servers%>
<%:Not Running%>✘'; + document.getElementById('v2_server_status').innerHTML = data.v2_server?'<%:V2 Servers%>
<%:Running%>βœ”':'<%:V2 Servers%>
<%:Not Running%>✘'; } diff --git a/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po b/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po index 985a9a14f3..1841d1222f 100644 --- a/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po +++ b/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po @@ -838,6 +838,11 @@ msgstr "mtu参数" msgid "SS Servers" msgstr "SSζœεŠ‘ε™¨" +msgid "Support AdGuardHome and DNSMASQ format list" +msgstr "εŒζ—Άζ”―ζŒ AdGuard Home ε’Œ DNSMASQ ζ ΌεΌηš„θΏ‡ζ»€εˆ—θ‘¨" + +msgid "Running" +msgstr "运葌正常" msgid "SSR Servers" msgstr "SSRζœεŠ‘ε™¨" diff --git a/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css b/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css index 167d91256c..8ebe02d021 100644 --- a/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css +++ b/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css @@ -8,49 +8,36 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md */ -.pure-g { - letter-spacing: -.31em; - text-rendering: optimizespeed; - font-family: FreeSans, Arimo, "Droid Sans", Helvetica, Arial, sans-serif; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: horizontal; - -webkit-box-direction: normal; - -webkit-flex-flow: row wrap; - -ms-flex-flow: row wrap; - flex-flow: row wrap; - -webkit-align-content: flex-start; - -ms-flex-line-pack: start; - align-content: flex-start + .pure-g{ + letter-spacing:-.31em; + text-rendering:optimizespeed; + font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif; + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -webkit-flex-flow: row wrap; + -ms-flex-flow: row wrap; + flex-flow: row wrap; + -webkit-align-content: flex-start; + -ms-flex-line-pack: start; + align-content: flex-start } - @media all and (-ms-high-contrast:none), -(-ms-high-contrast:active) { - table .pure-g { - display: block - } -} +(-ms-high-contrast:active){ + table .pure-g{ + display:block + } + } -.opera-only :-o-prefocus, -.pure-g { - word-spacing: -.43em -} - -.pure-u { - display: inline-block; - zoom: 1; - letter-spacing: normal; - word-spacing: normal; - vertical-align: top; - text-rendering: auto -} - -.pure-g [class*=pure-u] { - font-family: sans-serif -} + .opera-only :-o-prefocus, + .pure-g{ + word-spacing:-.43em + } +.pure-u, .pure-u-1, .pure-u-1-1, .pure-u-1-12, @@ -96,148 +83,216 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md .pure-u-7-24, .pure-u-7-8, .pure-u-8-24, -.pure-u-9-24 { - display: inline-block; - zoom: 1; - letter-spacing: normal; - word-spacing: normal; - vertical-align: top; - text-rendering: auto -} +.pure-u-9-24{ + display:inline-block; + zoom:1; + letter-spacing:normal; + word-spacing:normal; + vertical-align:top; + text-rendering:auto -.pure-u-1-24 { - width: 4.1667% -} + } -.pure-u-1-12, -.pure-u-2-24 { - width: 8.3333% -} + .pure-g [class*=pure-u] { + font-family:sans-serif + + } + .pure-u-1-24 { + width: 4.1667% -.pure-u-1-8, -.pure-u-3-24 { - width: 12.5% -} + } + .pure-u-1-12, + .pure-u-2-24 { + width: 8.3333% -.pure-u-1-6, -.pure-u-4-24 { - width: 16.6667% -} + } + .pure-u-1-8, + .pure-u-3-24 { + width: 12.5% -.pure-u-1-5 { - width: 20% -} + } -.pure-u-5-24 { - width: 20.8333% -} + .pure-u-1-6, + .pure-u-4-24 { + width: 16.6667% + } -.pure-u-1-4, -.pure-u-6-24 { - width: 25% -} + .pure-u-1-5 { + width: 20% -.pure-u-7-24 { - width: 29.1667% -} + } + .pure-u-5-24 { + width: 20.8333% + + } + .pure-u-1-4, + .pure-u-6-24 { + width: 25% -.pure-u-1-3, -.pure-u-8-24 { - width: 33.3333% -} + } + .pure-u-7-24 { + width: 29.1667% -.pure-u-3-8, -.pure-u-9-24 { - width: 37.5% -} + }.pure-u-1-3, + .pure-u-8-24 { + width: 33.3333% -.pure-u-2-5 { - width: 40% -} + } + .pure-u-3-8, + .pure-u-9-24 { + width: 37.5% -.pure-u-10-24, -.pure-u-5-12 { - width: 41.6667% -} + } + .pure-u-2-5 { + width: 40% -.pure-u-11-24 { - width: 45.8333% -} + } + .pure-u-10-24, + .pure-u-5-12 { + width: 41.6667% -.pure-u-1-2, -.pure-u-12-24 { - width: 50% -} + } + .pure-u-11-24 { + width: 45.8333% -.pure-u-13-24 { - width: 54.1667% -} + } + .pure-u-1-2, + .pure-u-12-24 { + width: 50% -.pure-u-14-24, -.pure-u-7-12 { - width: 58.3333% -} + } + .pure-u-13-24 { + width: 54.1667% + + } + .pure-u-14-24, + .pure-u-7-12 { + width: 58.3333% -.pure-u-3-5 { - width: 60% -} + } + .pure-u-3-5 { + width: 60% -.pure-u-15-24, -.pure-u-5-8 { - width: 62.5% -} + } + .pure-u-15-24, + .pure-u-5-8 { + width: 62.5% -.pure-u-16-24, -.pure-u-2-3 { - width: 66.6667% -} + } + .pure-u-16-24, + .pure-u-2-3 { + width: 66.6667% -.pure-u-17-24 { - width: 70.8333% -} + } + .pure-u-17-24 { + width: 70.8333% + } -.pure-u-18-24, -.pure-u-3-4 { - width: 75% -} + .pure-u-18-24, + .pure-u-3-4 { + width: 75% -.pure-u-19-24 { - width: 79.1667% -} + } + .pure-u-19-24 { + width: 79.1667% -.pure-u-4-5 { - width: 80% -} + } + .pure-u-4-5 { + width: 80% -.pure-u-20-24, -.pure-u-5-6 { - width: 83.3333% -} + } + .pure-u-20-24, + .pure-u-5-6 { + width: 83.3333% -.pure-u-21-24, -.pure-u-7-8 { - width: 87.5% -} + } + .pure-u-21-24, + .pure-u-7-8 { + width: 87.5% -.pure-u-11-12, -.pure-u-22-24 { - width: 91.6667% -} + } + .pure-u-11-12, + .pure-u-22-24 { + width: 91.6667% -.pure-u-23-24 { - width: 95.8333% -} + } + .pure-u-23-24 { + width: 95.8333% -.pure-u-1, -.pure-u-1-1, -.pure-u-24-24, -.pure-u-5-5 { - width: 100% -} + } + .pure-u-1, + .pure-u-1-1, + .pure-u-24-24, + .pure-u-6-6 { + width:100% + + } + .status{ + margin: 1.5rem -0.5rem 0 -0.5rem; + } + + .img-con{ + margin: 1rem; + + } + .green{ + color: #2dce89; + } + .red{ + color: #f5365c; + } + .block img{ + max-width: 100%; + height: auto; + } + .pure-u-5-8{ + display:flex; + align-items:center; + + } + + .block h4{ + font-size: 1.3rem; + font-weight: bold; + margin: 0.75rem 0; + + line-height: 1.8em; + } + @media screen and (max-width: 1920px) { + .block h4{ + font-size: 1.2rem; + + } + } + @media screen and (max-width: 1690px) { + .block h4{ + font-size: 1rem; + + } + } + @media screen and (max-width: 1290px) { + .block h4{ + font-size: 0.8rem; + } + .pure-u-1-6{ + width:33.333%; + } + } + @media screen and (max-width: 700px) { + + .pure-u-1-6{ + width:50%; + } + .img-con{ + margin: 0.5rem; + + } + .block h4{ + font-size: 0.81rem; + + } + } -.status { - margin: 1rem -0.5rem 1rem -0.5rem; -} .block { margin: 0.5rem 0.5rem;