diff --git a/luci-app-openclash/luasrc/model/cbi/openclash/servers.lua b/luci-app-openclash/luasrc/model/cbi/openclash/servers.lua index 00a16cf337..1962f602c1 100644 --- a/luci-app-openclash/luasrc/model/cbi/openclash/servers.lua +++ b/luci-app-openclash/luasrc/model/cbi/openclash/servers.lua @@ -29,8 +29,6 @@ o = s:option(ListValue, "rule_sources", translate("Choose Template For Create Co o.description = translate("Use Other Rules To Create Config") o:depends("create_config", 1) o:value("lhie1", translate("lhie1 Rules")) -o:value("ConnersHua", translate("ConnersHua(Provider-type) Rules")) -o:value("ConnersHua_return", translate("ConnersHua Return Rules")) o = s:option(Flag, "mix_proxies", translate("Mix Proxies")) o.description = font_red .. bold_on .. translate("Mix This Page's Proxies") .. bold_off .. font_off diff --git a/luci-app-openclash/luasrc/view/openclash/tblsection.htm b/luci-app-openclash/luasrc/view/openclash/tblsection.htm index a376a1ceeb..0002b1b5d7 100644 --- a/luci-app-openclash/luasrc/view/openclash/tblsection.htm +++ b/luci-app-openclash/luasrc/view/openclash/tblsection.htm @@ -66,6 +66,14 @@ ul{ list-style: none; } + + h3{ + margin-top: 0; + } + + .cbi-value-field .cbi-dropdown, .cbi-value-field .cbi-input-select, .cbi-value input[type="text"], .cbi-value input[type="password"] { + min-width: auto; + } #tab-header-<%=self.config%>-<%=self.sectiontype%>{ min-height: 35px; @@ -123,7 +131,7 @@
<% if self.title and #self.title > 0 then -%> - <%=self.title%> +

<%=self.title%>

<%- end %> <%- if self.sortable then -%> @@ -184,7 +192,7 @@ <%- count = count + 1; end; end; if self.sortable then -%> <%:Sort%> <%- end; if self.extedit or self.addremove then -%> -   + <%:Edit%> <%- count = count + 1; end -%> @@ -194,6 +202,8 @@ <%- else -%> <%- end -%> + <%- end; if self.extedit or self.addremove then -%> + <%- end -%> <%- for i, k in pairs(self.children) do if not k.optional then -%> ><%=k.description%> diff --git a/luci-app-openclash/luasrc/view/openclash/tblsection_dns.htm b/luci-app-openclash/luasrc/view/openclash/tblsection_dns.htm index 51aff8a532..05aaabc497 100644 --- a/luci-app-openclash/luasrc/view/openclash/tblsection_dns.htm +++ b/luci-app-openclash/luasrc/view/openclash/tblsection_dns.htm @@ -33,6 +33,14 @@ ul{ list-style: none; } + + h3{ + margin-top: 0; + } + + .cbi-value-field .cbi-dropdown, .cbi-value-field .cbi-input-select, .cbi-value input[type="text"], .cbi-value input[type="password"] { + min-width: auto; + } #tab-header-<%=self.config%>-<%=self.sectiontype%>{ min-height: 35px; @@ -90,7 +98,7 @@
<% if self.title and #self.title > 0 then -%> - <%=self.title%> +

<%=self.title%>

<%- end %> <%- if self.sortable then -%> @@ -133,7 +141,7 @@ <%- count = count + 1; end; end; if self.sortable then -%> <%:Sort%> <%- end; if self.extedit or self.addremove then -%> -   + <%:Edit%> <%- count = count + 1; end -%> @@ -143,6 +151,8 @@ <%- else -%> <%- end -%> + <%- end; if self.extedit or self.addremove then -%> + <%- end -%> <%- for i, k in pairs(self.children) do if not k.optional then -%> ><%=k.description%> diff --git a/luci-app-openclash/po/zh-cn/openclash.zh-cn.po b/luci-app-openclash/po/zh-cn/openclash.zh-cn.po index a0532cb76d..bf908a5a5f 100644 --- a/luci-app-openclash/po/zh-cn/openclash.zh-cn.po +++ b/luci-app-openclash/po/zh-cn/openclash.zh-cn.po @@ -3430,4 +3430,7 @@ msgid "Direct" msgstr "直连" msgid "Error: Config File Overwrite Failed," -msgstr "错误:配置文件覆写失败," \ No newline at end of file +msgstr "错误:配置文件覆写失败," + +msgid "Edit" +msgstr "编辑" \ No newline at end of file