From 72bcd39b9fdcf9d1aad01894c8cc72bfb1d33cb7 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 12 Jan 2018 10:50:58 +0100 Subject: [PATCH 1/1] luci-app-mwan3: unify header in configuration tab Signed-off-by: Florian Eckert --- applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua | 4 ++-- applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua | 4 ++-- applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua | 4 ++-- applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua | 4 ++-- applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua | 4 ++-- applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua index 919ed46cd..3e1a28325 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua @@ -14,9 +14,9 @@ $Id$ local net = require "luci.model.network".init() -m = Map("mwan3") +m = Map("mwan3", translate("MWAN - Globals")) -s = m:section(NamedSection, "globals", "globals", translate("Globals mwan3 options")) +s = m:section(NamedSection, "globals", "globals", nil) n = s:option(ListValue, "local_source", translate("Local source interface"), translate("Use the IP address of this interface as source IP address for traffic initiated by the router itself")) diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua index 77198d5c3..4f5dc7536 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua @@ -98,12 +98,12 @@ errorRouteList = " " interfaceCheck() -m5 = Map("mwan3", translate("MWAN Interface Configuration"), +m5 = Map("mwan3", translate("MWAN - Interfaces"), interfaceWarnings()) m5:append(Template("mwan/config_css")) -mwan_interface = m5:section(TypedSection, "interface", translate("Interfaces"), +mwan_interface = m5:section(TypedSection, "interface", nil, translate("MWAN supports up to 250 physical and/or logical interfaces
" .. "MWAN requires that all interfaces have a unique metric configured in /etc/config/network
" .. "Names must match the interface name found in /etc/config/network (see advanced tab)
" .. diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua index b73ee5765..aa7daab1d 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua @@ -3,11 +3,11 @@ ds = require "luci.dispatcher" -m5 = Map("mwan3", translate("MWAN Member Configuration")) +m5 = Map("mwan3", translate("MWAN - Members")) m5:append(Template("mwan/config_css")) -mwan_member = m5:section(TypedSection, "member", translate("Members"), +mwan_member = m5:section(TypedSection, "member", nil, translate("Members are profiles attaching a metric and weight to an MWAN interface
" .. "Names may contain characters A-Z, a-z, 0-9, _ and no spaces
" .. "Members may not share the same name as configured interfaces, policies or rules")) diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua index 20e86fc02..14237e60f 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua @@ -4,9 +4,9 @@ local fs = require "nixio.fs" local ut = require "luci.util" script = "/etc/mwan3.user" -m5 = SimpleForm("luci", nil) +m5 = SimpleForm("luci", translate("MWAN - Notification")) -f = m5:section(SimpleSection, translate("MWAN Notification"), +f = m5:section(SimpleSection, nil, translate("This section allows you to modify the content of \"/etc/mwan3.user\".
" .. "The file is also preserved during sysupgrade.
" .. "
" .. diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua index 495b45e64..363ba9129 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua @@ -29,12 +29,12 @@ err_name_list = " " policyCheck() -m5 = Map("mwan3", translate("MWAN Policy Configuration"), +m5 = Map("mwan3", translate("MWAN - Policies"), policyWarn()) m5:append(Template("mwan/config_css")) -mwan_policy = m5:section(TypedSection, "policy", translate("Policies"), +mwan_policy = m5:section(TypedSection, "policy", nil, translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic
" .. "Member interfaces with lower metrics are used first. Interfaces with the same metric load-balance
" .. "Load-balanced member interfaces distribute more traffic out those with higher weights
" .. diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua index 586f174b2..9134bbc6a 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua @@ -33,12 +33,12 @@ error_protocol_list = " " ruleCheck() -m5 = Map("mwan3", translate("MWAN Rule Configuration"), +m5 = Map("mwan3", translate("MWAN - Rules"), ruleWarn()) m5:append(Template("mwan/config_css")) -mwan_rule = m5:section(TypedSection, "rule", translate("Traffic Rules"), +mwan_rule = m5:section(TypedSection, "rule", nil, translate("Rules specify which traffic will use a particular MWAN policy based on IP address, port or protocol
" .. "Rules are matched from top to bottom. Rules below a matching rule are ignored. Traffic not matching any rule is routed using the main routing table
" .. "Traffic destined for known (other than default) networks is handled by the main routing table. Traffic matching a rule, but all WAN interfaces for that policy are down will be blackholed
" .. -- 2.11.0