Merge pull request #1178 from TDT-GmbH/luci-app-mwan3-fixes

Luci app mwan3 fixes
This commit is contained in:
Hannu Nyman 2017-06-01 13:04:21 +03:00 committed by GitHub
commit b6dd9924cf
14 changed files with 33 additions and 103 deletions

View file

@ -112,7 +112,7 @@ mwan_interface = m5:section(TypedSection, "interface", translate("Interfaces"),
mwan_interface.addremove = true
mwan_interface.dynamic = false
mwan_interface.sectionhead = "Interface"
mwan_interface.sortable = true
mwan_interface.sortable = false
mwan_interface.template = "cbi/tblsection"
mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "interface", "%s")
function mwan_interface.create(self, section)

View file

@ -107,9 +107,9 @@ family = mwan_interface:option(ListValue, "family", translate("Internet Protocol
family:value("ipv4", translate("IPv4"))
family:value("ipv6", translate("IPv6"))
track_ip = mwan_interface:option(DynamicList, "track_ip", translate("Tracking IP"),
translate("This IP address will be pinged to dermine if the link is up or down. Leave blank to assume interface is always online"))
track_ip.datatype = "ipaddr"
track_ip = mwan_interface:option(DynamicList, "track_ip", translate("Tracking hostname or IP address"),
translate("This hostname or IP address will be pinged to determine if the link is up or down. Leave blank to assume interface is always online"))
track_ip.datatype = "host"
reliability = mwan_interface:option(Value, "reliability", translate("Tracking reliability"),
translate("Acceptable values: 1-100. This many Tracking IP addresses must respond for the link to be deemed up"))

View file

@ -93,20 +93,6 @@
</div>
<style type="text/css">
.container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
max-width: none;
margin-left: 30px;
padding-right: 30px;
width: auto;
}
#mwan_diagnostics {
background-color: #FFFFFF;
border: 1px dotted #555555;
padding: 20px;
}
#diag_select {
padding: 12px 20px 20px 20px;
}
#mwaniface {
float: left;
margin: 8px 20px 0px 0px;

View file

@ -8,17 +8,7 @@
</ul>
<style type="text/css">
.container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
max-width: none;
margin: 0px 0px 0px 30px;
padding-right: 30px;
width: auto;
}
.cbi-section-node {
margin-top: 20px;
}
.cbi-section {
border: 1px dotted #555555;
padding: 20px;
}
</style>

View file

@ -8,17 +8,7 @@
</ul>
<style type="text/css">
.container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
max-width: none;
margin: 0px 0px 0px 30px;
padding-right: 30px;
width: auto;
}
.cbi-section-node {
margin-top: 20px;
}
.cbi-section {
border: 1px dotted #555555;
padding: 20px;
}
</style>

View file

@ -8,17 +8,7 @@
</ul>
<style type="text/css">
.container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
max-width: none;
margin: 0px 0px 0px 30px;
padding-right: 30px;
width: auto;
}
.cbi-section-node {
margin-top: 20px;
}
.cbi-section {
border: 1px dotted #555555;
padding: 20px;
}
</style>

View file

@ -51,17 +51,6 @@
</div>
<style type="text/css">
.container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
max-width: none;
margin-left: 30px;
padding-right: 30px;
width: auto;
}
#troubleshoot {
background-color: #FFFFFF;
border: 1px dotted #555555;
padding: 20px;
}
#troubleshoot_text {
padding: 20px;
text-align: left;

View file

@ -1,10 +1,4 @@
<style type="text/css">
.container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
max-width: none;
margin-left: 30px;
padding-right: 30px;
width: auto;
}
table td { /* cells showing the configuration values */
padding: 0px;
text-align: center;

View file

@ -53,9 +53,6 @@
.container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
max-width: 1044px;
}
#interface_field {
padding: 12px 20px 20px 20px;
}
#mwan_status_text {
display: table;
font-size: 14px;

View file

@ -31,17 +31,6 @@
</div>
<style type="text/css">
.container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
max-width: none;
margin-left: 30px;
padding-right: 30px;
width: auto;
}
#mwan_detail_status {
border: 1px dotted #555555;
background-color: #FFFFFF;
padding: 20px;
}
#mwan_detail_text {
padding: 20px;
text-align: left;

