Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:49:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix for for clickable labels and locked table

Browse source
This commit is contained in:
Stephen Birarda 2014-10-17 11:22:42 -07:00
parent c89daa30da
commit 5b0ccd7091
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
domain-server/resources/web/js/settings.js
View file

@ -41,6 +41,7 @@ var viewHelpers = {
common_attrs = " class='" + (setting.type !== 'checkbox' ? 'form-control' : '') common_attrs = " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
+ " " + Settings.TRIGGER_CHANGE_CLASS + "' data-short-name='" + setting.name + "' name='" + setting_name + "' " + " " + Settings.TRIGGER_CHANGE_CLASS + "' data-short-name='" + setting.name + "' name='" + setting_name + "' "
+ "id='" + setting_name + "'"
if (setting.type === 'checkbox') { if (setting.type === 'checkbox') {
if (setting.label) { if (setting.label) {
@ -51,8 +52,6 @@ var viewHelpers = {
form_group += "<input type='checkbox'" + common_attrs + (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>" form_group += "<input type='checkbox'" + common_attrs + (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
form_group += " " + setting.help + "</label>"; form_group += " " + setting.help + "</label>";
form_group += "</div>" form_group += "</div>"
} else if (setting.type === 'table') {
form_group += makeTable(setting, setting_name, setting_value);
} else { } else {
input_type = _.has(setting, 'type') ? setting.type : "text" input_type = _.has(setting, 'type') ? setting.type : "text"
@ -60,29 +59,33 @@ var viewHelpers = {
form_group += "<label for='" + setting_name + "' class='" + label_class + "'>" + setting.label + "</label>"; form_group += "<label for='" + setting_name + "' class='" + label_class + "'>" + setting.label + "</label>";
} }
if (setting.type === 'select') { if (input_type === 'table') {
form_group += "<select class='form-control' data-hidden-input='" + setting_name + "'>'" form_group += makeTable(setting, setting_name, setting_value)
_.each(setting.options, function(option) {
form_group += "<option value='" + option.value + "'" +
(option.value == setting_value ? 'selected' : '') + ">" + option.label + "</option>"
})
form_group += "</select>"
form_group += "<input type='hidden'" + common_attrs + "value='" + setting_value + "'>"
} else { } else {
if (input_type === 'select') {
form_group += "<select class='form-control' data-hidden-input='" + setting_name + "'>'"
if (input_type == 'integer') { _.each(setting.options, function(option) {
input_type = "text" form_group += "<option value='" + option.value + "'" +
(option.value == setting_value ? 'selected' : '') + ">" + option.label + "</option>"
})
form_group += "</select>"
form_group += "<input type='hidden'" + common_attrs + "value='" + setting_value + "'>"
} else {
if (input_type == 'integer') {
input_type = "text"
}
form_group += "<input type='" + input_type + "'" + common_attrs +
"placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") +
"' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
} }
form_group += "<input type='" + input_type + "'" + common_attrs +
"placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") +
"' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
}
form_group += "<span class='help-block'>" + setting.help + "</span>" form_group += "<span class='help-block'>" + setting.help + "</span>"
}
} }
form_group += "</div>" form_group += "</div>"
@ -259,8 +262,7 @@ function makeTable(setting, setting_name, setting_value) {
setting.can_order = false; setting.can_order = false;
} }
var html = (setting.label) ? "<label class='control-label'>" + setting.label + "</label>" : "" var html = "<span class='help-block'>" + setting.help + "</span>"
html += "<span class='help-block'>" + setting.help + "</span>"
html += "<table class='table table-bordered' data-short-name='" + setting.name + "' name='" + setting_name html += "<table class='table table-bordered' data-short-name='" + setting.name + "' name='" + setting_name
+ "' data-setting-type='" + (isArray ? 'array' : 'hash') + "'>" + "' data-setting-type='" + (isArray ? 'array' : 'hash') + "'>"