Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 03:05:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3562 from birarda/master

Browse source 
styling changes for domain-server tables
This commit is contained in:
Clément Brisset 2014-10-08 15:00:52 -07:00
commit 8bf29f85d7
3 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
domain-server/resources/describe-settings.json
View file

@ -59,6 +59,19 @@
"type": "password",
"help": "Password used for basic HTTP authentication. Leave this blank if you do not want to change it.",
"value-hidden": true
},
{
"name": "allowed_users",
"type": "table",
"label": "Allowed Users",
"help": "A list of usernames for the High Fidelity users you want to allow into your domain. Users not found in this list will not be allowed to connect.",
"numbered": false,
"can_add": true,
"can_delete": true,
"key": {
"name": "username",
"label": "Username"
}
}
]
},
@ -72,7 +85,7 @@
"type": "table",
"label": "Zones",
"help": "In this table you can define a set of zones in which you can specify various audio properties.",
"number": false,
"numbered": false,
"can_add": true,
"can_delete": true,
"key": {

9
domain-server/resources/web/css/style.css
View file

@ -74,3 +74,12 @@ span.port {
width: 100%;
margin-bottom: 15px;
}
td.buttons {
width: 14px;
}
td.buttons .glyphicon {
display: block;
text-align: center;
}

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

@ -280,12 +280,9 @@ $('body').on('click', '.save-button', function(e){
});
function makeTable(setting, setting_name, setting_value) {
var html = "<div class='panel panel-default'>"
html += "<div class='panel-heading'>" + setting.label + "</div>"
html += "<div class='panel-body'>"
html += "<p>" + setting.help + "</p>"
html += "</div>"
html += "<table class='table' name='" + setting_name + "'>"
var html = "<label class='control-label'>" + setting.label + "</label>"
html += "<span class='help-block'>" + setting.help + "</span>"
html += "<table class='table table-bordered' name='" + setting_name + "'>"
// Column names
html += "<tr class='headers'>"
@ -297,7 +294,7 @@ function makeTable(setting, setting_name, setting_value) {
html += "<td class='data'><strong>" + col.label + "</strong></td>" // Data
})
if (setting.can_delete === true || setting.can_add === true) {
html += "<td class='buttons'></td>" // Buttons
html += "<td class='buttons'><strong>+/-</strong></td>" // Buttons
}
html += "</tr>"
@ -305,8 +302,8 @@ function makeTable(setting, setting_name, setting_value) {
var row_num = 1
_.each(setting_value, function(row, name) {
html += "<tr class='row-data' name='" + setting_name + "." + name + "'>"
if (setting.number === true) {
html += "<td class='number'>" + row_num + "</td>"
if (setting.numbered === true) {
html += "<td class='numbered'>" + row_num + "</td>"
}
html += "<td class='key'>" + name + "</td>"
_.each(setting.columns, function(col) {
@ -329,20 +326,19 @@ function makeTable(setting, setting_name, setting_value) {
if (setting.can_add === true) {
html += makeTableInputs(setting)
}
html += "</table>"
html += "</div>"
return html;
}
function makeTableInputs(setting) {
var html = "<tr class='inputs'>"
if (setting.number === true) {
html += "<td class='number'></td>"
if (setting.numbered === true) {
html += "<td class='numbered'></td>"
}
html += "<td class='key' name='" + setting.key.name + "'>\
<input type='text' class='form-control' placeholder='" + setting.key.placeholder + "' value=''>\
<input type='text' class='form-control' placeholder='" + (_.has(setting.key, 'placeholder') ? setting.key.placeholder : "") + "' value=''>\
</td>"
_.each(setting.columns, function(col) {
html += "<td class='row-data'name='" + col.name + "'>\