From 61e38f545e0c2203b18e642102e8f9a3ec266ecf Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 2 Oct 2014 15:38:36 -0700
Subject: [PATCH 01/16] new table type

---
 domain-server/resources/web/js/settings.js | 82 ++++++++++++++++++++--
 1 file changed, 78 insertions(+), 4 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 48b3b15e8f..4471efdc66 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -22,13 +22,77 @@ var viewHelpers = {
     }
     
     if (setting.type === 'checkbox') {
-      form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
+      if (setting.label !== null && typeof(setting.label) !== 'undefined' && setting.label !== "") {
+        form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
+      }
       form_group += "<div class='checkbox" + (isLocked ? " disabled" : "") + "'>"
       form_group += "<label for='" + setting_name + "'>"
-      form_group += "<input type='checkbox' name='" + setting_name + "' " + 
+      form_group += "<input type='checkbox' name='" + setting_name + "' " +
         (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
       form_group += " " + setting.help + "</label>";
       form_group += "</div>"
+    } else if (setting.type === 'table') {
+        form_group += "<div class='panel panel-default'>"
+        form_group += "<div class='panel-heading'>" + setting.label + "</div>"
+        form_group += "<div class='panel-body'>"
+        form_group += "<p>" + setting.help + "</p>"
+        form_group += "</div>"
+        
+        form_group += "<table class='table' name='" + setting_name + "'>"
+        // Column names
+        form_group += "<tr>"
+        if (setting.number === true) {
+            form_group += "<td><strong>#</strong></td>"
+        }
+        form_group += "<td><strong>" + setting.key.label + "</strong></td>"
+        _.each(setting.columns, function(col) {
+               form_group += "<td><strong>" + col.label + "</strong></td>"
+        })
+        if (setting.can_delete === true || setting.can_add === true) {
+            form_group += "<td></td>"
+        }
+        form_group += "</tr>"
+        
+        // Rows
+        var row_num = 1
+        _.each(setting_value, function(row, name) {
+               form_group += "<tr>"
+               if (setting.number === true) {
+                    form_group += "<td>" + row_num + "</td>"
+               }
+               form_group += "<td>" + name + "</td>"
+               _.each(setting.columns, function(col) {
+                      form_group += "<td>"
+                      if (row.hasOwnProperty(col.name)) {
+                        form_group += row[col.name]
+                      }
+                      form_group += "</td>"
+                })
+               if (setting.can_delete === true) {
+                    form_group += "<td><span class='glyphicon glyphicon-remove del-row'></span></td>"
+               } else if (setting.can_add === true) {
+                form_group += "<td></td>"
+               }
+               form_group += "</tr>"
+               row_num++
+        })
+        
+        // Entries
+        if (setting.can_add === true) {
+            form_group += "<tr>"
+            if (setting.number === true) {
+                form_group += "<td></td>"
+            }
+            form_group += "<td><input type='text' name='" + setting_name + ".key' class='form-control' placeholder='" + setting.key.placeholder + "'></td>"
+            _.each(setting.columns, function(col) {
+                   form_group += "<td><input type='text' name='" + setting_name + "." + col.name + "' class='form-control' placeholder='" + col.placeholder + "'></td>"
+                   })
+            form_group += "<td><span class='glyphicon glyphicon-ok add-row'></span></td>"
+            form_group += "</tr>"
+        }
+        
+        form_group += "</table>"
+        form_group += "</div>"
     } else {
       input_type = _.has(setting, 'type') ? setting.type : "text"
       
@@ -46,7 +110,7 @@ var viewHelpers = {
         
         form_group += "<input type='hidden' name='" + setting_name + "' value='" + setting_value + "'>"
       } else {
-        form_group += "<input type='" + input_type + "' class='form-control' name='" + setting_name + 
+        form_group += "<input type='" + input_type + "' class='form-control setting-input' name='" + setting_name +
           "' placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") + 
           "' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
       }
@@ -79,8 +143,18 @@ $(document).ready(function(){
       resizeFn();
       $(window).resize(resizeFn);
   })
+                  
+                  
+  $('#settings-form').on('click', '.add-row', function(){
+    console.log("add-row " + $(this))
+ })
   
-  $('#settings-form').on('change', 'input', function(){
+  $('#settings-form').on('click', '.del-row', function(){
+     console.log("del-row " + $(this))
+ })
+                  
+                  
+  $('#settings-form').on('change', '.setting-input', function(){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true)
     

From a5108375b88dde5238935ac9177e218f7923d3d7 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 2 Oct 2014 15:39:02 -0700
Subject: [PATCH 02/16] Table JSON data

---
 .../resources/describe-settings.json          | 86 +++++++++++++------
 1 file changed, 59 insertions(+), 27 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 24e9a5b63b..fb0989d91f 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -3,45 +3,77 @@
     "name": "metaverse",
     "label": "Metaverse Registration",
     "settings": [
-      {
-        "name": "access_token",
-        "label": "Access Token",
-        "help": "This is an access token generated on the <a href='https://data.highfidelity.io/tokens' target='_blank'>My Tokens</a> page of your High Fidelity account.<br/>Generate a token with the 'domains' scope and paste it here.<br/>This is required to associate this domain-server with a domain in your account."
-      },
-      {
-        "name": "id",
-        "label": "Domain ID",
-        "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank."
-      } 
+ 
     ]
   },
   {
     "name": "security",
     "label": "Security",
     "settings": [
-      {
-        "name": "http_username",
-        "label": "HTTP Username",
-        "help": "Username used for basic HTTP authentication."
-      },
-      {
-        "name": "http_password",
-        "label": "HTTP Password",
-        "type": "password",
-        "help": "Password used for basic HTTP authentication. Leave this blank if you do not want to change it.",
-        "value-hidden": true
-      }
+ 
     ]
   },
   {
-    "name": "audio",
-    "label": "Audio",
-    "assignment-types": [0],
-    "settings": [
+ "name": "audio",
+ "label": "Audio",
+ "assignment-types": [0],
+ "settings": [
+              {
+              "name": "zones",
+              "type": "table",
+              "label": "Zones",
+              "help": "In this table you can define a set of zones in which you can specify various audio properties.",
+              "number": true,
+              "can_add": true,
+              "can_delete": true,
+              "key": {
+                "label": "Name",
+                "placeholder": "Zone name"
+              },
+              "columns": [
+                          {
+                          "name": "x-range",
+                          "label": "X range",
+                          "can_set": true,
+                          "placeholder": "0-16384"
+                          },
+                          {
+                          "name": "y-range",
+                          "label": "Y range",
+                          "can_set": true,
+                          "placeholder": "0-16384"
+                          },
+                          {
+                          "name": "z-range",
+                          "label": "Z range",
+                          "can_set": true,
+                          "placeholder": "0-16384"
+                          }
+                          ],
+              "default": {
+                "Zone 1":
+                {
+                    "x-range": "10-82",
+                    "y-range": "36-94",
+                    "z-range": "38-84"
+                },
+                "Zone 2":
+                {
+                    "x-range": "12-163",
+                    "y-range": "64-134",
+                    "z-range": "27-184"
+                },
+                "Zone 3":
+                {
+                    "x-range": "463-632",
+                    "y-range": "264-384",
+                    "z-range": "843-937"
+                }
+              }
+              },
       {
         "name": "enable_filter",
         "type": "checkbox",
-        "label": "Enable Positional Filter",
         "help": "positional audio stream uses lowpass filter",
         "default": true
       },

From 1aab86884d25a7085904b899f9a7eeaf1d6bfd89 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 3 Oct 2014 14:25:36 -0700
Subject: [PATCH 03/16] Move table view code + wire row delete

---
 .../resources/describe-settings.json          |  20 +--
 domain-server/resources/web/js/settings.js    | 155 ++++++++++--------
 2 files changed, 90 insertions(+), 85 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index fb0989d91f..d07d73b74c 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,18 +1,4 @@
 [
-  {
-    "name": "metaverse",
-    "label": "Metaverse Registration",
-    "settings": [
- 
-    ]
-  },
-  {
-    "name": "security",
-    "label": "Security",
-    "settings": [
- 
-    ]
-  },
   {
  "name": "audio",
  "label": "Audio",
@@ -51,19 +37,19 @@
                           }
                           ],
               "default": {
-                "Zone 1":
+                "Zone_1":
                 {
                     "x-range": "10-82",
                     "y-range": "36-94",
                     "z-range": "38-84"
                 },
-                "Zone 2":
+                "Zone_2":
                 {
                     "x-range": "12-163",
                     "y-range": "64-134",
                     "z-range": "27-184"
                 },
-                "Zone 3":
+                "Zone_3":
                 {
                     "x-range": "463-632",
                     "y-range": "264-384",
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 4471efdc66..660fac7081 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -32,67 +32,7 @@ var viewHelpers = {
       form_group += " " + setting.help + "</label>";
       form_group += "</div>"
     } else if (setting.type === 'table') {
-        form_group += "<div class='panel panel-default'>"
-        form_group += "<div class='panel-heading'>" + setting.label + "</div>"
-        form_group += "<div class='panel-body'>"
-        form_group += "<p>" + setting.help + "</p>"
-        form_group += "</div>"
-        
-        form_group += "<table class='table' name='" + setting_name + "'>"
-        // Column names
-        form_group += "<tr>"
-        if (setting.number === true) {
-            form_group += "<td><strong>#</strong></td>"
-        }
-        form_group += "<td><strong>" + setting.key.label + "</strong></td>"
-        _.each(setting.columns, function(col) {
-               form_group += "<td><strong>" + col.label + "</strong></td>"
-        })
-        if (setting.can_delete === true || setting.can_add === true) {
-            form_group += "<td></td>"
-        }
-        form_group += "</tr>"
-        
-        // Rows
-        var row_num = 1
-        _.each(setting_value, function(row, name) {
-               form_group += "<tr>"
-               if (setting.number === true) {
-                    form_group += "<td>" + row_num + "</td>"
-               }
-               form_group += "<td>" + name + "</td>"
-               _.each(setting.columns, function(col) {
-                      form_group += "<td>"
-                      if (row.hasOwnProperty(col.name)) {
-                        form_group += row[col.name]
-                      }
-                      form_group += "</td>"
-                })
-               if (setting.can_delete === true) {
-                    form_group += "<td><span class='glyphicon glyphicon-remove del-row'></span></td>"
-               } else if (setting.can_add === true) {
-                form_group += "<td></td>"
-               }
-               form_group += "</tr>"
-               row_num++
-        })
-        
-        // Entries
-        if (setting.can_add === true) {
-            form_group += "<tr>"
-            if (setting.number === true) {
-                form_group += "<td></td>"
-            }
-            form_group += "<td><input type='text' name='" + setting_name + ".key' class='form-control' placeholder='" + setting.key.placeholder + "'></td>"
-            _.each(setting.columns, function(col) {
-                   form_group += "<td><input type='text' name='" + setting_name + "." + col.name + "' class='form-control' placeholder='" + col.placeholder + "'></td>"
-                   })
-            form_group += "<td><span class='glyphicon glyphicon-ok add-row'></span></td>"
-            form_group += "</tr>"
-        }
-        
-        form_group += "</table>"
-        form_group += "</div>"
+        form_group += makeTable(setting, setting_name, setting_value);
     } else {
       input_type = _.has(setting, 'type') ? setting.type : "text"
       
@@ -145,13 +85,20 @@ $(document).ready(function(){
   })
                   
                   
-  $('#settings-form').on('click', '.add-row', function(){
-    console.log("add-row " + $(this))
- })
-  
-  $('#settings-form').on('click', '.del-row', function(){
-     console.log("del-row " + $(this))
- })
+                  $('#settings-form').on('click', '.add-row', function(){
+                                         console.log("add-row " + $(this))
+                                         
+                                         var row = $(this).parents("tr")
+                                         
+                                         })
+                  
+                  $('#settings-form').on('click', '.del-row', function(){
+                                         console.log("del-row " + $(this))
+                                         
+                                         var row = $(this).parents("tr")
+                                         row.empty()
+                                         row.html("<input type='hidden' name='" + row.attr("name") + "' value=' '>");
+                                         })
                   
                   
   $('#settings-form').on('change', '.setting-input', function(){
@@ -262,6 +209,78 @@ $('body').on('click', '.save-button', function(e){
   return false;
 });
 
+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 + "'>"
+    
+    // Column names
+    html += "<tr class='headers'>"
+    if (setting.number === true) {
+        html += "<td class='number'><strong>#</strong></td>" // Row number
+    }
+    html += "<td class='key'><strong>" + setting.key.label + "</strong></td>" // Key
+    _.each(setting.columns, function(col) {
+        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 += "</tr>"
+    
+    // Rows
+    var row_num = 1
+    _.each(setting_value, function(row, name) {
+           html += "<tr class='data' name='" + setting_name + "." + name + "'>"
+           if (setting.number === true) {
+           html += "<td class='number'>" + row_num + "</td>"
+           }
+           html += "<td class='key'>" + name + "</td>"
+           _.each(setting.columns, function(col) {
+                  html += "<td class='data'>"
+                  if (row.hasOwnProperty(col.name)) {
+                  html += row[col.name]
+                  }
+                  html += "</td>"
+                  })
+           if (setting.can_delete === true) {
+           html += "<td class='buttons'><span class='glyphicon glyphicon-remove del-row'></span></td>"
+           } else if (setting.can_add === true) {
+           html += "<td class='buttons'></td>"
+           }
+           html += "</tr>"
+        row_num++
+    })
+    
+    // Inputs
+    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>"
+    }
+    html += "<td class='key'><input type='text' class='form-control' placeholder='" + setting.key.placeholder + "'></td>"
+    _.each(setting.columns, function(col) {
+           html += "<td class='data'><input type='text' class='form-control' placeholder='" + col.placeholder + "'></td>"
+           })
+    html += "<td class='buttons'><span class='glyphicon glyphicon-ok add-row'></span></td>"
+    html += "</tr>"
+    
+    return html
+}
+
 function badgeSidebarForDifferences(changedInput) {
   // figure out which group this input is in
   var panelParentID = changedInput.closest('.panel').attr('id')

From 8be5c1841222602dc5623519ceab58decb0e544d Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 6 Oct 2014 17:52:41 -0700
Subject: [PATCH 04/16] Get table data over to DS

---
 .../resources/describe-settings.json          |   6 +-
 domain-server/resources/web/js/settings.js    | 124 ++++++++++++++----
 .../src/DomainServerSettingsManager.cpp       |  33 ++---
 3 files changed, 118 insertions(+), 45 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 660edcf735..2c0b0cebf4 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -58,10 +58,6 @@
  "name": "audio",
  "label": "Audio",
  "assignment-types": [0],
- "settings": [
- "name": "audio",
- "label": "Audio",
- "assignment-types": [0],
  "settings": [
               {
               "name": "zones",
@@ -72,6 +68,7 @@
               "can_add": true,
               "can_delete": true,
               "key": {
+                "name": "name",
                 "label": "Name",
                 "placeholder": "Zone name"
               },
@@ -119,6 +116,7 @@
       {
         "name": "enable_filter",
         "type": "checkbox",
+        "label": "Positional filter",
         "help": "positional audio stream uses lowpass filter",
         "default": true
       },
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 660fac7081..4c2da87887 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -22,9 +22,7 @@ var viewHelpers = {
     }
     
     if (setting.type === 'checkbox') {
-      if (setting.label !== null && typeof(setting.label) !== 'undefined' && setting.label !== "") {
-        form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
-      }
+      form_group += "<label class='" + label_class + "'>" + setting.label + "</label>"
       form_group += "<div class='checkbox" + (isLocked ? " disabled" : "") + "'>"
       form_group += "<label for='" + setting_name + "'>"
       form_group += "<input type='checkbox' name='" + setting_name + "' " +
@@ -84,23 +82,95 @@ $(document).ready(function(){
       $(window).resize(resizeFn);
   })
                   
-                  
-                  $('#settings-form').on('click', '.add-row', function(){
-                                         console.log("add-row " + $(this))
-                                         
-                                         var row = $(this).parents("tr")
-                                         
-                                         })
-                  
-                  $('#settings-form').on('click', '.del-row', function(){
-                                         console.log("del-row " + $(this))
-                                         
-                                         var row = $(this).parents("tr")
-                                         row.empty()
-                                         row.html("<input type='hidden' name='" + row.attr("name") + "' value=' '>");
-                                         })
-                  
-                  
+    
+    $('#settings-form').on('click', '.add-row', function(){
+        console.log("add-row " + $(this))
+        
+        var row = $(this).parents("tr")
+        var data = row.parent().children(".data")
+        
+        // Check key spaces
+        var name = row.children(".key").children("input").val()
+        if (name.indexOf(' ') !== -1) {
+            showAlertMessage("Key contains spaces", false)
+            return
+        }
+        // Check keys with the same name
+        var equals = false;
+        _.each(data.children(".key"), function(element) {
+            if ($(element).text() === name) {
+               equals = true
+               return
+            }
+        })
+        if (equals) {
+            showAlertMessage("Two keys cannot be identical.", false)
+            return
+        }
+        
+        // Check empty fields
+        var empty = false;
+        _.each(row.children(".data").children("input"), function(element) {
+            if ($(element).val().length === 0) {
+               empty = true
+               return
+            }
+        })
+        if (empty) {
+            showAlertMessage("Empty field(s)")
+            return
+        }
+        
+        var input_clone = row.clone()
+        // Change input row to data row
+        var full_name = row.parents("table").attr("name") + "." + name
+        row.attr("class", "data")
+        
+        _.each(row.children(), function(element) {
+            if ($(element).hasClass("number")) { // Index row
+                var numbers = data.children(".number")
+                if (numbers.length > 0) {
+                    $(element).html(parseInt(numbers.last().text()) + 1)
+                } else {
+                    $(element).html(1)
+                }
+            } else if ($(element).hasClass("buttons")) { // Change buttons
+               var prevSpan = $(element).parent().prev().children(".buttons").children("span")
+               var span = $(element).children("span")
+               console.log(prevSpan.length)
+               console.log(span.length)
+               if (prevSpan.hasClass("del-row")) {
+                    console.log("Switching icons")
+                   span.removeClass("glyphicon-ok add-row")
+                   span.addClass("glyphicon-remove del-row")
+               } else {
+                   span.remove()
+               }
+            } else if($(element).hasClass("data") || $(element).hasClass("key")) { // Hide inputs
+               var input = $(element).children("input")
+               input.attr("type", "hidden")
+               input.attr("name", full_name + "." + $(element).attr("name"))
+               input.attr("value", input.val())
+               input.attr("data-changed", "true")
+               
+               $(element).html($(element).html() + input.val())
+            } else {
+               console.log("Unknown table element")
+            }
+        })
+        row.parent().append(input_clone)
+        //showAlertMessage("Row added", true)
+    })
+    
+    $('#settings-form').on('click', '.del-row', function(){
+        console.log("del-row " + $(this))
+        
+        var row = $(this).parents("tr")
+        row.empty()
+        row.html("<input type='hidden' class='form-control' name='" + row.attr("name") + "' data-changed='true' value=''>");
+    })
+    
+    
   $('#settings-form').on('change', '.setting-input', function(){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true)
@@ -110,7 +180,7 @@ $(document).ready(function(){
   
   $('#advanced-toggle-button').click(function(){
     Settings.showAdvanced = !Settings.showAdvanced
-    var advancedSelector = $('.advanced-setting') 
+    var advancedSelector = $('.advanced-setting')
     
     if (Settings.showAdvanced) {
       advancedSelector.show()
@@ -271,9 +341,13 @@ function makeTableInputs(setting) {
     if (setting.number === true) {
         html += "<td class='number'></td>"
     }
-    html += "<td class='key'><input type='text' class='form-control' placeholder='" + setting.key.placeholder + "'></td>"
+    html += "<td class='key' name='" + setting.key.name + "'>\
+            <input type='text' class='form-control' placeholder='" + setting.key.placeholder + "' value=''>\
+            </td>"
     _.each(setting.columns, function(col) {
-           html += "<td class='data'><input type='text' class='form-control' placeholder='" + col.placeholder + "'></td>"
+           html += "<td class='data'name='" + col.name + "'>\
+                    <input type='text' class='form-control' placeholder='" + col.placeholder + "' value=''>\
+                    </td>"
            })
     html += "<td class='buttons'><span class='glyphicon glyphicon-ok add-row'></span></td>"
     html += "</tr>"
@@ -330,11 +404,11 @@ function showRestartModal() {
   }, 1000);
 }
 
-function cleanupFormValues(node) {  
+function cleanupFormValues(node) {
   if (node.type && node.type === 'checkbox') {
     return { name: node.name, value: node.checked ? true : false };
   } else {
-    return false;
+      return false;
   }
 }
 
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 28b1151f2d..6055b917fe 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -238,9 +238,12 @@ const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
 void DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject,
                                                                         QVariantMap& settingsVariant,
                                                                         QJsonArray descriptionArray) {
+    
+    qDebug() << "Posted object:" << postedObject;
     foreach(const QString& key, postedObject.keys()) {
 
         QJsonValue rootValue = postedObject[key];
+        qDebug() << "Key:" << key;
         
         // we don't continue if this key is not present in our descriptionObject
         foreach(const QJsonValue& groupValue, descriptionArray) {
@@ -269,22 +272,20 @@ void DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
                     // there's a JSON Object to explore, so attempt to recurse into it
                     QJsonObject nextDescriptionObject = groupObject;
                     
-                    if (nextDescriptionObject.contains(DESCRIPTION_SETTINGS_KEY)) {
-                        if (!settingsVariant.contains(key)) {
-                            // we don't have a map below this key yet, so set it up now
-                            settingsVariant[key] = QVariantMap();
-                        }
-                        
-                        QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingsVariant[key].data());
-                        
-                        recurseJSONObjectAndOverwriteSettings(rootValue.toObject(),
-                                                              thisMap,
-                                                              nextDescriptionObject[DESCRIPTION_SETTINGS_KEY].toArray());
-                        
-                        if (thisMap.isEmpty()) {
-                            // we've cleared all of the settings below this value, so remove this one too
-                            settingsVariant.remove(key);
-                        }
+                    if (!settingsVariant.contains(key)) {
+                        // we don't have a map below this key yet, so set it up now
+                        settingsVariant[key] = QVariantMap();
+                    }
+                    
+                    QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingsVariant[key].data());
+                    
+                    recurseJSONObjectAndOverwriteSettings(rootValue.toObject(),
+                                                          thisMap,
+                                                          nextDescriptionObject[DESCRIPTION_SETTINGS_KEY].toArray());
+                    
+                    if (thisMap.isEmpty()) {
+                        // we've cleared all of the settings below this value, so remove this one too
+                        settingsVariant.remove(key);
                     }
                 }
             }

From 2a5292732c43807463c8d844ee595bbf6e8ec40e Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 7 Oct 2014 18:01:32 -0700
Subject: [PATCH 05/16] DomainServerSettings handles any types of objects

---
 .../resources/describe-settings.json          |  28 +---
 .../src/DomainServerSettingsManager.cpp       | 127 +++++++++++-------
 .../src/DomainServerSettingsManager.h         |   2 +-
 3 files changed, 82 insertions(+), 75 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 2c0b0cebf4..d567e76a80 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -74,44 +74,24 @@
               },
               "columns": [
                           {
-                          "name": "x-range",
+                          "name": "x_range",
                           "label": "X range",
                           "can_set": true,
                           "placeholder": "0-16384"
                           },
                           {
-                          "name": "y-range",
+                          "name": "y_range",
                           "label": "Y range",
                           "can_set": true,
                           "placeholder": "0-16384"
                           },
                           {
-                          "name": "z-range",
+                          "name": "z_range",
                           "label": "Z range",
                           "can_set": true,
                           "placeholder": "0-16384"
                           }
-                          ],
-              "default": {
-                "Zone_1":
-                {
-                    "x-range": "10-82",
-                    "y-range": "36-94",
-                    "z-range": "38-84"
-                },
-                "Zone_2":
-                {
-                    "x-range": "12-163",
-                    "y-range": "64-134",
-                    "z-range": "27-184"
-                },
-                "Zone_3":
-                {
-                    "x-range": "463-632",
-                    "y-range": "264-384",
-                    "z-range": "843-937"
-                }
-              }
+                          ]
               },
       {
         "name": "enable_filter",
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 6055b917fe..022e42bf02 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -29,6 +29,7 @@ const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/describe-settings
 const QString DESCRIPTION_SETTINGS_KEY = "settings";
 const QString SETTING_DEFAULT_KEY = "default";
 const QString DESCRIPTION_NAME_KEY = "name";
+const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
 
 DomainServerSettingsManager::DomainServerSettingsManager() :
     _descriptionArray(),
@@ -232,61 +233,87 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
     return responseObject;
 }
 
+bool settingExists(const QString& groupName, const QString& settingName,
+                   const QJsonArray& descriptionArray, QJsonValue& settingDescription) {
+    foreach(const QJsonValue& groupValue, descriptionArray) {
+        QJsonObject groupObject = groupValue.toObject();
+        if (groupObject[DESCRIPTION_NAME_KEY].toString() == groupName) {
+            
+            foreach(const QJsonValue& settingValue, groupObject[DESCRIPTION_SETTINGS_KEY].toArray()) {
+                QJsonObject settingObject = settingValue.toObject();
+                if (settingObject[DESCRIPTION_NAME_KEY].toString() == settingName) {
+                    settingDescription = settingObject[SETTING_DEFAULT_KEY];
+                    return true;
+                }
+            }
+        }
+    }
+    settingDescription = QJsonValue::Undefined;
+    return false;
+}
 
-const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
+void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
+                   const QJsonValue& settingDescription) {
+    if (newValue.isString()) {
+        if (newValue.toString().isEmpty()) {
+            // this is an empty value, clear it in settings variant so the default is sent
+            settingMap.remove(key);
+        } else {
+            // make sure the resulting json value has the right type
+            const QString settingType = settingDescription.toObject()[SETTING_DESCRIPTION_TYPE_KEY].toString();
+            const QString INPUT_DOUBLE_TYPE = "double";
+            
+            if (settingType == INPUT_DOUBLE_TYPE) {
+                settingMap[key] = newValue.toString().toDouble();
+            } else {
+                settingMap[key] = newValue.toString();
+            }
+        }
+    } else if (newValue.isBool()) {
+        settingMap[key] = newValue.toBool();
+    } else if (newValue.isObject()) {
+        if (!settingMap.contains(key)) {
+            // we don't have a map below this key yet, so set it up now
+            settingMap[key] = QVariantMap();
+        }
+        
+        foreach(const QString childKey, newValue.toObject().keys()) {
+            updateSetting(childKey, newValue.toObject()[childKey],
+                          *reinterpret_cast<QVariantMap*>(settingMap[key].data()),
+                          settingDescription.toObject()[key]);
+            
+        }
+        if (settingMap[key].toMap().isEmpty()) {
+            // we've cleared all of the settings below this value, so remove this one too
+            settingMap.remove(key);
+        }
+    }
+}
 
 void DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject,
                                                                         QVariantMap& settingsVariant,
-                                                                        QJsonArray descriptionArray) {
-    
-    qDebug() << "Posted object:" << postedObject;
-    foreach(const QString& key, postedObject.keys()) {
-
-        QJsonValue rootValue = postedObject[key];
-        qDebug() << "Key:" << key;
+                                                                        const QJsonArray& descriptionArray) {
+    foreach(const QString& groupKey, postedObject.keys()) {
+        QJsonValue groupValue = postedObject[groupKey];
         
-        // we don't continue if this key is not present in our descriptionObject
-        foreach(const QJsonValue& groupValue, descriptionArray) {
-            if (groupValue.toObject()[DESCRIPTION_NAME_KEY].toString() == key) {
-                QJsonObject groupObject = groupValue.toObject();
-                if (rootValue.isString()) {
-                    if (rootValue.toString().isEmpty()) {
-                        // this is an empty value, clear it in settings variant so the default is sent
-                        settingsVariant.remove(key);
-                    } else {
-                        QString settingType = groupObject[SETTING_DESCRIPTION_TYPE_KEY].toString();
-                        
-                        const QString INPUT_DOUBLE_TYPE = "double";
-                        
-                        // make sure the resulting json value has the right type
-                        
-                        if (settingType == INPUT_DOUBLE_TYPE) {
-                            settingsVariant[key] = rootValue.toString().toDouble();
-                        } else {
-                            settingsVariant[key] = rootValue.toString();
-                        }
-                    }
-                } else if (rootValue.isBool()) {
-                    settingsVariant[key] = rootValue.toBool();
-                } else if (rootValue.isObject()) {
-                    // there's a JSON Object to explore, so attempt to recurse into it
-                    QJsonObject nextDescriptionObject = groupObject;
-                    
-                    if (!settingsVariant.contains(key)) {
-                        // we don't have a map below this key yet, so set it up now
-                        settingsVariant[key] = QVariantMap();
-                    }
-                    
-                    QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingsVariant[key].data());
-                    
-                    recurseJSONObjectAndOverwriteSettings(rootValue.toObject(),
-                                                          thisMap,
-                                                          nextDescriptionObject[DESCRIPTION_SETTINGS_KEY].toArray());
-                    
-                    if (thisMap.isEmpty()) {
-                        // we've cleared all of the settings below this value, so remove this one too
-                        settingsVariant.remove(key);
-                    }
+        foreach(const QString& settingKey, groupValue.toObject().keys()) {
+            QJsonValue settingValue = groupValue.toObject()[settingKey];
+            
+            QJsonValue thisDescription;
+            if (settingExists(groupKey, settingKey, descriptionArray, thisDescription)) {
+                if (!settingsVariant.contains(groupKey)) {
+                    // we don't have a map below this key yet, so set it up now
+                    settingsVariant[groupKey] = QVariantMap();
+                }
+                
+                QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingsVariant[groupKey].data());
+                updateSetting(settingKey, settingValue,
+                              thisMap,
+                              thisDescription);
+                
+                if (settingsVariant[groupKey].toMap().empty()) {
+                    // we've cleared all of the settings below this value, so remove this one too
+                    settingsVariant.remove(groupKey);
                 }
             }
         }
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index c2e8a7d90d..d735b77c1c 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -32,7 +32,7 @@ public:
 private:
     QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false);
     void recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, QVariantMap& settingsVariant,
-                                               QJsonArray descriptionArray);
+                                               const QJsonArray& descriptionArray);
     void persistToFile();
     
     QJsonArray _descriptionArray;

From 92be06bb84ed62f9be748bae06e7adc60baf3c68 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 7 Oct 2014 18:12:56 -0700
Subject: [PATCH 06/16] Reordered a few operations

---
 .../src/DomainServerSettingsManager.cpp       | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 022e42bf02..0406cbb89d 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -277,12 +277,13 @@ void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap&
             settingMap[key] = QVariantMap();
         }
         
+        QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingMap[key].data());
         foreach(const QString childKey, newValue.toObject().keys()) {
             updateSetting(childKey, newValue.toObject()[childKey],
-                          *reinterpret_cast<QVariantMap*>(settingMap[key].data()),
+                          thisMap,
                           settingDescription.toObject()[key]);
-            
         }
+        
         if (settingMap[key].toMap().isEmpty()) {
             // we've cleared all of the settings below this value, so remove this one too
             settingMap.remove(key);
@@ -293,30 +294,32 @@ void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap&
 void DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject,
                                                                         QVariantMap& settingsVariant,
                                                                         const QJsonArray& descriptionArray) {
+    // Iterate on the setting groups
     foreach(const QString& groupKey, postedObject.keys()) {
         QJsonValue groupValue = postedObject[groupKey];
+
+        if (!settingsVariant.contains(groupKey)) {
+            // we don't have a map below this key yet, so set it up now
+            settingsVariant[groupKey] = QVariantMap();
+        }
         
+        // Iterate on the settings
         foreach(const QString& settingKey, groupValue.toObject().keys()) {
             QJsonValue settingValue = groupValue.toObject()[settingKey];
             
             QJsonValue thisDescription;
             if (settingExists(groupKey, settingKey, descriptionArray, thisDescription)) {
-                if (!settingsVariant.contains(groupKey)) {
-                    // we don't have a map below this key yet, so set it up now
-                    settingsVariant[groupKey] = QVariantMap();
-                }
-                
                 QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingsVariant[groupKey].data());
                 updateSetting(settingKey, settingValue,
                               thisMap,
                               thisDescription);
-                
-                if (settingsVariant[groupKey].toMap().empty()) {
-                    // we've cleared all of the settings below this value, so remove this one too
-                    settingsVariant.remove(groupKey);
-                }
             }
         }
+        
+        if (settingsVariant[groupKey].toMap().empty()) {
+            // we've cleared all of the settings below this value, so remove this one too
+            settingsVariant.remove(groupKey);
+        }
     }
 }
 

From ec8fcb6b59344fe2319f5058df5c8ebbedcd2e18 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 7 Oct 2014 20:43:41 -0700
Subject: [PATCH 07/16] removed debug and name in posted object :

---
 domain-server/resources/web/js/settings.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 4c2da87887..ff10c84d44 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -82,10 +82,7 @@ $(document).ready(function(){
       $(window).resize(resizeFn);
   })
                   
-    
     $('#settings-form').on('click', '.add-row', function(){
-        console.log("add-row " + $(this))
-        
         var row = $(this).parents("tr")
         var data = row.parent().children(".data")
         
@@ -146,7 +143,11 @@ $(document).ready(function(){
                } else {
                    span.remove()
                }
-            } else if($(element).hasClass("data") || $(element).hasClass("key")) { // Hide inputs
+            } else if ($(element).hasClass("key")) {
+               var input = $(element).children("input")
+               $(element).html(input.val())
+               input.remove()
+            } else if($(element).hasClass("data")) { // Hide inputs
                var input = $(element).children("input")
                input.attr("type", "hidden")
                input.attr("name", full_name + "." + $(element).attr("name"))
@@ -159,18 +160,15 @@ $(document).ready(function(){
             }
         })
         row.parent().append(input_clone)
-        //showAlertMessage("Row added", true)
+        showAlertMessage("Row added", true)
     })
     
     $('#settings-form').on('click', '.del-row', function(){
-        console.log("del-row " + $(this))
-        
         var row = $(this).parents("tr")
         row.empty()
         row.html("<input type='hidden' class='form-control' name='" + row.attr("name") + "' data-changed='true' value=''>");
     })
     
-    
   $('#settings-form').on('change', '.setting-input', function(){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true)

From 91727232f81788f28962a8bbd6daaf49dd1df8f1 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 7 Oct 2014 20:52:06 -0700
Subject: [PATCH 08/16] Indentation

---
 .../resources/describe-settings.json          | 186 +++++++++---------
 1 file changed, 93 insertions(+), 93 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index d567e76a80..5a04197b14 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,98 +1,98 @@
 [
   {
- "name": "metaverse",
- "label": "Metaverse Registration",
- "settings": [
-              {
-              "name": "access_token",
-              "label": "Access Token",
-              "help": "This is an access token generated on the <a href='https://data.highfidelity.io/tokens' target='_blank'>My Tokens</a> page of your High Fidelity account.<br/>Generate a token with the 'domains' scope and paste it here.<br/>This is required to associate this domain-server with a domain in your account."
-              },
-              {
-              "name": "id",
-              "label": "Domain ID",
-              "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank."
-              },
-              {
-              "name": "automatic_networking",
-              "label": "Automatic Networking",
-              "help": "This defines how other nodes in the High Fidelity metaverse will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
-              "default": "disabled",
-              "type": "select",
-              "options": [
-                          {
-                          "value": "full",
-                          "label": "Full: update both the IP address and port to reach my server"
-                          },
-                          {
-                          "value": "ip",
-                          "label": "IP Only: update just my IP address, I will open the port manually"
-                          },
-                          {
-                          "value": "disabled",
-                          "label": "None: use the network information I have entered for this domain at data.highfidelity.io"
-                          }
-                          ]
-              }
-              ]
- },
- {
- "name": "security",
- "label": "Security",
- "settings": [
-              {
-              "name": "http_username",
-              "label": "HTTP Username",
-              "help": "Username used for basic HTTP authentication."
-              },
-              {
-              "name": "http_password",
-              "label": "HTTP Password",
-              "type": "password",
-              "help": "Password used for basic HTTP authentication. Leave this blank if you do not want to change it.",
-              "value-hidden": true
-              }
-              ]
- },
- {
- "name": "audio",
- "label": "Audio",
- "assignment-types": [0],
- "settings": [
-              {
-              "name": "zones",
-              "type": "table",
-              "label": "Zones",
-              "help": "In this table you can define a set of zones in which you can specify various audio properties.",
-              "number": true,
-              "can_add": true,
-              "can_delete": true,
-              "key": {
-                "name": "name",
-                "label": "Name",
-                "placeholder": "Zone name"
-              },
-              "columns": [
-                          {
-                          "name": "x_range",
-                          "label": "X range",
-                          "can_set": true,
-                          "placeholder": "0-16384"
-                          },
-                          {
-                          "name": "y_range",
-                          "label": "Y range",
-                          "can_set": true,
-                          "placeholder": "0-16384"
-                          },
-                          {
-                          "name": "z_range",
-                          "label": "Z range",
-                          "can_set": true,
-                          "placeholder": "0-16384"
-                          }
-                          ]
-              },
+    "name": "metaverse",
+    "label": "Metaverse Registration",
+    "settings": [
+      {
+        "name": "access_token",
+        "label": "Access Token",
+        "help": "This is an access token generated on the <a href='https://data.highfidelity.io/tokens' target='_blank'>My Tokens</a> page of your High Fidelity account.<br/>Generate a token with the 'domains' scope and paste it here.<br/>This is required to associate this domain-server with a domain in your account."
+      },
+      {
+        "name": "id",
+        "label": "Domain ID",
+        "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank."
+      },
+      {
+        "name": "automatic_networking",
+        "label": "Automatic Networking",
+        "help": "This defines how other nodes in the High Fidelity metaverse will be able to reach your domain-server.<br/>If you don't want to deal with any network settings, use full automatic networking.",
+        "default": "disabled",
+        "type": "select",
+        "options": [
+          {
+            "value": "full",
+            "label": "Full: update both the IP address and port to reach my server"
+          },
+          {
+            "value": "ip",
+            "label": "IP Only: update just my IP address, I will open the port manually"
+          },
+          {
+            "value": "disabled",
+            "label": "None: use the network information I have entered for this domain at data.highfidelity.io"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "security",
+    "label": "Security",
+    "settings": [
+      {
+        "name": "http_username",
+        "label": "HTTP Username",
+        "help": "Username used for basic HTTP authentication."
+      },
+      {
+        "name": "http_password",
+        "label": "HTTP Password",
+        "type": "password",
+        "help": "Password used for basic HTTP authentication. Leave this blank if you do not want to change it.",
+        "value-hidden": true
+      }
+    ]
+  },
+  {
+    "name": "audio",
+    "label": "Audio",
+    "assignment-types": [0],
+    "settings": [
+      {
+        "name": "zones",
+        "type": "table",
+        "label": "Zones",
+        "help": "In this table you can define a set of zones in which you can specify various audio properties.",
+        "number": true,
+        "can_add": true,
+        "can_delete": true,
+        "key": {
+        "name": "name",
+        "label": "Name",
+        "placeholder": "Zone name"
+        },
+        "columns": [
+          {
+            "name": "x_range",
+            "label": "X range",
+            "can_set": true,
+            "placeholder": "0-16384"
+          },
+          {
+            "name": "y_range",
+            "label": "Y range",
+            "can_set": true,
+            "placeholder": "0-16384"
+          },
+          {
+            "name": "z_range",
+            "label": "Z range",
+            "can_set": true,
+            "placeholder": "0-16384"
+          }
+        ]
+      },
       {
         "name": "enable_filter",
         "type": "checkbox",

From c9e4c12ce2fd5abe717616a1d84a05151c7df1b1 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 7 Oct 2014 21:00:53 -0700
Subject: [PATCH 09/16] Removed line number

---
 domain-server/resources/describe-settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 5a04197b14..3388fd52f4 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -64,7 +64,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": true,
+        "number": false,
         "can_add": true,
         "can_delete": true,
         "key": {

From 9c2e68847799d4fcf918c25618f264da55758650 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 7 Oct 2014 21:03:02 -0700
Subject: [PATCH 10/16] indentation

---
 domain-server/resources/describe-settings.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 3388fd52f4..bd8fe11ee1 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -68,9 +68,9 @@
         "can_add": true,
         "can_delete": true,
         "key": {
-        "name": "name",
-        "label": "Name",
-        "placeholder": "Zone name"
+          "name": "name",
+          "label": "Name",
+          "placeholder": "Zone name"
         },
         "columns": [
           {

From ebfb9495dce831869a8ff8c96772ed27032fa4ee Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 7 Oct 2014 21:04:59 -0700
Subject: [PATCH 11/16] Made helpers private methods

---
 domain-server/src/DomainServerSettingsManager.cpp | 8 ++++----
 domain-server/src/DomainServerSettingsManager.h   | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 0406cbb89d..5fcc7a8f82 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -233,8 +233,8 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
     return responseObject;
 }
 
-bool settingExists(const QString& groupName, const QString& settingName,
-                   const QJsonArray& descriptionArray, QJsonValue& settingDescription) {
+bool DomainServerSettingsManager::settingExists(const QString& groupName, const QString& settingName,
+                                                const QJsonArray& descriptionArray, QJsonValue& settingDescription) {
     foreach(const QJsonValue& groupValue, descriptionArray) {
         QJsonObject groupObject = groupValue.toObject();
         if (groupObject[DESCRIPTION_NAME_KEY].toString() == groupName) {
@@ -252,8 +252,8 @@ bool settingExists(const QString& groupName, const QString& settingName,
     return false;
 }
 
-void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
-                   const QJsonValue& settingDescription) {
+void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
+                                                const QJsonValue& settingDescription) {
     if (newValue.isString()) {
         if (newValue.toString().isEmpty()) {
             // this is an empty value, clear it in settings variant so the default is sent
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index d735b77c1c..a21e0dc93a 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -33,6 +33,10 @@ private:
     QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false);
     void recurseJSONObjectAndOverwriteSettings(const QJsonObject& postedObject, QVariantMap& settingsVariant,
                                                const QJsonArray& descriptionArray);
+    bool settingExists(const QString& groupName, const QString& settingName,
+                       const QJsonArray& descriptionArray, QJsonValue& settingDescription);
+    void updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
+                       const QJsonValue& settingDescription);
     void persistToFile();
     
     QJsonArray _descriptionArray;

From dd90ea01bdf46e5521df26ee111aaa8d41464415 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 8 Oct 2014 10:25:01 -0700
Subject: [PATCH 12/16] Removed setting-input

---
 domain-server/resources/web/js/settings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index d260eccb6d..6003d416d1 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -48,7 +48,7 @@ var viewHelpers = {
         
         form_group += "<input type='hidden' name='" + setting_name + "' value='" + setting_value + "'>"
       } else {
-        form_group += "<input type='" + input_type + "' class='form-control setting-input' name='" + setting_name +
+        form_group += "<input type='" + input_type + "' class='form-control' name='" + setting_name +
           "' placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") + 
           "' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
       }
@@ -169,7 +169,7 @@ $(document).ready(function(){
         row.html("<input type='hidden' class='form-control' name='" + row.attr("name") + "' data-changed='true' value=''>");
     })
     
-  $('#settings-form').on('change', '.setting-input', function(){
+  $('#settings-form').on('change', 'input', function(){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true)
     

From e2d3ca53e6ef8353e14ff004e7ce361dc87f08f4 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 8 Oct 2014 11:14:39 -0700
Subject: [PATCH 13/16] Changed data to row-data

---
 domain-server/resources/web/js/settings.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 6003d416d1..259d2c0a00 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -84,7 +84,7 @@ $(document).ready(function(){
                   
     $('#settings-form').on('click', '.add-row', function(){
         var row = $(this).parents("tr")
-        var data = row.parent().children(".data")
+        var row-data = row.parent().children(".row-data")
         
         // Check key spaces
         var name = row.children(".key").children("input").val()
@@ -94,7 +94,7 @@ $(document).ready(function(){
         }
         // Check keys with the same name
         var equals = false;
-        _.each(data.children(".key"), function(element) {
+        _.each(row-data.children(".key"), function(element) {
             if ($(element).text() === name) {
                equals = true
                return
@@ -107,7 +107,7 @@ $(document).ready(function(){
         
         // Check empty fields
         var empty = false;
-        _.each(row.children(".data").children("input"), function(element) {
+        _.each(row.children(".row-data").children("input"), function(element) {
             if ($(element).val().length === 0) {
                empty = true
                return
@@ -121,11 +121,11 @@ $(document).ready(function(){
         var input_clone = row.clone()
         // Change input row to data row
         var full_name = row.parents("table").attr("name") + "." + name
-        row.attr("class", "data")
+        row.attr("class", "row-data")
         
         _.each(row.children(), function(element) {
             if ($(element).hasClass("number")) { // Index row
-                var numbers = data.children(".number")
+                var numbers = row-data.children(".number")
                 if (numbers.length > 0) {
                     $(element).html(parseInt(numbers.last().text()) + 1)
                 } else {
@@ -147,7 +147,7 @@ $(document).ready(function(){
                var input = $(element).children("input")
                $(element).html(input.val())
                input.remove()
-            } else if($(element).hasClass("data")) { // Hide inputs
+            } else if($(element).hasClass("row-data")) { // Hide inputs
                var input = $(element).children("input")
                input.attr("type", "hidden")
                input.attr("name", full_name + "." + $(element).attr("name"))
@@ -302,7 +302,7 @@ function makeTable(setting, setting_name, setting_value) {
     // Rows
     var row_num = 1
     _.each(setting_value, function(row, name) {
-           html += "<tr class='data' name='" + setting_name + "." + name + "'>"
+           html += "<tr class='row-data' name='" + setting_name + "." + name + "'>"
            if (setting.number === true) {
            html += "<td class='number'>" + row_num + "</td>"
            }

From 11b38d554f7e608959532e545b8877cd1a2588a7 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 8 Oct 2014 11:24:01 -0700
Subject: [PATCH 14/16] reindentation

---
 domain-server/resources/web/js/settings.js | 310 ++++++++++-----------
 1 file changed, 155 insertions(+), 155 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 259d2c0a00..0bccdacfb0 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -26,11 +26,11 @@ var viewHelpers = {
       form_group += "<div class='checkbox" + (isLocked ? " disabled" : "") + "'>"
       form_group += "<label for='" + setting_name + "'>"
       form_group += "<input type='checkbox' name='" + setting_name + "' " +
-        (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
+      (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
       form_group += " " + setting.help + "</label>";
       form_group += "</div>"
     } else if (setting.type === 'table') {
-        form_group += makeTable(setting, setting_name, setting_value);
+      form_group += makeTable(setting, setting_name, setting_value);
     } else {
       input_type = _.has(setting, 'type') ? setting.type : "text"
       
@@ -41,7 +41,7 @@ var viewHelpers = {
         
         _.each(setting.options, function(option) {
           form_group += "<option value='" + option.value + "'" + 
-            (option.value == setting_value ? 'selected' : '') + ">" + option.label + "</option>"
+          (option.value == setting_value ? 'selected' : '') + ">" + option.label + "</option>"
         })
         
         form_group += "</select>"
@@ -49,8 +49,8 @@ var viewHelpers = {
         form_group += "<input type='hidden' name='" + setting_name + "' value='" + setting_value + "'>"
       } else {
         form_group += "<input type='" + input_type + "' class='form-control' name='" + setting_name +
-          "' placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") + 
-          "' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
+        "' placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") + 
+        "' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
       }
       
       form_group += "<span class='help-block'>" + setting.help + "</span>" 
@@ -71,103 +71,103 @@ $(document).ready(function(){
   */
   
   $('[data-clampedwidth]').each(function () {
-      var elem = $(this);
-      var parentPanel = elem.data('clampedwidth');
-      var resizeFn = function () {
-          var sideBarNavWidth = $(parentPanel).width() - parseInt(elem.css('paddingLeft')) - parseInt(elem.css('paddingRight')) - parseInt(elem.css('marginLeft')) - parseInt(elem.css('marginRight')) - parseInt(elem.css('borderLeftWidth')) - parseInt(elem.css('borderRightWidth'));
-          elem.css('width', sideBarNavWidth);
-      };
+    var elem = $(this);
+    var parentPanel = elem.data('clampedwidth');
+    var resizeFn = function () {
+      var sideBarNavWidth = $(parentPanel).width() - parseInt(elem.css('paddingLeft')) - parseInt(elem.css('paddingRight')) - parseInt(elem.css('marginLeft')) - parseInt(elem.css('marginRight')) - parseInt(elem.css('borderLeftWidth')) - parseInt(elem.css('borderRightWidth'));
+      elem.css('width', sideBarNavWidth);
+    };
 
-      resizeFn();
-      $(window).resize(resizeFn);
+    resizeFn();
+    $(window).resize(resizeFn);
   })
                   
-    $('#settings-form').on('click', '.add-row', function(){
-        var row = $(this).parents("tr")
-        var row-data = row.parent().children(".row-data")
+  $('#settings-form').on('click', '.add-row', function(){
+    var row = $(this).parents("tr")
+    var row-data = row.parent().children(".row-data")
         
-        // Check key spaces
-        var name = row.children(".key").children("input").val()
-        if (name.indexOf(' ') !== -1) {
-            showAlertMessage("Key contains spaces", false)
-            return
+    // Check key spaces
+    var name = row.children(".key").children("input").val()
+    if (name.indexOf(' ') !== -1) {
+      showAlertMessage("Key contains spaces", false)
+      return
+    }
+    // Check keys with the same name
+    var equals = false;
+    _.each(row-data.children(".key"), function(element) {
+      if ($(element).text() === name) {
+        equals = true
+        return
+      }
+    })
+    if (equals) {
+      showAlertMessage("Two keys cannot be identical.", false)
+      return
+    }
+        
+    // Check empty fields
+    var empty = false;
+    _.each(row.children(".row-data").children("input"), function(element) {
+      if ($(element).val().length === 0) {
+        empty = true
+        return
+      }
+    })
+    if (empty) {
+      showAlertMessage("Empty field(s)")
+      return
+    }
+        
+    var input_clone = row.clone()
+    // Change input row to data row
+    var full_name = row.parents("table").attr("name") + "." + name
+    row.attr("class", "row-data")
+        
+    _.each(row.children(), function(element) {
+      if ($(element).hasClass("number")) { // Index row
+        var numbers = row-data.children(".number")
+        if (numbers.length > 0) {
+          $(element).html(parseInt(numbers.last().text()) + 1)
+        } else {
+          $(element).html(1)
         }
-        // Check keys with the same name
-        var equals = false;
-        _.each(row-data.children(".key"), function(element) {
-            if ($(element).text() === name) {
-               equals = true
-               return
-            }
-        })
-        if (equals) {
-            showAlertMessage("Two keys cannot be identical.", false)
-            return
+      } else if ($(element).hasClass("buttons")) { // Change buttons
+        var prevSpan = $(element).parent().prev().children(".buttons").children("span")
+        var span = $(element).children("span")
+        console.log(prevSpan.length)
+        console.log(span.length)
+        if (prevSpan.hasClass("del-row")) {
+          console.log("Switching icons")
+          span.removeClass("glyphicon-ok add-row")
+          span.addClass("glyphicon-remove del-row")
+        } else {
+          span.remove()
         }
-        
-        // Check empty fields
-        var empty = false;
-        _.each(row.children(".row-data").children("input"), function(element) {
-            if ($(element).val().length === 0) {
-               empty = true
-               return
-            }
-        })
-        if (empty) {
-            showAlertMessage("Empty field(s)")
-            return
-        }
-        
-        var input_clone = row.clone()
-        // Change input row to data row
-        var full_name = row.parents("table").attr("name") + "." + name
-        row.attr("class", "row-data")
-        
-        _.each(row.children(), function(element) {
-            if ($(element).hasClass("number")) { // Index row
-                var numbers = row-data.children(".number")
-                if (numbers.length > 0) {
-                    $(element).html(parseInt(numbers.last().text()) + 1)
-                } else {
-                    $(element).html(1)
-                }
-            } else if ($(element).hasClass("buttons")) { // Change buttons
-               var prevSpan = $(element).parent().prev().children(".buttons").children("span")
-               var span = $(element).children("span")
-               console.log(prevSpan.length)
-               console.log(span.length)
-               if (prevSpan.hasClass("del-row")) {
-                    console.log("Switching icons")
-                   span.removeClass("glyphicon-ok add-row")
-                   span.addClass("glyphicon-remove del-row")
-               } else {
-                   span.remove()
-               }
-            } else if ($(element).hasClass("key")) {
-               var input = $(element).children("input")
-               $(element).html(input.val())
-               input.remove()
-            } else if($(element).hasClass("row-data")) { // Hide inputs
-               var input = $(element).children("input")
-               input.attr("type", "hidden")
-               input.attr("name", full_name + "." + $(element).attr("name"))
-               input.attr("value", input.val())
-               input.attr("data-changed", "true")
+      } else if ($(element).hasClass("key")) {
+        var input = $(element).children("input")
+        $(element).html(input.val())
+        input.remove()
+      } else if($(element).hasClass("row-data")) { // Hide inputs
+        var input = $(element).children("input")
+        input.attr("type", "hidden")
+        input.attr("name", full_name + "." + $(element).attr("name"))
+        input.attr("value", input.val())
+        input.attr("data-changed", "true")
                
-               $(element).html($(element).html() + input.val())
-            } else {
-               console.log("Unknown table element")
-            }
-        })
-        row.parent().append(input_clone)
-        showAlertMessage("Row added", true)
+        $(element).html($(element).html() + input.val())
+      } else {
+        console.log("Unknown table element")
+      }
     })
+    row.parent().append(input_clone)
+    showAlertMessage("Row added", true)
+  })
     
-    $('#settings-form').on('click', '.del-row', function(){
-        var row = $(this).parents("tr")
-        row.empty()
-        row.html("<input type='hidden' class='form-control' name='" + row.attr("name") + "' data-changed='true' value=''>");
-    })
+  $('#settings-form').on('click', '.del-row', function(){
+    var row = $(this).parents("tr")
+    row.empty()
+    row.html("<input type='hidden' class='form-control' name='" + row.attr("name") + "' data-changed='true' value=''>");
+  })
     
   $('#settings-form').on('change', 'input', function(){
     // this input was changed, add the changed data attribute to it
@@ -278,79 +278,79 @@ $('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 = "<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 + "'>"
     
-    // Column names
-    html += "<tr class='headers'>"
+  // Column names
+  html += "<tr class='headers'>"
+  if (setting.number === true) {
+    html += "<td class='number'><strong>#</strong></td>" // Row number
+  }
+  html += "<td class='key'><strong>" + setting.key.label + "</strong></td>" // Key
+  _.each(setting.columns, function(col) {
+    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 += "</tr>"
+    
+  // Rows
+  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'><strong>#</strong></td>" // Row number
+      html += "<td class='number'>" + row_num + "</td>"
     }
-    html += "<td class='key'><strong>" + setting.key.label + "</strong></td>" // Key
+    html += "<td class='key'>" + name + "</td>"
     _.each(setting.columns, function(col) {
-        html += "<td class='data'><strong>" + col.label + "</strong></td>" // Data
+      html += "<td class='data'>"
+      if (row.hasOwnProperty(col.name)) {
+        html += row[col.name]
+      }
+      html += "</td>"
     })
-    if (setting.can_delete === true || setting.can_add === true) {
-        html += "<td class='buttons'></td>" // Buttons
+    if (setting.can_delete === true) {
+      html += "<td class='buttons'><span class='glyphicon glyphicon-remove del-row'></span></td>"
+    } else if (setting.can_add === true) {
+      html += "<td class='buttons'></td>"
     }
     html += "</tr>"
+    row_num++
+  })
     
-    // Rows
-    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>"
-           }
-           html += "<td class='key'>" + name + "</td>"
-           _.each(setting.columns, function(col) {
-                  html += "<td class='data'>"
-                  if (row.hasOwnProperty(col.name)) {
-                  html += row[col.name]
-                  }
-                  html += "</td>"
-                  })
-           if (setting.can_delete === true) {
-           html += "<td class='buttons'><span class='glyphicon glyphicon-remove del-row'></span></td>"
-           } else if (setting.can_add === true) {
-           html += "<td class='buttons'></td>"
-           }
-           html += "</tr>"
-        row_num++
-    })
+  // Inputs
+  if (setting.can_add === true) {
+    html += makeTableInputs(setting)
+  }
     
-    // Inputs
-    if (setting.can_add === true) {
-        html += makeTableInputs(setting)
-    }
+  html += "</table>"
+  html += "</div>"
     
-    html += "</table>"
-    html += "</div>"
-    
-    return html;
+  return html;
 }
 
 function makeTableInputs(setting) {
-    var html = "<tr class='inputs'>"
-    if (setting.number === true) {
-        html += "<td class='number'></td>"
-    }
-    html += "<td class='key' name='" + setting.key.name + "'>\
-            <input type='text' class='form-control' placeholder='" + setting.key.placeholder + "' value=''>\
-            </td>"
-    _.each(setting.columns, function(col) {
-           html += "<td class='data'name='" + col.name + "'>\
-                    <input type='text' class='form-control' placeholder='" + col.placeholder + "' value=''>\
-                    </td>"
-           })
-    html += "<td class='buttons'><span class='glyphicon glyphicon-ok add-row'></span></td>"
-    html += "</tr>"
+  var html = "<tr class='inputs'>"
+  if (setting.number === true) {
+    html += "<td class='number'></td>"
+  }
+  html += "<td class='key' name='" + setting.key.name + "'>\
+           <input type='text' class='form-control' placeholder='" + setting.key.placeholder + "' value=''>\
+           </td>"
+  _.each(setting.columns, function(col) {
+    html += "<td class='data'name='" + col.name + "'>\
+             <input type='text' class='form-control' placeholder='" + col.placeholder + "' value=''>\
+             </td>"
+  })
+  html += "<td class='buttons'><span class='glyphicon glyphicon-ok add-row'></span></td>"
+  html += "</tr>"
     
-    return html
+  return html
 }
 
 function badgeSidebarForDifferences(changedInput) {
@@ -406,7 +406,7 @@ function cleanupFormValues(node) {
   if (node.type && node.type === 'checkbox') {
     return { name: node.name, value: node.checked ? true : false };
   } else {
-      return false;
+    return false;
   }
 }
 
@@ -461,7 +461,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
           }
         }
         modal_body = "<p>You do not have any domains in your High Fidelity account." + 
-          "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
+        "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
       }
       
       
@@ -479,7 +479,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
   } else {
     bootbox.alert({
       message: "You must have an access token to query your High Fidelity domains.<br><br>" + 
-        "Please follow the instructions on the settings page to add an access token.",
+      "Please follow the instructions on the settings page to add an access token.",
       title: "Access token required"
     })
   }

From cd67c9d4563fdd8b0ea9ba6c680e9f4fb9c4ecbc Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 8 Oct 2014 11:40:43 -0700
Subject: [PATCH 15/16] Removed console logs

---
 domain-server/resources/web/js/settings.js        | 13 +++++--------
 domain-server/src/DomainServerSettingsManager.cpp |  8 ++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 0bccdacfb0..fc6b664359 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -84,7 +84,7 @@ $(document).ready(function(){
                   
   $('#settings-form').on('click', '.add-row', function(){
     var row = $(this).parents("tr")
-    var row-data = row.parent().children(".row-data")
+    var data = row.parent().children(".row-data")
         
     // Check key spaces
     var name = row.children(".key").children("input").val()
@@ -94,7 +94,7 @@ $(document).ready(function(){
     }
     // Check keys with the same name
     var equals = false;
-    _.each(row-data.children(".key"), function(element) {
+    _.each(data.children(".key"), function(element) {
       if ($(element).text() === name) {
         equals = true
         return
@@ -125,7 +125,7 @@ $(document).ready(function(){
         
     _.each(row.children(), function(element) {
       if ($(element).hasClass("number")) { // Index row
-        var numbers = row-data.children(".number")
+        var numbers = data.children(".number")
         if (numbers.length > 0) {
           $(element).html(parseInt(numbers.last().text()) + 1)
         } else {
@@ -134,10 +134,7 @@ $(document).ready(function(){
       } else if ($(element).hasClass("buttons")) { // Change buttons
         var prevSpan = $(element).parent().prev().children(".buttons").children("span")
         var span = $(element).children("span")
-        console.log(prevSpan.length)
-        console.log(span.length)
         if (prevSpan.hasClass("del-row")) {
-          console.log("Switching icons")
           span.removeClass("glyphicon-ok add-row")
           span.addClass("glyphicon-remove del-row")
         } else {
@@ -308,7 +305,7 @@ function makeTable(setting, setting_name, setting_value) {
     }
     html += "<td class='key'>" + name + "</td>"
     _.each(setting.columns, function(col) {
-      html += "<td class='data'>"
+      html += "<td class='row-data'>"
       if (row.hasOwnProperty(col.name)) {
         html += row[col.name]
       }
@@ -343,7 +340,7 @@ function makeTableInputs(setting) {
            <input type='text' class='form-control' placeholder='" + setting.key.placeholder + "' value=''>\
            </td>"
   _.each(setting.columns, function(col) {
-    html += "<td class='data'name='" + col.name + "'>\
+    html += "<td class='row-data'name='" + col.name + "'>\
              <input type='text' class='form-control' placeholder='" + col.placeholder + "' value=''>\
              </td>"
   })
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 5fcc7a8f82..c0366157db 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -279,9 +279,7 @@ void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonV
         
         QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingMap[key].data());
         foreach(const QString childKey, newValue.toObject().keys()) {
-            updateSetting(childKey, newValue.toObject()[childKey],
-                          thisMap,
-                          settingDescription.toObject()[key]);
+            updateSetting(childKey, newValue.toObject()[childKey], thisMap, settingDescription.toObject()[key]);
         }
         
         if (settingMap[key].toMap().isEmpty()) {
@@ -310,9 +308,7 @@ void DomainServerSettingsManager::recurseJSONObjectAndOverwriteSettings(const QJ
             QJsonValue thisDescription;
             if (settingExists(groupKey, settingKey, descriptionArray, thisDescription)) {
                 QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingsVariant[groupKey].data());
-                updateSetting(settingKey, settingValue,
-                              thisMap,
-                              thisDescription);
+                updateSetting(settingKey, settingValue, thisMap, thisDescription);
             }
         }
         

From 19d103c343824fef71ef66f34bd590ceaa8b3e47 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 8 Oct 2014 13:54:53 -0700
Subject: [PATCH 16/16] Indentation

---
 domain-server/resources/web/js/settings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 60d7b7ba35..d6646a87da 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -26,7 +26,7 @@ var viewHelpers = {
       form_group += "<div class='checkbox" + (isLocked ? " disabled" : "") + "'>"
       form_group += "<label for='" + setting_name + "'>"
       form_group += "<input type='checkbox' name='" + setting_name + "' " +
-      (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
+        (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
       form_group += " " + setting.help + "</label>";
       form_group += "</div>"
     } else if (setting.type === 'table') {
@@ -463,7 +463,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
           }
         }
         modal_body = "<p>You do not have any domains in your High Fidelity account." + 
-        "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
+          "<br/><br/>Go to your domains page to create a new one. Once your domain is created re-open this dialog to select it.</p>"
       }
       
       
@@ -481,7 +481,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
   } else {
     bootbox.alert({
       message: "You must have an access token to query your High Fidelity domains.<br><br>" + 
-      "Please follow the instructions on the settings page to add an access token.",
+        "Please follow the instructions on the settings page to add an access token.",
       title: "Access token required"
     })
   }