Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 22:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ui' of github.com:sethalves/hifi into permissions-grid

Browse source
This commit is contained in:
Seth Alves 2016-06-02 19:13:05 -07:00
commit 0e3e2ea331
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -982,7 +982,7 @@ function makeTable(setting, keypath, setting_value, isLocked) {
if (isArray && col.type === "checkbox" && col.editable) { if (isArray && col.type === "checkbox" && col.editable) {
html += "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>" html += "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>"
+ "<input type='checkbox' class='form-control toggle-checkbox table-checkbox' " + "<input type='checkbox' class='form-control toggle-checkbox table-checkbox' data-size='mini' "
+ "name='" + colName + "'" + (colValue ? " checked" : "") + " /></td>"; + "name='" + colName + "'" + (colValue ? " checked" : "") + " /></td>";
} else { } else {
// Use a hidden input so that the values are posted. // Use a hidden input so that the values are posted.
@ -1037,8 +1037,8 @@ function makeTableInputs(setting) {
_.each(setting.columns, function(col) { _.each(setting.columns, function(col) {
if (col.type === "checkbox") { if (col.type === "checkbox") {
html += "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>" html += "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>"
+ "<input type='checkbox' class='form-control toggle-checkbox' name='" + col.name + "'" + "<input type='checkbox' class='form-control toggle-checkbox' data-size='mini' "
+ (col.default ? " checked" : "") + "/></td>"; + "name='" + col.name + "'" + (col.default ? " checked" : "") + "/></td>";
} else { } else {
html += "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>\ html += "<td class='" + Settings.DATA_COL_CLASS + "'name='" + col.name + "'>\
<input type='text' class='form-control' placeholder='" + (col.placeholder ? col.placeholder : "") + "'\ <input type='text' class='form-control' placeholder='" + (col.placeholder ? col.placeholder : "") + "'\