diff --git a/luciexpress/htdocs/js/uci.js b/luciexpress/htdocs/js/uci.js index e597a56fb..648b7de2c 100644 --- a/luciexpress/htdocs/js/uci.js +++ b/luciexpress/htdocs/js/uci.js @@ -122,7 +122,7 @@ "redirect": { "src_ip": { dvalue: "", type: String }, "src_dport": { dvalue: 0, type: String, validator: PortValidator }, - "proto": { dvalue: "tcp", type: String }, + "proto": { dvalue: "", type: String }, "dest_ip": { dvalue: "", type: String }, "dest_port": { dvalue: 0, type: String, validator: PortValidator } }, diff --git a/luciexpress/htdocs/plugins/core/widgets/luci.input.radio.html b/luciexpress/htdocs/plugins/core/widgets/luci.input.radio.html index 362ca454a..01b9bec97 100644 --- a/luciexpress/htdocs/plugins/core/widgets/luci.input.radio.html +++ b/luciexpress/htdocs/plugins/core/widgets/luci.input.radio.html @@ -1,4 +1,4 @@
- - + +
diff --git a/luciexpress/htdocs/plugins/core/widgets/luci.input.radio.js b/luciexpress/htdocs/plugins/core/widgets/luci.input.radio.js index 0a75c0e8f..730320e0e 100644 --- a/luciexpress/htdocs/plugins/core/widgets/luci.input.radio.js +++ b/luciexpress/htdocs/plugins/core/widgets/luci.input.radio.js @@ -1,16 +1,14 @@ $juci.module("core") - .directive("luciInputRadio", function () { - var plugin_root = $juci.module("core").plugin_root; - return { - templateUrl: plugin_root + "/widgets/luci.input.radio.html", - restrict: 'E', - replace: true, - scope: { - id: "=", - label: "=", - value: "=", - ngModel: "=", - inline: "=" - } - }; - }); +.directive("luciInputRadio", function () { + var plugin_root = $juci.module("core").plugin_root; + return { + templateUrl: plugin_root + "/widgets/luci.input.radio.html", + restrict: 'E', + replace: true, + scope: { + label: "@", + value: "=", + ngModel: "=" + } + }; +}); diff --git a/luciexpress/htdocs/plugins/internet/pages/internet.dns.html b/luciexpress/htdocs/plugins/internet/pages/internet.dns.html index 36a173b55..418d7658a 100644 --- a/luciexpress/htdocs/plugins/internet/pages/internet.dns.html +++ b/luciexpress/htdocs/plugins/internet/pages/internet.dns.html @@ -6,10 +6,10 @@
- +
- +
@@ -29,7 +29,7 @@
- + diff --git a/luciexpress/htdocs/plugins/internet/widgets/uci.firewall.nat.rule.edit.js b/luciexpress/htdocs/plugins/internet/widgets/uci.firewall.nat.rule.edit.js index 540d39a85..557d19b40 100644 --- a/luciexpress/htdocs/plugins/internet/widgets/uci.firewall.nat.rule.edit.js +++ b/luciexpress/htdocs/plugins/internet/widgets/uci.firewall.nat.rule.edit.js @@ -16,7 +16,10 @@ $juci.app.directive("uciFirewallNatRuleEdit", function($compile, $parse){ $scope.portIsRange = (rule.src_dport.value.indexOf("-") != -1) || (rule.dest_port.value.indexOf("-") != -1); } }); - $scope.protocolChoices = ["udp", "tcp"]; + $scope.protocolChoices = [ + { label: "UDP", value: "udp"}, + { label: "TCP", value: "tcp"} + ]; $scope.patterns = { ipaddress: /^(?!0)(?!.*\.$)((1?\d?\d|25[0-5]|2[0-4]\d)(\.|$)){4}$/, port: /^\d{1,5}$/ diff --git a/luciexpress/htdocs/plugins/status/pages/status.status.html b/luciexpress/htdocs/plugins/status/pages/status.status.html index 19d5132e0..bf60a5f80 100644 --- a/luciexpress/htdocs/plugins/status/pages/status.status.html +++ b/luciexpress/htdocs/plugins/status/pages/status.status.html @@ -20,7 +20,7 @@ - + {{dslinfo.status}}