From 345e6292bb0b006211fb535495126fc73aa6a42f Mon Sep 17 00:00:00 2001 From: xiaorouji <60100640+xiaorouji@users.noreply.github.com> Date: Mon, 4 Mar 2024 03:08:40 +0800 Subject: [PATCH] luci: add transition button... --- luci-app-passwall/Makefile | 2 +- .../model/cbi/passwall/client/acl_config.lua | 19 +-- .../model/cbi/passwall/client/global.lua | 3 + .../luasrc/view/passwall/global/proxy.htm | 108 ++++++++++++++++++ luci-app-passwall/po/zh-cn/passwall.po | 9 +- 5 files changed, 127 insertions(+), 14 deletions(-) create mode 100644 luci-app-passwall/luasrc/view/passwall/global/proxy.htm diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index ef7e3bbca..7868fe21b 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall -PKG_VERSION:=4.75-3 +PKG_VERSION:=4.75-4 PKG_RELEASE:= PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua index 4c9b6b5c0..e2ba61b92 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua @@ -140,17 +140,17 @@ sources.validate = function(self, value, t) end sources.write = dynamicList_write -local TCP_NODE = uci:get(appname, "@global[0]", "tcp_node") +--local TCP_NODE = uci:get(appname, "@global[0]", "tcp_node") tcp_node = s:option(ListValue, "tcp_node", "" .. translate("TCP Node") .. "") -tcp_node.default = "default" +tcp_node.default = "nil" tcp_node:value("nil", translate("Close")) -tcp_node:value("default", translate("Use global config") .. "(" .. TCP_NODE .. ")") +--tcp_node:value("default", translate("Use global config") .. "(" .. TCP_NODE .. ")") -local UDP_NODE = uci:get(appname, "@global[0]", "udp_node") +--local UDP_NODE = uci:get(appname, "@global[0]", "udp_node") udp_node = s:option(ListValue, "udp_node", "" .. translate("UDP Node") .. "") -udp_node.default = "default" +udp_node.default = "nil" udp_node:value("nil", translate("Close")) -udp_node:value("default", translate("Use global config") .. "(" .. UDP_NODE .. ")") +--udp_node:value("default", translate("Use global config") .. "(" .. UDP_NODE .. ")") udp_node:value("tcp", translate("Same as the tcp node")) for k, v in pairs(nodes_table) do @@ -257,6 +257,9 @@ o:value("disable", translate("No Proxy")) o:value("proxy", translate("Proxy")) o:depends({ udp_node = "nil", ['!reverse'] = true }) +o = s:option(DummyValue, "", " ") +o.template = appname .. "/global/proxy" + o = s:option(Flag, "filter_proxy_ipv6", translate("Filter Proxy Host IPv6"), translate("Experimental feature.")) o.default = "0" o:depends({ tcp_node = "nil", ['!reverse'] = true }) @@ -387,8 +390,10 @@ o.description = translate("The default DNS used when not in the domain name rule .. "