Merge pull request #3344 from Andy2244/luci-app-samba4-switch-js-api

luci-app-samba4: switch to luci static javascript api

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
index 78a6626266c3776a6b5c5be56472a1049e8d1dee..8bf8d04861ac66be4c1f94362fd71025dcc51da8 100644 (file)
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
@@ -205,9 +205,6 @@ return L.view.extend({
                o.placeholder = '0.0.0.0/0';
                o.modalonly = true;
 
-               o = s.taboption('conntrack', form.Flag, 'conntrack', _('Force connection tracking'), _('Prevent the installation of <em>NOTRACK</em> rules which would bypass connection tracking.'));
-               o.modalonly = true;
-
                o = s.taboption('conntrack', form.Flag, 'masq_allow_invalid', _('Allow "invalid" traffic'), _('Do not install extra rules to reject forwarded traffic with conntrack state <em>invalid</em>. This may be required for complex asymmetric route setups.'));
                o.modalonly = true;
 

diff --git a/modules/luci-base/htdocs/luci-static/resources/validation.js b/modules/luci-base/htdocs/luci-static/resources/validation.js
index 79ae1d67070efa8a0e078099c4c36e19fad37b15..dbf30488c179b5fd269aff7c2b51db004e244ff6 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/validation.js
+++ b/modules/luci-base/htdocs/luci-static/resources/validation.js
@@ -535,9 +535,9 @@ var ValidatorFactory = L.Class.extend({
 
                unique: function(subvalidator, subargs) {
                        var ctx = this,
-                           option = findParent(ctx.field, '[data-type][data-name]'),
+                           option = findParent(ctx.field, '[data-widget][data-name]'),
                            section = findParent(option, '.cbi-section'),
-                           query = '[data-type="%s"][data-name="%s"]'.format(option.getAttribute('data-type'), option.getAttribute('data-name')),
+                           query = '[data-widget="%s"][data-name="%s"]'.format(option.getAttribute('data-widget'), option.getAttribute('data-name')),
                            unique = true;
 
                        section.querySelectorAll(query).forEach(function(sibling) {

diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
index b39859394e549349640822b697aafe79fa4ef7f3..c69989a893d2a8e2a3a4013ec091336ebd34ec50 100644 (file)
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
@@ -452,7 +452,6 @@ select,
 .uneditable-input {
        display: inline-block;
        width: 210px;
-       height: 30px;
        padding: 4px;
        font-size: 13px;
        line-height: 18px;
@@ -460,6 +459,13 @@ select,
        border-radius: 3px;
 }
 
+input,
+select,
+.cbi-dropdown:not(.btn):not(.cbi-button),
+.uneditable-input {
+       height: 30px;
+}
+
 .uneditable-input {
        color: #808080;
 }
@@ -554,10 +560,6 @@ select[multiple] {
        background-color: #fff;
 }
 
-textarea {
-       height: auto !important;
-}
-
 .td > input[type=text],
 .td > input[type=password],
 .td > select,