View file

@ -75,20 +75,6 @@
</div>
<style type="text/css">
.container { /* container for entire page. fixes bootstrap theme's ridiculously small page width */
max-width: none;
margin-left: 30px;
padding-right: 30px;
width: auto;
}
#mwan_interface_status {
background-color: #FFFFFF;
border: 1px dotted #555555;
padding: 20px;
}
#interface_field {
padding: 12px 20px 20px 20px;
}
#mwan_status_text {
display: table;
font-size: 14px;

View file

@ -362,11 +362,9 @@ msgid "There are currently %d of 250 supported interfaces configured"
msgstr "現在、250個中 %d 個のサポートされたインターフェースが設定済みです。"
msgid ""
"This IP address will be pinged to dermine if the link is up or down. Leave "
"blank to assume interface is always online"
"This Hostname or IP Address will be pinged to determine if the link is up or "
"down. Leave blank to assume interface is always online"
msgstr ""
"これらは、リンクの Up または Down を判定するために Ping が送信されるIP アドレ"
"スです。常にオンラインとする場合、空欄のままにします。"
msgid ""
"This displays the metric assigned to this interface in /etc/config/network"
@ -405,6 +403,9 @@ msgstr ""
"wan2, その他)<br />$DEVICE - インターフェースにアタッチされたデバイスの名前"
"eth0.1, eth1, その他)"
msgid "Tracking Hostname or IP Address"
msgstr ""
msgid "Tracking IP"
msgstr "追跡 IP"
@ -560,3 +561,10 @@ msgstr "never"
msgid "unreachable (reject)"
msgstr "unreachable (reject)"
#~ msgid ""
#~ "This IP address will be pinged to dermine if the link is up or down. "
#~ "Leave blank to assume interface is always online"
#~ msgstr ""
#~ "これらは、リンクの Up または Down を判定するために Ping が送信されるIP ア"
#~ "ドレスです。常にオンラインとする場合、空欄のままにします。"

View file

@ -312,8 +312,8 @@ msgid "There are currently %d of 250 supported interfaces configured"
msgstr ""
msgid ""
"This IP address will be pinged to dermine if the link is up or down. Leave "
"blank to assume interface is always online"
"This Hostname or IP Address will be pinged to determine if the link is up or "
"down. Leave blank to assume interface is always online"
msgstr ""
msgid ""
@ -340,6 +340,9 @@ msgid ""
"device name attached to the interface (eth0.1, eth1, etc.)"
msgstr ""
msgid "Tracking Hostname or IP Address"
msgstr ""
msgid "Tracking IP"
msgstr ""

View file

@ -348,11 +348,9 @@ msgid "There are currently %d of 250 supported interfaces configured"
msgstr ""
msgid ""
"This IP address will be pinged to dermine if the link is up or down. Leave "
"blank to assume interface is always online"
"This Hostname or IP Address will be pinged to determine if the link is up or "
"down. Leave blank to assume interface is always online"
msgstr ""
"MWAN 将会通过 Ping 这些 IP 地址来确定接口是否上线。如果留空,则 MWAN 认为该接"
"口永远在线"
msgid ""
"This displays the metric assigned to this interface in /etc/config/network"
@ -384,6 +382,9 @@ msgstr ""
"$INTERFACE 是接口名称 (wan1、wan2 等)<br />$DEVICE 是连接到接口的设备名称 "
"(eth0.1、eth1 等)"
msgid "Tracking Hostname or IP Address"
msgstr ""
msgid "Tracking IP"
msgstr "跟踪的 IP"
@ -508,3 +509,10 @@ msgstr "从不"
msgid "unreachable (reject)"
msgstr "不可达 (拒绝)"
#~ msgid ""
#~ "This IP address will be pinged to dermine if the link is up or down. "
#~ "Leave blank to assume interface is always online"
#~ msgstr ""
#~ "MWAN 将会通过 Ping 这些 IP 地址来确定接口是否上线。如果留空,则 MWAN 认为"
#~ "该接口永远在线"