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

Luci app mwan3 fixes

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 7e863a3..604a4fa 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -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)

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
index e7c16fd..2b46376 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua
@@ -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"))

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm
index 14d404b..6f350cc 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm
@@ -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;

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_hotplugscript.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_hotplugscript.htm
index 4c2a0dc..10b4f10 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_hotplugscript.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_hotplugscript.htm
@@ -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>

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_mwanconfig.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_mwanconfig.htm
index fba3fa6..20ae603 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_mwanconfig.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_mwanconfig.htm
@@ -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>

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_networkconfig.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_networkconfig.htm
index cf90112..bed4310 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_networkconfig.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_networkconfig.htm
@@ -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>

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm
index 0a12496..21f516b 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm
@@ -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;

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/config_css.htm b/applications/luci-app-mwan3/luasrc/view/mwan/config_css.htm
index 99da487..5d91c53 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/view/mwan/config_css.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/config_css.htm
@@ -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;

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm b/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
index 9329b92..84b1245 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
@@ -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;

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
index b80b9f3..bbb617b 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
@@ -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;

diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
index 472c7ce..f4c8b12 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
@@ -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;

diff --git a/applications/luci-app-mwan3/po/ja/mwan3.po b/applications/luci-app-mwan3/po/ja/mwan3.po
index cae45b8..6c68cdf 100644 (file)
--- a/applications/luci-app-mwan3/po/ja/mwan3.po
+++ b/applications/luci-app-mwan3/po/ja/mwan3.po
@@ -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 ア"
+#~ "ドレスです。常にオンラインとする場合、空欄のままにします。"

diff --git a/applications/luci-app-mwan3/po/templates/mwan3.pot b/applications/luci-app-mwan3/po/templates/mwan3.pot
index 0bda248..d946201 100644 (file)
--- a/applications/luci-app-mwan3/po/templates/mwan3.pot
+++ b/applications/luci-app-mwan3/po/templates/mwan3.pot
@@ -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 ""
 

diff --git a/applications/luci-app-mwan3/po/zh-cn/mwan3.po b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
index b8948b3..236ff3d 100644 (file)
--- a/applications/luci-app-mwan3/po/zh-cn/mwan3.po
+++ b/applications/luci-app-mwan3/po/zh-cn/mwan3.po
@@ -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 认为"
+#~ "该接口永远在线"