diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index cef30b5782..60f493593a 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -52,6 +52,10 @@ span.port {
color: red;
}
+.locked {
+ color: blue;
+}
+
.advanced-setting {
display: none;
}
@@ -69,4 +73,4 @@ span.port {
#small-save-button {
width: 100%;
margin-bottom: 15px;
-}
\ No newline at end of file
+}
diff --git a/domain-server/resources/web/footer.html b/domain-server/resources/web/footer.html
index 199a835cf1..4ab3ed0b31 100644
--- a/domain-server/resources/web/footer.html
+++ b/domain-server/resources/web/footer.html
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/domain-server/resources/web/js/bootbox.min.js b/domain-server/resources/web/js/bootbox.min.js
new file mode 100644
index 0000000000..a7ea24fe7a
--- /dev/null
+++ b/domain-server/resources/web/js/bootbox.min.js
@@ -0,0 +1,6 @@
+/**
+ * bootbox.js v4.3.0
+ *
+ * http://bootboxjs.com/license.txt
+ */
+!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["jquery"],b):"object"==typeof exports?module.exports=b(require("jquery")):a.bootbox=b(a.jQuery)}(this,function a(b,c){"use strict";function d(a){var b=q[o.locale];return b?b[a]:q.en[a]}function e(a,c,d){a.stopPropagation(),a.preventDefault();var e=b.isFunction(d)&&d(a)===!1;e||c.modal("hide")}function f(a){var b,c=0;for(b in a)c++;return c}function g(a,c){var d=0;b.each(a,function(a,b){c(a,b,d++)})}function h(a){var c,d;if("object"!=typeof a)throw new Error("Please supply an object of options");if(!a.message)throw new Error("Please specify a message");return a=b.extend({},o,a),a.buttons||(a.buttons={}),a.backdrop=a.backdrop?"static":!1,c=a.buttons,d=f(c),g(c,function(a,e,f){if(b.isFunction(e)&&(e=c[a]={callback:e}),"object"!==b.type(e))throw new Error("button with key "+a+" must be an object");e.label||(e.label=a),e.className||(e.className=2>=d&&f===d-1?"btn-primary":"btn-default")}),a}function i(a,b){var c=a.length,d={};if(1>c||c>2)throw new Error("Invalid argument length");return 2===c||"string"==typeof a[0]?(d[b[0]]=a[0],d[b[1]]=a[1]):d=a[0],d}function j(a,c,d){return b.extend(!0,{},a,i(c,d))}function k(a,b,c,d){var e={className:"bootbox-"+a,buttons:l.apply(null,b)};return m(j(e,d,c),b)}function l(){for(var a={},b=0,c=arguments.length;c>b;b++){var e=arguments[b],f=e.toLowerCase(),g=e.toUpperCase();a[f]={label:d(g)}}return a}function m(a,b){var d={};return g(b,function(a,b){d[b]=!0}),g(a.buttons,function(a){if(d[a]===c)throw new Error("button key "+a+" is not allowed (options are "+b.join("\n")+")")}),a}var n={dialog:""
@@ -16,24 +16,29 @@ var viewHelpers = {
setting_value = ""
}
+ label_class = 'control-label'
+ if (isLocked) {
+ label_class += ' locked'
+ }
+
if (setting.type === 'checkbox') {
- form_group += "
" + setting.label + " "
- form_group += "
"
return form_group
}
@@ -81,6 +86,10 @@ $(document).ready(function(){
$(this).blur()
})
+
+ $('#settings-form').on('click', '#choose-domain-btn', function(){
+ chooseFromHighFidelityDomains($(this))
+ })
var panelsSource = $('#panels-template').html()
Settings.panelsTemplate = _.template(panelsSource)
@@ -100,10 +109,24 @@ function reloadSettings() {
$('.nav-stacked').html(Settings.sidebarTemplate(data))
$('#panels').html(Settings.panelsTemplate(data))
- Settings.initialValues = form2js('settings-form', "_", false, cleanupFormValues, true);
+ Settings.initialValues = form2js('settings-form', ".", false, cleanupFormValues, true);
+
+ // add tooltip to locked settings
+ $('label.locked').tooltip({
+ placement: 'right',
+ title: 'This setting is in the master config file and cannot be changed'
+ })
+
+ appendDomainSelectionModal()
});
}
+function appendDomainSelectionModal() {
+ var metaverseInput = $("[name='metaverse.id']");
+ var chooseButton = $("
Choose ID from my domains ");
+ metaverseInput.after(chooseButton);
+}
+
var SETTINGS_ERROR_MESSAGE = "There was a problem saving domain settings. Please try again!";
$('body').on('click', '.save-button', function(e){
@@ -113,7 +136,9 @@ $('body').on('click', '.save-button', function(e){
});
// grab a JSON representation of the form via form2js
- var formJSON = form2js('settings-form', "_", false, cleanupFormValues, true);
+ var formJSON = form2js('settings-form', ".", false, cleanupFormValues, true);
+
+ console.log(formJSON);
// re-enable all inputs
$("input").each(function(){
@@ -148,13 +173,13 @@ function badgeSidebarForDifferences(changedInput) {
var panelParentID = changedInput.closest('.panel').attr('id')
// get a JSON representation of that section
- var rootJSON = form2js(panelParentID, "_", false, cleanupFormValues, true);
+ var rootJSON = form2js(panelParentID, ".", false, cleanupFormValues, true);
var panelJSON = rootJSON[panelParentID]
var badgeValue = 0
for (var setting in panelJSON) {
- if (panelJSON[setting] != Settings.initialValues[panelParentID][ setting]) {
+ if (panelJSON[setting] != Settings.initialValues[panelParentID][setting]) {
badgeValue += 1
}
}
@@ -194,7 +219,7 @@ function showRestartModal() {
function cleanupFormValues(node) {
if (node.type && node.type === 'checkbox') {
- return { name: node.id, value: node.checked ? true : false };
+ return { name: node.name, value: node.checked ? true : false };
} else {
return false;
}
@@ -206,4 +231,71 @@ function showAlertMessage(message, isSuccess) {
alertBox.addClass(isSuccess ? 'alert-success' : 'alert-danger');
alertBox.html(message);
alertBox.fadeIn();
+}
+
+function chooseFromHighFidelityDomains(clickedButton) {
+ // setup the modal to help user pick their domain
+ if (Settings.initialValues.metaverse.access_token) {
+
+ // add a spinner to the choose button
+ clickedButton.html("Loading domains...")
+ clickedButton.attr('disabled', 'disabled')
+
+ // get a list of user domains from data-web
+ data_web_domains_url = "https://data.highfidelity.io/api/v1/domains?access_token="
+ $.getJSON(data_web_domains_url + Settings.initialValues.metaverse.access_token, function(data){
+
+ modal_buttons = {
+ cancel: {
+ label: 'Cancel',
+ className: 'btn-default'
+ }
+ }
+
+ if (data.data.domains.length) {
+ // setup a select box for the returned domains
+ modal_body = "
Choose the High Fidelity domain you want this domain-server to represent.
"
+ domain_select = $("
")
+ _.each(data.data.domains, function(domain){
+ domain_select.append("
" + domain.name + " ")
+ })
+ modal_body += "
Domains " + domain_select[0].outerHTML
+ modal_buttons["success"] = {
+ label: 'Choose domain',
+ callback: function() {
+ domainID = $('#domain-name-select').val()
+ // set the domain ID on the form
+ $("[name='metaverse.id']").val(domainID).change();
+ }
+ }
+ } else {
+ modal_buttons["success"] = {
+ label: 'Create new domain',
+ callback: function() {
+ window.open("https://data.highfidelity.io/domains", '_blank');
+ }
+ }
+ modal_body = "
You do not have any domains in your High Fidelity account." +
+ "
"
+ }
+
+
+ bootbox.dialog({
+ title: "Choose matching domain",
+ message: modal_body,
+ buttons: modal_buttons
+ })
+
+ // remove the spinner from the choose button
+ clickedButton.html("Choose from my domains")
+ clickedButton.removeAttr('disabled')
+ })
+
+ } else {
+ bootbox.alert({
+ message: "You must have an access token to query your High Fidelity domains.
" +
+ "Please follow the instructions on the settings page to add an access token.",
+ title: "Access token required"
+ })
+ }
}
\ No newline at end of file
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index 54fbb02eca..18b1f40d60 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -38,10 +38,12 @@
<% split_settings = _.partition(group.settings, function(value, index) { return !value.advanced }) %>
<% _.each(split_settings[0], function(setting) { %>
- <%= getFormGroup(group.name, setting, values, false) %>
+ <%= getFormGroup(group.name, setting, values, false,
+ (_.has(locked, group.name) && _.has(locked[group.name], setting.name))) %>
<% }); %>
<% _.each(split_settings[1], function(setting) { %>
- <%= getFormGroup(group.name, setting, values, true) %>
+ <%= getFormGroup(group.name, setting, values, true,
+ (_.has(locked, group.name) && _.has(locked[group.name], setting.name))) %>
<% }); %>