diff options
Diffstat (limited to 'modules-available')
-rw-r--r-- | modules-available/baseconfig/templates/_page.html | 34 | ||||
-rw-r--r-- | modules-available/baseconfig_bwlp/baseconfig/settings.json | 32 |
2 files changed, 27 insertions, 39 deletions
diff --git a/modules-available/baseconfig/templates/_page.html b/modules-available/baseconfig/templates/_page.html index 8bfd1b6a..7bd5f6c9 100644 --- a/modules-available/baseconfig/templates/_page.html +++ b/modules-available/baseconfig/templates/_page.html @@ -70,35 +70,41 @@ <script type="text/javascript"> function updateShadows(e) { - var shadowStr = $(e.target).data('shadows'); - var currentValue = $(e.target).val(); + var shadowStr = $(e).data('shadows'); + var currentValue = $(e).val(); var rules = shadowStr.split(','); rules.forEach(function(rule) { var rule_parts = rule.split('->'); var triggerVal = rule_parts[0].trim(); var target = rule_parts[1].trim(); + var inp = $('#' + target); + var selitem = inp.data('selitem'); - if (currentValue == triggerVal) { - $('#' + target).prop('disabled', true); + if (currentValue === triggerVal) { + inp.prop('disabled', true); + if (selitem) selitem.disable(); $('#' + target + '.multilist').multiselect('disable'); } else { - $('#' + target).prop('disabled', false); + inp.prop('disabled', false); + if (selitem) selitem.enable(); $('#' + target + '.multilist').multiselect('enable'); + } }); - console.log(shadowStr); } document.addEventListener("DOMContentLoaded", function () { /* apply selectize on all multiinput-selectize inputs */ - var $multiinputs = $("input.multiinput"); - $multiinputs.selectize({ - delimiter: ' ', - create: true, - plugins: ['restore_on_backspace', 'remove_button'], - maxItems: 10000 + $("input.multiinput").each(function (idx, elem) { + var e = $(elem); + e.data('selitem', e.selectize({ + delimiter: ' ', + create: true, + plugins: ['restore_on_backspace', 'remove_button'], + maxItems: 10000 + })[0].selectize); }); var $multilists = $("select.multilist"); @@ -110,7 +116,7 @@ document.addEventListener("DOMContentLoaded", function () { /* data-shadowing bindings */ $allShadowingFields = $('[data-shadows]'); - $allShadowingFields.on('change', updateShadows); - + $allShadowingFields.on('change', function (event) { updateShadows(event.target); }); + $allShadowingFields.each(function (idx, elem) { updateShadows(elem); }); }); </script> diff --git a/modules-available/baseconfig_bwlp/baseconfig/settings.json b/modules-available/baseconfig_bwlp/baseconfig/settings.json index d10e2a9e..5b76eb3f 100644 --- a/modules-available/baseconfig_bwlp/baseconfig/settings.json +++ b/modules-available/baseconfig_bwlp/baseconfig/settings.json @@ -45,7 +45,8 @@ "catid": "networking", "defaultvalue": "off", "permissions": "2", - "validator": "list:off|on|auto" + "validator": "list:off|on|auto", + "shadows": "off -> SLX_PROXY_PORT, off -> SLX_PROXY_TYPE, off -> SLX_PROXY_IP, off -> SLX_PROXY_BLACKLIST" }, "SLX_PROXY_PORT": { "catid": "networking", @@ -91,15 +92,15 @@ }, "SLX_SHUTDOWN_TIMEOUT": { "catid": "power", - "defaultvalue": "1200", + "defaultvalue": "1800", "permissions": "2", "validator": "regex:\/^\\d*$\/" }, - "SLX_BENCHMARK_VM": { - "catid": "other", - "defaultvalue": "", + "SLX_SCREEN_STANDBY_TIMEOUT": { + "catid": "power", + "defaultvalue": "600", "permissions": "2", - "validator": "" + "validator": "regex:\/^\\d*$\/" }, "SLX_VMCHOOSER_TAB": { "catid": "vmchooser", @@ -118,24 +119,5 @@ "defaultvalue": "BUMP", "permissions": "2", "validator": "list:IGNORE|BUMP|EXCLUSIVE" - }, - "SLX_VMCHOOSER_DUMMYSETTING1": { - "catid": "vmchooser", - "defaultvalue": "", - "permissions": "2", - "validator": "list:ON|OFF", - "shadows": "OFF -> SLX_LOGOUT_TIMEOUT, OFF -> SLX_VMCHOOSER_DUMMYSETTING2" - }, - "SLX_VMCHOOSER_DUMMYSETTING2": { - "catid": "vmchooser", - "defaultvalue": "", - "permissions": "2", - "validator": "multilist:Apples|Bananas|Pears" - }, - "SLX_VMCHOOSER_DUMMYSETTING3": { - "catid": "vmchooser", - "defaultvalue": "", - "permissions": "2", - "validator": "multiinput" } } |