From e22544398667ca7b56f1e3567161e5b9587e6ab9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 11 May 2015 11:18:26 -0700
Subject: [PATCH 01/33] fix for table overflow in DS settings

---
 domain-server/resources/web/css/style.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index e025e491d4..de3383b876 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -62,7 +62,7 @@ span.port {
 }
 
 td.buttons {
-  width: 14px;
+  width: 30px;
 }
 
 td .glyphicon {
@@ -86,3 +86,8 @@ tr.new-row {
 .highchart-modal .modal-dialog {
   width: 650px;
 }
+
+table {
+  table-layout: fixed;
+  word-wrap: break-word;
+}

From 979f33ade5cf12d257840f145797b1e6d5004256 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 11 May 2015 11:26:45 -0700
Subject: [PATCH 02/33] show an advanced toggle button in when xs

---
 domain-server/resources/web/css/style.css     |   8 ++
 domain-server/resources/web/js/settings.js    |   2 +-
 .../resources/web/settings/index.shtml        | 120 ++++++++++--------
 3 files changed, 73 insertions(+), 57 deletions(-)

diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index de3383b876..e38ff8eda0 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -91,3 +91,11 @@ table {
   table-layout: fixed;
   word-wrap: break-word;
 }
+
+#xs-advanced-container {
+  margin-bottom: 20px;
+}
+
+#advanced-toggle-button-xs {
+  width: 100%;
+}
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 4fac753959..6762814d8b 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -155,7 +155,7 @@ $(document).ready(function(){
     badgeSidebarForDifferences($(this))
   })
   
-  $('#advanced-toggle-button').click(function(){
+  $('.advanced-toggle').click(function(){
     Settings.showAdvanced = !Settings.showAdvanced
     var advancedSelector = $('.' + Settings.ADVANCED_CLASS)
     
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index 598f137285..b9b1a04c71 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -1,68 +1,76 @@
 <!--#include virtual="header.html"-->
 
-
 <div class="col-md-10 col-md-offset-1">
-  <div class="col-md-12">
-    <div class="alert" style="display:none;"></div>
-  </div>
-  
-  <div class="col-md-3 col-sm-3" id="setup-sidebar-col">
-    <div id="setup-sidebar" data-clampedwidth="#setup-sidebar-col" class="hidden-xs" data-spy="affix" data-offset-top="55">
-      <script id="list-group-template" type="text/template">
-        <% _.each(descriptions, function(group){ %>
-          <li>
-            <a href="#<%-group.name %>" class="list-group-item">
-              <span class="badge"></span>
-              <%- group.label %>
-            </a>
-          </li>
-        <% }); %>
-      </script>
-      
-      <ul class="nav nav-pills nav-stacked">
-      </ul>
-      
-      <button id="advanced-toggle-button" hidden=true class="btn btn-info">Show advanced</button>
-      <button class="btn btn-success save-button">Save and restart</button>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="alert" style="display:none;"></div>
     </div>
   </div>
-  
-  <div class="col-md-9 col-sm-9 col-xs-12">
-    <form id="settings-form" role="form">
-  
-      <script id="panels-template" type="text/template">
-        <% _.each(descriptions, function(group){ %>
-          <% split_settings = _.partition(group.settings, function(value, index) { return !value.advanced }) %>
-          <% isAdvanced = _.isEmpty(split_settings[0]) %>
-          <% if (isAdvanced) { %>
-            <% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
-          <% } %>
-          <div class="panel panel-default <%- (isAdvanced) ? 'advanced-setting' : '' %>" id="<%- group.name %>">
-            <div class="panel-heading">
-              <h3 class="panel-title"><%- group.label %></h3>
-            </div>
-            <div class="panel-body">
-              <% _.each(split_settings[0], function(setting) { %>
-                <%= getFormGroup(group.name, setting, values, false, 
-                  (_.has(locked, group.name) && _.has(locked[group.name], setting.name))) %>
-              <% }); %>
-              <% if (!_.isEmpty(split_settings[1])) { %>
-                <% $("#advanced-toggle-button").show() %>
-                <% _.each(split_settings[1], function(setting) { %>
-                  <%= getFormGroup(group.name, setting, values, true, 
+
+  <div class="row">
+    <div class="col-md-3 col-sm-3" id="setup-sidebar-col">
+      <div id="setup-sidebar" class="hidden-xs">
+        <script id="list-group-template" type="text/template">
+          <% _.each(descriptions, function(group){ %>
+            <li>
+              <a href="#<%-group.name %>" class="list-group-item">
+                <span class="badge"></span>
+                <%- group.label %>
+              </a>
+            </li>
+          <% }); %>
+        </script>
+        
+        <ul class="nav nav-pills nav-stacked">
+        </ul>
+        
+        <button id="advanced-toggle-button" hidden=true class="btn btn-info advanced-toggle">Show advanced</button>
+        <button class="btn btn-success save-button">Save and restart</button>
+      </div>
+    </div>
+
+    <div class="col-md-9 col-sm-9 col-xs-12">
+      <div id="xs-advanced-container" class="col-xs-12 hidden-sm hidden-md hidden-lg">
+        <button id="advanced-toggle-button-xs" class="btn btn-info advanced-toggle">Show advanced</button>
+      </div>
+
+      <div class="col-xs-12">
+        <form id="settings-form" role="form">
+    
+        <script id="panels-template" type="text/template">
+          <% _.each(descriptions, function(group){ %>
+            <% split_settings = _.partition(group.settings, function(value, index) { return !value.advanced }) %>
+            <% isAdvanced = _.isEmpty(split_settings[0]) %>
+            <% if (isAdvanced) { %>
+              <% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
+            <% } %>
+            <div class="panel panel-default <%- (isAdvanced) ? 'advanced-setting' : '' %>" id="<%- group.name %>">
+              <div class="panel-heading">
+                <h3 class="panel-title"><%- group.label %></h3>
+              </div>
+              <div class="panel-body">
+                <% _.each(split_settings[0], function(setting) { %>
+                  <%= getFormGroup(group.name, setting, values, false, 
                     (_.has(locked, group.name) && _.has(locked[group.name], setting.name))) %>
                 <% }); %>
-              <% }%>
+                <% if (!_.isEmpty(split_settings[1])) { %>
+                  <% $("#advanced-toggle-button").show() %>
+                  <% _.each(split_settings[1], function(setting) { %>
+                    <%= getFormGroup(group.name, setting, values, true, 
+                      (_.has(locked, group.name) && _.has(locked[group.name], setting.name))) %>
+                  <% }); %>
+                <% }%>
+              </div>
             </div>
-          </div>
-        <% }); %>
-      </script>
+          <% }); %>
+        </script>
       
-      <div id="panels"></div>
-      
-     </form>
+        <div id="panels"></div>
+        </form>
+      </div>
+    </div>
   </div>
-  
+    
   <div class="col-xs-12 hidden-sm hidden-md hidden-lg">
     <button class="btn btn-success save-button" id="small-save-button">Save and restart</button>
   </div>
@@ -87,4 +95,4 @@
 <script src='/js/sweet-alert.min.js'></script>
 <script src='/js/settings.js'></script>
 <script src='/js/form2js.min.js'></script>
-<!--#include virtual="page-end.html"-->
\ No newline at end of file
+<!--#include virtual="page-end.html"-->

From e7433adc96a3d05c1fef804aaeaa894037f09269 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 11 May 2015 11:29:32 -0700
Subject: [PATCH 03/33] re-affix the DS settings sidebar

---
 domain-server/resources/web/settings/index.shtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index b9b1a04c71..4414d867ec 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -9,7 +9,7 @@
 
   <div class="row">
     <div class="col-md-3 col-sm-3" id="setup-sidebar-col">
-      <div id="setup-sidebar" class="hidden-xs">
+      <div id="setup-sidebar" class="hidden-xs" data-spy="affix" data-offset-top="55" data-clampedwidth="#setup-sidebar-col">
         <script id="list-group-template" type="text/template">
           <% _.each(descriptions, function(group){ %>
             <li>

From 27f06e2d3775fc428e16a8ad934190c476da15df Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 11 May 2015 13:32:09 -0700
Subject: [PATCH 04/33] add button handling for describe settings

---
 domain-server/resources/describe-settings.json | 12 +++++++++++-
 domain-server/resources/web/js/settings.js     | 13 +++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index db995f3296..5f8ad09356 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -3,10 +3,20 @@
     "name": "metaverse",
     "label": "Metaverse Registration",
     "settings": [
+      {
+        "name": "connected_account",
+        "label": "Connected Account",
+        "type": "button",
+        "help": "Click the button above to connect your High Fidelity metaverse account.",
+        "button_label": "Connect High Fidelity Account",
+        "href": "https://metaverse.highfidelity.com/oauth/authorize?client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Foauth&response_type=code&scope=domains",
+        "persist": false
+      },
       {
         "name": "access_token",
         "label": "Access Token",
-        "help": "This is an access token generated on the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</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."
+        "help": "This is your OAuth access token to connect this domain-server with your High Fidelity account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>Alternatively, you can go to the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</a> page of your account and generate a token with the 'domains' scope and paste it here.",
+        "advanced": true
       },
       {
         "name": "id",
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 6762814d8b..5abdcd5f7b 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -73,6 +73,19 @@ var viewHelpers = {
           form_group += "</select>"
         
           form_group += "<input type='hidden'" + common_attrs + "value='" + setting_value + "'>"
+        } else if (input_type === 'button') {
+          // Is this a button that should link to something directly? 
+          // If so, we use an anchor tag instead of a button tag
+          
+          if (setting.href) {
+            form_group += "<a href='" + setting.href + "' class='btn btn-primary form-control' style='display: block;' role='button'" 
+              + common_attrs + ">" 
+              + setting.button_label + "</a>";
+          } else {
+            form_group += "<button class='btn btn-primary form-control'" + common_attrs + ">" 
+              + setting.button_label + "</button>";
+          }
+
         } else {
         
           if (input_type == 'integer') {

From 5afb0792dc459121e24b7c85d44d3c16a8628bde Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 11 May 2015 13:44:35 -0700
Subject: [PATCH 05/33] don't return gui only values from DS settings json

---
 domain-server/resources/describe-settings.json    | 2 +-
 domain-server/src/DomainServerSettingsManager.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 5f8ad09356..dc9abfa6c8 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -10,7 +10,7 @@
         "help": "Click the button above to connect your High Fidelity metaverse account.",
         "button_label": "Connect High Fidelity Account",
         "href": "https://metaverse.highfidelity.com/oauth/authorize?client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Foauth&response_type=code&scope=domains",
-        "persist": false
+        "gui-only": true
       },
       {
         "name": "access_token",
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index f29b1f48ae..5537e76b91 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -31,6 +31,7 @@ const QString SETTING_DEFAULT_KEY = "default";
 const QString DESCRIPTION_NAME_KEY = "name";
 const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
 const QString DESCRIPTION_COLUMNS_KEY = "columns";
+const QString VALUE_GUI_ONLY_FLAG_KEY = "gui-only";
 
 DomainServerSettingsManager::DomainServerSettingsManager() :
     _descriptionArray(),
@@ -187,7 +188,7 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
                 
                 QJsonObject settingObject = settingValue.toObject();
                 
-                if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) {
+                if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool() && !settingObject[VALUE_GUI_ONLY_FLAG_KEY].toBool()) {
                     QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray();
                     if (affectedTypesArray.isEmpty()) {
                         affectedTypesArray = groupObject[AFFECTED_TYPES_JSON_KEY].toArray();

From 55338a2b0fbec9437a0c5186419e5b4dd43e8b43 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 11 May 2015 13:49:35 -0700
Subject: [PATCH 06/33] refuse to update a setting if it is gui only

---
 .../src/DomainServerSettingsManager.cpp       | 100 +++++++++---------
 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 5537e76b91..d9483701f5 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -258,62 +258,64 @@ bool DomainServerSettingsManager::settingExists(const QString& groupName, const
 
 void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
                                                 const QJsonObject& 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
-            QString settingType = settingDescription[SETTING_DESCRIPTION_TYPE_KEY].toString();
-            const QString INPUT_DOUBLE_TYPE = "double";
-            const QString INPUT_INTEGER_TYPE = "int";
-            
-            if (settingType == INPUT_DOUBLE_TYPE) {
-                settingMap[key] = newValue.toString().toDouble();
-            } else if (settingType == INPUT_INTEGER_TYPE) {
-                settingMap[key] = newValue.toString().toInt();
+    if (!settingDescription[VALUE_GUI_ONLY_FLAG_KEY].toBool()) {
+        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 {
-                settingMap[key] = newValue.toString();
+                // make sure the resulting json value has the right type
+                QString settingType = settingDescription[SETTING_DESCRIPTION_TYPE_KEY].toString();
+                const QString INPUT_DOUBLE_TYPE = "double";
+                const QString INPUT_INTEGER_TYPE = "int";
+                
+                if (settingType == INPUT_DOUBLE_TYPE) {
+                    settingMap[key] = newValue.toString().toDouble();
+                } else if (settingType == INPUT_INTEGER_TYPE) {
+                    settingMap[key] = newValue.toString().toInt();
+                } 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();
-        }
-        
-        QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingMap[key].data());
-        foreach(const QString childKey, newValue.toObject().keys()) {
+        } 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();
+            }
+            
+            QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(settingMap[key].data());
+            foreach(const QString childKey, newValue.toObject().keys()) {
 
-            QJsonObject childDescriptionObject = settingDescription;
-            
-            // is this the key? if so we have the description already
-            if (key != settingDescription[DESCRIPTION_NAME_KEY].toString()) {
-                // otherwise find the description object for this childKey under columns
-                foreach(const QJsonValue& column, settingDescription[DESCRIPTION_COLUMNS_KEY].toArray()) {
-                    if (column.isObject()) {
-                        QJsonObject thisDescription = column.toObject();
-                        if (thisDescription[DESCRIPTION_NAME_KEY] == childKey) {
-                            childDescriptionObject = column.toObject();
-                            break;
+                QJsonObject childDescriptionObject = settingDescription;
+                
+                // is this the key? if so we have the description already
+                if (key != settingDescription[DESCRIPTION_NAME_KEY].toString()) {
+                    // otherwise find the description object for this childKey under columns
+                    foreach(const QJsonValue& column, settingDescription[DESCRIPTION_COLUMNS_KEY].toArray()) {
+                        if (column.isObject()) {
+                            QJsonObject thisDescription = column.toObject();
+                            if (thisDescription[DESCRIPTION_NAME_KEY] == childKey) {
+                                childDescriptionObject = column.toObject();
+                                break;
+                            }
                         }
-                    }
-                } 
+                    } 
+                }
+                
+                updateSetting(childKey, newValue.toObject()[childKey], thisMap, childDescriptionObject);
             }
             
-            updateSetting(childKey, newValue.toObject()[childKey], thisMap, childDescriptionObject);
+            if (settingMap[key].toMap().isEmpty()) {
+                // we've cleared all of the settings below this value, so remove this one too
+                settingMap.remove(key);
+            }
+        } else if (newValue.isArray()) {
+            // we just assume array is replacement
+            // TODO: we still need to recurse here with the description in case values in the array have special types
+            settingMap[key] = newValue.toArray().toVariantList();
         }
-        
-        if (settingMap[key].toMap().isEmpty()) {
-            // we've cleared all of the settings below this value, so remove this one too
-            settingMap.remove(key);
-        }
-    } else if (newValue.isArray()) {
-        // we just assume array is replacement
-        // TODO: we still need to recurse here with the description in case values in the array have special types
-        settingMap[key] = newValue.toArray().toVariantList();
     }
 }
 

From c390dcb4dd8dcd9d3f8f8cc2b03a21012fdfc238 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 11 May 2015 14:10:44 -0700
Subject: [PATCH 07/33] change button to disconnect if account connected

---
 domain-server/resources/web/js/settings.js | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 5abdcd5f7b..3bd00d15a5 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -220,7 +220,31 @@ function reloadSettings() {
     if (!_.has(data["locked"], "metaverse") && !_.has(data["locked"]["metaverse"], "id")) {
       // append the domain selection modal, as long as it's not locked
       appendDomainSelectionModal()
-    }   
+    }
+    
+    // figure out how we should handle the HF connect button
+    var accessToken = data.values.metaverse.access_token;
+    var $oauthConnectButton = $("[name='metaverse.connected_account']");
+
+    if (!_.has(data["locked"], "metaverse") && !_.has(data["locked"]["metaverse"], "access_token")) {
+     
+    } else {
+      // the access_token is locked so we should disable the connect/disconnect button and explain why it is disabled
+    }
+
+    if (accessToken.length > 0) {
+      // we have an access token - change the button to a disconnect button 
+      $oauthConnectButton.removeClass('btn-primary');
+      $oauthConnectButton.addClass('btn-danger');
+      $oauthConnectButton.html("Disconnect High Fidelity Account");
+
+      var $helpSpan = $oauthConnectButton.next('span.help-block');
+      
+      var helpText = $helpSpan.html();
+      helpText = helpText.replace("connect", "disconnect");
+      
+      $helpSpan.html(helpText);
+    }
   });
 }
 

From 69fb6c73acf39ed0e1f2dc0ab627ab3184a10774 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 13 May 2015 17:33:44 -0700
Subject: [PATCH 08/33] remove gui only feature in domain-server

---
 .../resources/describe-settings.json          |   9 --
 .../src/DomainServerSettingsManager.cpp       | 129 +++++++++---------
 2 files changed, 64 insertions(+), 74 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 64b2d2fb3c..c6139d3767 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -3,15 +3,6 @@
     "name": "metaverse",
     "label": "Metaverse / Networking",
     "settings": [
-      {
-        "name": "connected_account",
-        "label": "Connected Account",
-        "type": "button",
-        "help": "Click the button above to connect your High Fidelity metaverse account.",
-        "button_label": "Connect High Fidelity Account",
-        "href": "https://metaverse.highfidelity.com/oauth/authorize?client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Foauth&response_type=code&scope=domains",
-        "gui-only": true
-      },
       {
         "name": "access_token",
         "label": "Access Token",
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index b0d7710372..116cbc7656 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -31,7 +31,6 @@ const QString SETTING_DEFAULT_KEY = "default";
 const QString DESCRIPTION_NAME_KEY = "name";
 const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
 const QString DESCRIPTION_COLUMNS_KEY = "columns";
-const QString VALUE_GUI_ONLY_FLAG_KEY = "gui-only";
 
 const QString SETTINGS_VIEWPOINT_KEY = "viewpoint";
 
@@ -190,7 +189,7 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
 
                 QJsonObject settingObject = settingValue.toObject();
 
-                if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool() && !settingObject[VALUE_GUI_ONLY_FLAG_KEY].toBool()) {
+                if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) {
                     QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray();
                     if (affectedTypesArray.isEmpty()) {
                         affectedTypesArray = groupObject[AFFECTED_TYPES_JSON_KEY].toArray();
@@ -255,86 +254,86 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
 
 void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonValue& newValue, QVariantMap& settingMap,
                                                 const QJsonObject& settingDescription) {
-    if (!settingDescription[VALUE_GUI_ONLY_FLAG_KEY].toBool()) {
-        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);
+    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
+            QString settingType = settingDescription[SETTING_DESCRIPTION_TYPE_KEY].toString();
+            const QString INPUT_DOUBLE_TYPE = "double";
+            const QString INPUT_INTEGER_TYPE = "int";
+
+            if (settingType == INPUT_DOUBLE_TYPE) {
+                settingMap[key] = newValue.toString().toDouble();
+            } else if (settingType == INPUT_INTEGER_TYPE) {
+                settingMap[key] = newValue.toString().toInt();
             } else {
-                // make sure the resulting json value has the right type
-                QString settingType = settingDescription[SETTING_DESCRIPTION_TYPE_KEY].toString();
-                const QString INPUT_DOUBLE_TYPE = "double";
-                const QString INPUT_INTEGER_TYPE = "int";
+                QString sanitizedValue = newValue.toString();
 
-                if (settingType == INPUT_DOUBLE_TYPE) {
-                    settingMap[key] = newValue.toString().toDouble();
-                } else if (settingType == INPUT_INTEGER_TYPE) {
-                    settingMap[key] = newValue.toString().toInt();
-                } else {
-                    QString sanitizedValue = newValue.toString();
-
-                    // we perform special handling for viewpoints here
-                    // we do not want them to be prepended with a slash
-                    if (key == SETTINGS_VIEWPOINT_KEY && !sanitizedValue.startsWith('/')) {
-                        sanitizedValue.prepend('/');
-                    }
-
-                    settingMap[key] = sanitizedValue;
+                // we perform special handling for viewpoints here
+                // we do not want them to be prepended with a slash
+                if (key == SETTINGS_VIEWPOINT_KEY && !sanitizedValue.startsWith('/')) {
+                    sanitizedValue.prepend('/');
                 }
+
+                qDebug() << "Setting" << key << "in" << settingMap << "to" << sanitizedValue;
+
+                settingMap[key] = sanitizedValue;
             }
-        } 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();
-            }
+        }
+    } 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();
+        }
 
-            QVariant& possibleMap = settingMap[key];
+        QVariant& possibleMap = settingMap[key];
 
-            if (!possibleMap.canConvert(QMetaType::QVariantMap)) {
-                // if this isn't a map then we need to make it one, otherwise we're about to crash
-                qDebug() << "Value at" << key << "was not the expected QVariantMap while updating DS settings"
-                    << "- removing existing value and making it a QVariantMap";
-                possibleMap = QVariantMap();
-            }
+        if (!possibleMap.canConvert(QMetaType::QVariantMap)) {
+            // if this isn't a map then we need to make it one, otherwise we're about to crash
+            qDebug() << "Value at" << key << "was not the expected QVariantMap while updating DS settings"
+                << "- removing existing value and making it a QVariantMap";
+            possibleMap = QVariantMap();
+        }
 
-            QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(possibleMap.data());
-            foreach(const QString childKey, newValue.toObject().keys()) {
+        QVariantMap& thisMap = *reinterpret_cast<QVariantMap*>(possibleMap.data());
+        foreach(const QString childKey, newValue.toObject().keys()) {
 
-                QJsonObject childDescriptionObject = settingDescription;
+            QJsonObject childDescriptionObject = settingDescription;
 
-                // is this the key? if so we have the description already
-                if (key != settingDescription[DESCRIPTION_NAME_KEY].toString()) {
-                    // otherwise find the description object for this childKey under columns
-                    foreach(const QJsonValue& column, settingDescription[DESCRIPTION_COLUMNS_KEY].toArray()) {
-                        if (column.isObject()) {
-                            QJsonObject thisDescription = column.toObject();
-                            if (thisDescription[DESCRIPTION_NAME_KEY] == childKey) {
-                                childDescriptionObject = column.toObject();
-                                break;
-                            }
+            // is this the key? if so we have the description already
+            if (key != settingDescription[DESCRIPTION_NAME_KEY].toString()) {
+                // otherwise find the description object for this childKey under columns
+                foreach(const QJsonValue& column, settingDescription[DESCRIPTION_COLUMNS_KEY].toArray()) {
+                    if (column.isObject()) {
+                        QJsonObject thisDescription = column.toObject();
+                        if (thisDescription[DESCRIPTION_NAME_KEY] == childKey) {
+                            childDescriptionObject = column.toObject();
+                            break;
                         }
                     }
                 }
-
-                QString sanitizedKey = childKey;
-
-                if (key == SETTINGS_PATHS_KEY && !sanitizedKey.startsWith('/')) {
-                    // We perform special handling for paths here.
-                    // If we got sent a path without a leading slash then we add it.
-                    sanitizedKey.prepend("/");
-                }
-
-                updateSetting(sanitizedKey, newValue.toObject()[childKey], thisMap, childDescriptionObject);
             }
 
-            if (settingMap[key].toMap().isEmpty()) {
-                // we've cleared all of the settings below this value, so remove this one too
-                settingMap.remove(key);
+            QString sanitizedKey = childKey;
+
+            if (key == SETTINGS_PATHS_KEY && !sanitizedKey.startsWith('/')) {
+                // We perform special handling for paths here.
+                // If we got sent a path without a leading slash then we add it.
+                sanitizedKey.prepend("/");
             }
+
+            updateSetting(sanitizedKey, newValue.toObject()[childKey], thisMap, childDescriptionObject);
         }
     }
+
+    if (settingMap[key].toMap().isEmpty()) {
+        // we've cleared all of the settings below this value, so remove this one too
+        settingMap.remove(key);
+    }
 }
 
 QJsonObject DomainServerSettingsManager::settingDescriptionFromGroup(const QJsonObject& groupObject, const QString& settingName) {

From 62c0aff16a6c75f3a716c1d18a8a93c845a15952 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 13 May 2015 17:52:46 -0700
Subject: [PATCH 09/33] handle falsy values returned from valueForKeyPath

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

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index a9b246ea1a..75b578e23d 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -23,10 +23,9 @@ var Settings = {
 var viewHelpers = {
   getFormGroup: function(keypath, setting, values, isAdvanced, isLocked) {
     form_group = "<div class='form-group " + (isAdvanced ? Settings.ADVANCED_CLASS : "") + "'>";
-
     setting_value = _(values).valueForKeyPath(keypath);
 
-    if (!setting_value) {
+    if (setting_value === undefined || setting_value === null) {
       if (_.has(setting, 'default')) {
         setting_value = setting.default;
       } else {

From 52ce9af3757a003f59d59b0c54da825da72c2b3b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 13 May 2015 17:53:18 -0700
Subject: [PATCH 10/33] fix updateSetting conditionals after merge

---
 domain-server/src/DomainServerSettingsManager.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index 116cbc7656..fd356da985 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -277,8 +277,6 @@ void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonV
                     sanitizedValue.prepend('/');
                 }
 
-                qDebug() << "Setting" << key << "in" << settingMap << "to" << sanitizedValue;
-
                 settingMap[key] = sanitizedValue;
             }
         }
@@ -328,11 +326,15 @@ void DomainServerSettingsManager::updateSetting(const QString& key, const QJsonV
 
             updateSetting(sanitizedKey, newValue.toObject()[childKey], thisMap, childDescriptionObject);
         }
-    }
 
-    if (settingMap[key].toMap().isEmpty()) {
-        // we've cleared all of the settings below this value, so remove this one too
-        settingMap.remove(key);
+        if (settingMap[key].toMap().isEmpty()) {
+            // we've cleared all of the settings below this value, so remove this one too
+            settingMap.remove(key);
+        }
+    } else if (newValue.isArray()) {
+        // we just assume array is replacement
+        // TODO: we still need to recurse here with the description in case values in the array have special types
+        settingMap[key] = newValue.toArray().toVariantList();
     }
 }
 

From 033007cce615528c6c7e248eeca79495e3b0aff9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 May 2015 10:45:26 -0700
Subject: [PATCH 11/33] use viewHelpers to create HF account button

---
 domain-server/resources/web/js/settings.js | 93 ++++++++++++++--------
 1 file changed, 60 insertions(+), 33 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 75b578e23d..9c9321451f 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -38,9 +38,13 @@ var viewHelpers = {
       label_class += ' locked';
     }
 
-    common_attrs = " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
-      + " " + Settings.TRIGGER_CHANGE_CLASS + "' data-short-name='" + setting.name + "' name='" + keypath + "' "
-      + "id='" + keypath + "'";
+    function common_attrs(extra_classes) {
+      extra_classes = typeof extra_classes !== 'undefined' ? extra_classes : "";
+      return " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
+        + " " + Settings.TRIGGER_CHANGE_CLASS + " " + extra_classes + "' data-short-name='"
+        + setting.name + "' name='" + keypath + "' "
+        + "id='" + (setting.id !== 'undefined' ? setting.id : keypath) + "'";
+    }
 
     if (setting.type === 'checkbox') {
       if (setting.label) {
@@ -48,7 +52,7 @@ var viewHelpers = {
       }
       form_group += "<div class='checkbox" + (isLocked ? " disabled" : "") + "'>"
       form_group += "<label for='" + keypath + "'>"
-      form_group += "<input type='checkbox'" + common_attrs + (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
+      form_group += "<input type='checkbox'" + common_attrs() + (setting_value ? "checked" : "") + (isLocked ? " disabled" : "") + "/>"
       form_group += " " + setting.help + "</label>";
       form_group += "</div>"
     } else {
@@ -71,17 +75,17 @@ var viewHelpers = {
 
           form_group += "</select>"
 
-          form_group += "<input type='hidden'" + common_attrs + "value='" + setting_value + "'>"
+          form_group += "<input type='hidden'" + common_attrs() + "value='" + setting_value + "'>"
         } else if (input_type === 'button') {
           // Is this a button that should link to something directly?
           // If so, we use an anchor tag instead of a button tag
 
           if (setting.href) {
-            form_group += "<a href='" + setting.href + "' class='btn btn-primary form-control' style='display: block;' role='button'"
-              + common_attrs + ">"
+            form_group += "<a href='" + setting.href + "'style='display: block;' role='button"
+              + common_attrs("btn " + setting.classes) + ">"
               + setting.button_label + "</a>";
           } else {
-            form_group += "<button class='btn btn-primary form-control'" + common_attrs + ">"
+            form_group += "<button " + common_attrs("btn " + setting.classes) + ">"
               + setting.button_label + "</button>";
           }
 
@@ -91,7 +95,7 @@ var viewHelpers = {
             input_type = "text"
           }
 
-          form_group += "<input type='" + input_type + "'" +  common_attrs +
+          form_group += "<input type='" + input_type + "'" +  common_attrs() +
             "placeholder='" + (_.has(setting, 'placeholder') ? setting.placeholder : "") +
             "' value='" + setting_value + "'" + (isLocked ? " disabled" : "") + "/>"
         }
@@ -199,7 +203,49 @@ $(document).ready(function(){
   // $('body').scrollspy({ target: '#setup-sidebar'})
 
   reloadSettings();
-})
+});
+
+function setupHFAccountButton() {
+  // figure out how we should handle the HF connect button
+  var accessToken = Settings.data.values.metaverse.access_token;
+
+  // setup an object for the settings we want our button to have
+  var buttonSetting = {
+    type: 'button',
+    name: 'connected_account',
+    label: 'Connected Account',
+  }
+
+  var hasAccessToken = accessToken.length > 0;
+
+  if (hasAccessToken) {
+    buttonSetting.help = "Click the button above to clear your OAuth token and disconnect your High Fidelity account.";
+    buttonSetting.classes = "btn-danger";
+    buttonSetting.button_label = "Disconnect High Fidelity Account";
+    buttonSetting.id = "disconnect-account-btn";
+  } else {
+    buttonSetting.help = "Click the button above to connect your High Fidelity account.";
+    buttonSetting.button_label = "Connect High Fidelity Account";
+    buttonSetting.id = "connect-account-btn";
+
+
+    // This is the hard coded client ID for a localhost domain.
+    // Users who access their domain remotely will in the future need to create an OAuth application and for now
+    // will need to generate an access token the old fashioned way
+    buttonSetting.href = "https://metaverse.highfidelity.com/oauth/authorize?client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Foauth&response_type=code&scope=domains"
+  }
+
+  // use the existing getFormGroup helper to ask for a button
+  var buttonGroup = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values, false, false);
+
+  var tokenLocked = _(Settings.data).valueForKeyPath("locked.metaverse.access_token");
+  if (tokenLocked) {
+    // the access_token is locked so we should disable the connect/disconnect button and explain why it is disabled
+  }
+
+  // add the button group to the top of the metaverse panel
+  $('#metaverse .panel-body').prepend(buttonGroup);
+}
 
 function reloadSettings() {
   $.getJSON('/settings.json', function(data){
@@ -208,6 +254,7 @@ function reloadSettings() {
     $('.nav-stacked').html(Settings.sidebarTemplate(data))
     $('#panels').html(Settings.panelsTemplate(data))
 
+    Settings.data = data;
     Settings.initialValues = form2js('settings-form', ".", false, cleanupFormValues, true);
 
     // add tooltip to locked settings
@@ -218,31 +265,11 @@ function reloadSettings() {
 
     if (!_.has(data["locked"], "metaverse") && !_.has(data["locked"]["metaverse"], "id")) {
       // append the domain selection modal, as long as it's not locked
-      appendDomainSelectionModal()
-    }
-    // figure out how we should handle the HF connect button
-    var accessToken = data.values.metaverse.access_token;
-    var $oauthConnectButton = $("[name='metaverse.connected_account']");
-
-    if (!_.has(data["locked"], "metaverse") && !_.has(data["locked"]["metaverse"], "access_token")) {
-
-    } else {
-      // the access_token is locked so we should disable the connect/disconnect button and explain why it is disabled
+      appendDomainSelectionModal();
     }
 
-    if (accessToken.length > 0) {
-      // we have an access token - change the button to a disconnect button
-      $oauthConnectButton.removeClass('btn-primary');
-      $oauthConnectButton.addClass('btn-danger');
-      $oauthConnectButton.html("Disconnect High Fidelity Account");
-
-      var $helpSpan = $oauthConnectButton.next('span.help-block');
-
-      var helpText = $helpSpan.html();
-      helpText = helpText.replace("connect", "disconnect");
-
-      $helpSpan.html(helpText);
-    }
+    // call our method to setup the HF account button
+    setupHFAccountButton();
   });
 }
 

From aff83be768a408040be058390406251706cb9ca5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 May 2015 11:03:41 -0700
Subject: [PATCH 12/33] handle account disconnection from DS settings

---
 .../css/{sweet-alert.css => sweetalert.css}   | 474 ++++++++++++------
 domain-server/resources/web/header.html       |   6 +-
 domain-server/resources/web/js/settings.js    |  66 ++-
 .../resources/web/js/sweet-alert.min.js       |   1 -
 .../resources/web/js/sweetalert.min.js        |   1 +
 .../resources/web/settings/index.shtml        |   2 +-
 6 files changed, 377 insertions(+), 173 deletions(-)
 rename domain-server/resources/web/css/{sweet-alert.css => sweetalert.css} (60%)
 delete mode 100755 domain-server/resources/web/js/sweet-alert.min.js
 create mode 100755 domain-server/resources/web/js/sweetalert.min.js

diff --git a/domain-server/resources/web/css/sweet-alert.css b/domain-server/resources/web/css/sweetalert.css
similarity index 60%
rename from domain-server/resources/web/css/sweet-alert.css
rename to domain-server/resources/web/css/sweetalert.css
index 1f808f9351..bc588bce54 100755
--- a/domain-server/resources/web/css/sweet-alert.css
+++ b/domain-server/resources/web/css/sweetalert.css
@@ -1,4 +1,12 @@
+body.stop-scrolling {
+  height: 100%;
+  overflow: hidden; }
+
 .sweet-overlay {
+  background-color: black;
+  /* IE8 */
+  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
+  /* IE8 */
   background-color: rgba(0, 0, 0, 0.4);
   position: fixed;
   left: 0;
@@ -6,11 +14,11 @@
   top: 0;
   bottom: 0;
   display: none;
-  z-index: 1000; }
+  z-index: 10000; }
 
 .sweet-alert {
   background-color: white;
-  font-family: sans-serif;
+  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
   width: 478px;
   padding: 17px;
   border-radius: 5px;
@@ -22,7 +30,7 @@
   margin-top: -200px;
   overflow: hidden;
   display: none;
-  z-index: 2000; }
+  z-index: 99999; }
   @media all and (max-width: 540px) {
     .sweet-alert {
       width: auto;
@@ -36,15 +44,120 @@
     text-align: center;
     font-weight: 600;
     text-transform: none;
-    position: relative; }
+    position: relative;
+    margin: 25px 0;
+    padding: 0;
+    line-height: 40px;
+    display: block; }
   .sweet-alert p {
     color: #797979;
     font-size: 16px;
     text-align: center;
     font-weight: 300;
     position: relative;
+    text-align: inherit;
+    float: none;
     margin: 0;
+    padding: 0;
     line-height: normal; }
+  .sweet-alert fieldset {
+    border: none;
+    position: relative; }
+  .sweet-alert .sa-error-container {
+    background-color: #f1f1f1;
+    margin-left: -17px;
+    margin-right: -17px;
+    overflow: hidden;
+    padding: 0 10px;
+    max-height: 0;
+    webkit-transition: padding 0.15s, max-height 0.15s;
+    transition: padding 0.15s, max-height 0.15s; }
+    .sweet-alert .sa-error-container.show {
+      padding: 10px 0;
+      max-height: 100px;
+      webkit-transition: padding 0.2s, max-height 0.2s;
+      transition: padding 0.25s, max-height 0.25s; }
+    .sweet-alert .sa-error-container .icon {
+      display: inline-block;
+      width: 24px;
+      height: 24px;
+      border-radius: 50%;
+      background-color: #ea7d7d;
+      color: white;
+      line-height: 24px;
+      text-align: center;
+      margin-right: 3px; }
+    .sweet-alert .sa-error-container p {
+      display: inline-block; }
+  .sweet-alert .sa-input-error {
+    position: absolute;
+    top: 29px;
+    right: 26px;
+    width: 20px;
+    height: 20px;
+    opacity: 0;
+    -webkit-transform: scale(0.5);
+    transform: scale(0.5);
+    -webkit-transform-origin: 50% 50%;
+    transform-origin: 50% 50%;
+    -webkit-transition: all 0.1s;
+    transition: all 0.1s; }
+    .sweet-alert .sa-input-error::before, .sweet-alert .sa-input-error::after {
+      content: "";
+      width: 20px;
+      height: 6px;
+      background-color: #f06e57;
+      border-radius: 3px;
+      position: absolute;
+      top: 50%;
+      margin-top: -4px;
+      left: 50%;
+      margin-left: -9px; }
+    .sweet-alert .sa-input-error::before {
+      -webkit-transform: rotate(-45deg);
+      transform: rotate(-45deg); }
+    .sweet-alert .sa-input-error::after {
+      -webkit-transform: rotate(45deg);
+      transform: rotate(45deg); }
+    .sweet-alert .sa-input-error.show {
+      opacity: 1;
+      -webkit-transform: scale(1);
+      transform: scale(1); }
+  .sweet-alert input {
+    width: 100%;
+    box-sizing: border-box;
+    border-radius: 3px;
+    border: 1px solid #d7d7d7;
+    height: 43px;
+    margin-top: 10px;
+    margin-bottom: 17px;
+    font-size: 18px;
+    box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.06);
+    padding: 0 12px;
+    display: none;
+    -webkit-transition: all 0.3s;
+    transition: all 0.3s; }
+    .sweet-alert input:focus {
+      outline: none;
+      box-shadow: 0px 0px 3px #c4e6f5;
+      border: 1px solid #b4dbed; }
+      .sweet-alert input:focus::-moz-placeholder {
+        transition: opacity 0.3s 0.03s ease;
+        opacity: 0.5; }
+      .sweet-alert input:focus:-ms-input-placeholder {
+        transition: opacity 0.3s 0.03s ease;
+        opacity: 0.5; }
+      .sweet-alert input:focus::-webkit-input-placeholder {
+        transition: opacity 0.3s 0.03s ease;
+        opacity: 0.5; }
+    .sweet-alert input::-moz-placeholder {
+      color: #bdbdbd; }
+    .sweet-alert input:-ms-input-placeholder {
+      color: #bdbdbd; }
+    .sweet-alert input::-webkit-input-placeholder {
+      color: #bdbdbd; }
+  .sweet-alert.show-input input {
+    display: block; }
   .sweet-alert button {
     background-color: #AEDEF4;
     color: white;
@@ -52,6 +165,7 @@
     box-shadow: none;
     font-size: 17px;
     font-weight: 500;
+    -webkit-border-radius: 4px;
     border-radius: 5px;
     padding: 10px 32px;
     margin: 26px 5px 0 5px;
@@ -71,22 +185,29 @@
         background-color: #b6b6b6; }
       .sweet-alert button.cancel:focus {
         box-shadow: rgba(197, 205, 211, 0.8) 0px 0px 2px, rgba(0, 0, 0, 0.0470588) 0px 0px 0px 1px inset !important; }
+    .sweet-alert button::-moz-focus-inner {
+      border: 0; }
   .sweet-alert[data-has-cancel-button=false] button {
     box-shadow: none !important; }
-  .sweet-alert .icon {
+  .sweet-alert[data-has-confirm-button=false][data-has-cancel-button=false] {
+    padding-bottom: 40px; }
+  .sweet-alert .sa-icon {
     width: 80px;
     height: 80px;
     border: 4px solid gray;
+    -webkit-border-radius: 40px;
+    border-radius: 40px;
     border-radius: 50%;
     margin: 20px auto;
+    padding: 0;
     position: relative;
     box-sizing: content-box; }
-    .sweet-alert .icon.error {
+    .sweet-alert .sa-icon.sa-error {
       border-color: #F27474; }
-      .sweet-alert .icon.error .x-mark {
+      .sweet-alert .sa-icon.sa-error .sa-x-mark {
         position: relative;
         display: block; }
-      .sweet-alert .icon.error .line {
+      .sweet-alert .sa-icon.sa-error .sa-line {
         position: absolute;
         height: 5px;
         width: 47px;
@@ -94,37 +215,39 @@
         display: block;
         top: 37px;
         border-radius: 2px; }
-        .sweet-alert .icon.error .line.left {
+        .sweet-alert .sa-icon.sa-error .sa-line.sa-left {
           -webkit-transform: rotate(45deg);
           transform: rotate(45deg);
           left: 17px; }
-        .sweet-alert .icon.error .line.right {
+        .sweet-alert .sa-icon.sa-error .sa-line.sa-right {
           -webkit-transform: rotate(-45deg);
           transform: rotate(-45deg);
           right: 16px; }
-    .sweet-alert .icon.warning {
+    .sweet-alert .sa-icon.sa-warning {
       border-color: #F8BB86; }
-      .sweet-alert .icon.warning .body {
+      .sweet-alert .sa-icon.sa-warning .sa-body {
         position: absolute;
         width: 5px;
         height: 47px;
         left: 50%;
         top: 10px;
+        -webkit-border-radius: 2px;
         border-radius: 2px;
         margin-left: -2px;
         background-color: #F8BB86; }
-      .sweet-alert .icon.warning .dot {
+      .sweet-alert .sa-icon.sa-warning .sa-dot {
         position: absolute;
         width: 7px;
         height: 7px;
+        -webkit-border-radius: 50%;
         border-radius: 50%;
         margin-left: -3px;
         left: 50%;
         bottom: 10px;
         background-color: #F8BB86; }
-    .sweet-alert .icon.info {
+    .sweet-alert .sa-icon.sa-info {
       border-color: #C9DAE1; }
-      .sweet-alert .icon.info::before {
+      .sweet-alert .sa-icon.sa-info::before {
         content: "";
         position: absolute;
         width: 5px;
@@ -134,7 +257,7 @@
         border-radius: 2px;
         margin-left: -2px;
         background-color: #C9DAE1; }
-      .sweet-alert .icon.info::after {
+      .sweet-alert .sa-icon.sa-info::after {
         content: "";
         position: absolute;
         width: 7px;
@@ -143,17 +266,21 @@
         margin-left: -3px;
         top: 19px;
         background-color: #C9DAE1; }
-    .sweet-alert .icon.success {
+    .sweet-alert .sa-icon.sa-success {
       border-color: #A5DC86; }
-      .sweet-alert .icon.success::before, .sweet-alert .icon.success::after {
+      .sweet-alert .sa-icon.sa-success::before, .sweet-alert .sa-icon.sa-success::after {
         content: '';
+        -webkit-border-radius: 40px;
+        border-radius: 40px;
         border-radius: 50%;
         position: absolute;
         width: 60px;
         height: 120px;
         background: white;
+        -webkit-transform: rotate(45deg);
         transform: rotate(45deg); }
-      .sweet-alert .icon.success::before {
+      .sweet-alert .sa-icon.sa-success::before {
+        -webkit-border-radius: 120px 0 0 120px;
         border-radius: 120px 0 0 120px;
         top: -7px;
         left: -33px;
@@ -161,7 +288,8 @@
         transform: rotate(-45deg);
         -webkit-transform-origin: 60px 60px;
         transform-origin: 60px 60px; }
-      .sweet-alert .icon.success::after {
+      .sweet-alert .sa-icon.sa-success::after {
+        -webkit-border-radius: 0 120px 120px 0;
         border-radius: 0 120px 120px 0;
         top: -11px;
         left: 30px;
@@ -169,17 +297,19 @@
         transform: rotate(-45deg);
         -webkit-transform-origin: 0px 60px;
         transform-origin: 0px 60px; }
-      .sweet-alert .icon.success .placeholder {
+      .sweet-alert .sa-icon.sa-success .sa-placeholder {
         width: 80px;
         height: 80px;
         border: 4px solid rgba(165, 220, 134, 0.2);
+        -webkit-border-radius: 40px;
+        border-radius: 40px;
         border-radius: 50%;
         box-sizing: content-box;
         position: absolute;
         left: -4px;
         top: -4px;
         z-index: 2; }
-      .sweet-alert .icon.success .fix {
+      .sweet-alert .sa-icon.sa-success .sa-fix {
         width: 5px;
         height: 90px;
         background-color: white;
@@ -189,26 +319,26 @@
         z-index: 1;
         -webkit-transform: rotate(-45deg);
         transform: rotate(-45deg); }
-      .sweet-alert .icon.success .line {
+      .sweet-alert .sa-icon.sa-success .sa-line {
         height: 5px;
         background-color: #A5DC86;
         display: block;
         border-radius: 2px;
         position: absolute;
         z-index: 2; }
-        .sweet-alert .icon.success .line.tip {
+        .sweet-alert .sa-icon.sa-success .sa-line.sa-tip {
           width: 25px;
           left: 14px;
           top: 46px;
           -webkit-transform: rotate(45deg);
           transform: rotate(45deg); }
-        .sweet-alert .icon.success .line.long {
+        .sweet-alert .sa-icon.sa-success .sa-line.sa-long {
           width: 47px;
           right: 8px;
           top: 38px;
           -webkit-transform: rotate(-45deg);
           transform: rotate(-45deg); }
-    .sweet-alert .icon.custom {
+    .sweet-alert .sa-icon.sa-custom {
       background-size: contain;
       border-radius: 0;
       border: none;
@@ -222,238 +352,274 @@
   0% {
     transform: scale(0.7);
     -webkit-transform: scale(0.7); }
+
   45% {
     transform: scale(1.05);
     -webkit-transform: scale(1.05); }
+
   80% {
     transform: scale(0.95);
-    -webkit-tranform: scale(0.95); }
-  100% {
-    transform: scale(1);
-    -webkit-transform: scale(1); } }
-@-moz-keyframes showSweetAlert {
-  0% {
-    transform: scale(0.7);
-    -webkit-transform: scale(0.7); }
-  45% {
-    transform: scale(1.05);
-    -webkit-transform: scale(1.05); }
-  80% {
-    transform: scale(0.95);
-    -webkit-tranform: scale(0.95); }
+    -webkit-transform: scale(0.95); }
+
   100% {
     transform: scale(1);
     -webkit-transform: scale(1); } }
+
 @keyframes showSweetAlert {
   0% {
     transform: scale(0.7);
     -webkit-transform: scale(0.7); }
+
   45% {
     transform: scale(1.05);
     -webkit-transform: scale(1.05); }
+
   80% {
     transform: scale(0.95);
-    -webkit-tranform: scale(0.95); }
+    -webkit-transform: scale(0.95); }
+
   100% {
     transform: scale(1);
     -webkit-transform: scale(1); } }
+
 @-webkit-keyframes hideSweetAlert {
   0% {
     transform: scale(1);
     -webkit-transform: scale(1); }
+
   100% {
     transform: scale(0.5);
     -webkit-transform: scale(0.5); } }
-@-moz-keyframes hideSweetAlert {
-  0% {
-    transform: scale(1);
-    -webkit-transform: scale(1); }
-  100% {
-    transform: scale(0.5);
-    -webkit-transform: scale(0.5); } }
+
 @keyframes hideSweetAlert {
   0% {
     transform: scale(1);
     -webkit-transform: scale(1); }
+
   100% {
     transform: scale(0.5);
     -webkit-transform: scale(0.5); } }
-.showSweetAlert {
-  -webkit-animation: showSweetAlert 0.3s;
-  -moz-animation: showSweetAlert 0.3s;
-  animation: showSweetAlert 0.3s; }
 
-.hideSweetAlert {
+@-webkit-keyframes slideFromTop {
+  0% {
+    top: 0%; }
+
+  100% {
+    top: 50%; } }
+
+@keyframes slideFromTop {
+  0% {
+    top: 0%; }
+
+  100% {
+    top: 50%; } }
+
+@-webkit-keyframes slideToTop {
+  0% {
+    top: 50%; }
+
+  100% {
+    top: 0%; } }
+
+@keyframes slideToTop {
+  0% {
+    top: 50%; }
+
+  100% {
+    top: 0%; } }
+
+@-webkit-keyframes slideFromBottom {
+  0% {
+    top: 70%; }
+
+  100% {
+    top: 50%; } }
+
+@keyframes slideFromBottom {
+  0% {
+    top: 70%; }
+
+  100% {
+    top: 50%; } }
+
+@-webkit-keyframes slideToBottom {
+  0% {
+    top: 50%; }
+
+  100% {
+    top: 70%; } }
+
+@keyframes slideToBottom {
+  0% {
+    top: 50%; }
+
+  100% {
+    top: 70%; } }
+
+.showSweetAlert[data-animation=pop] {
+  -webkit-animation: showSweetAlert 0.3s;
+  animation: showSweetAlert 0.3s; }
+.showSweetAlert[data-animation=none] {
+  -webkit-animation: none;
+  animation: none; }
+.showSweetAlert[data-animation=slide-from-top] {
+  -webkit-animation: slideFromTop 0.3s;
+  animation: slideFromTop 0.3s; }
+.showSweetAlert[data-animation=slide-from-bottom] {
+  -webkit-animation: slideFromBottom 0.3s;
+  animation: slideFromBottom 0.3s; }
+
+.hideSweetAlert[data-animation=pop] {
   -webkit-animation: hideSweetAlert 0.2s;
-  -moz-animation: hideSweetAlert 0.2s;
   animation: hideSweetAlert 0.2s; }
+.hideSweetAlert[data-animation=none] {
+  -webkit-animation: none;
+  animation: none; }
+.hideSweetAlert[data-animation=slide-from-top] {
+  -webkit-animation: slideToTop 0.4s;
+  animation: slideToTop 0.4s; }
+.hideSweetAlert[data-animation=slide-from-bottom] {
+  -webkit-animation: slideToBottom 0.3s;
+  animation: slideToBottom 0.3s; }
 
 @-webkit-keyframes animateSuccessTip {
   0% {
     width: 0;
     left: 1px;
     top: 19px; }
+
   54% {
     width: 0;
     left: 1px;
     top: 19px; }
+
   70% {
     width: 50px;
     left: -8px;
     top: 37px; }
+
   84% {
     width: 17px;
     left: 21px;
     top: 48px; }
+
   100% {
     width: 25px;
     left: 14px;
     top: 45px; } }
-@-moz-keyframes animateSuccessTip {
-  0% {
-    width: 0;
-    left: 1px;
-    top: 19px; }
-  54% {
-    width: 0;
-    left: 1px;
-    top: 19px; }
-  70% {
-    width: 50px;
-    left: -8px;
-    top: 37px; }
-  84% {
-    width: 17px;
-    left: 21px;
-    top: 48px; }
-  100% {
-    width: 25px;
-    left: 14px;
-    top: 45px; } }
+
 @keyframes animateSuccessTip {
   0% {
     width: 0;
     left: 1px;
     top: 19px; }
+
   54% {
     width: 0;
     left: 1px;
     top: 19px; }
+
   70% {
     width: 50px;
     left: -8px;
     top: 37px; }
+
   84% {
     width: 17px;
     left: 21px;
     top: 48px; }
+
   100% {
     width: 25px;
     left: 14px;
     top: 45px; } }
+
 @-webkit-keyframes animateSuccessLong {
   0% {
     width: 0;
     right: 46px;
     top: 54px; }
+
   65% {
     width: 0;
     right: 46px;
     top: 54px; }
+
   84% {
     width: 55px;
     right: 0px;
     top: 35px; }
+
   100% {
     width: 47px;
     right: 8px;
     top: 38px; } }
-@-moz-keyframes animateSuccessLong {
-  0% {
-    width: 0;
-    right: 46px;
-    top: 54px; }
-  65% {
-    width: 0;
-    right: 46px;
-    top: 54px; }
-  84% {
-    width: 55px;
-    right: 0px;
-    top: 35px; }
-  100% {
-    width: 47px;
-    right: 8px;
-    top: 38px; } }
+
 @keyframes animateSuccessLong {
   0% {
     width: 0;
     right: 46px;
     top: 54px; }
+
   65% {
     width: 0;
     right: 46px;
     top: 54px; }
+
   84% {
     width: 55px;
     right: 0px;
     top: 35px; }
+
   100% {
     width: 47px;
     right: 8px;
     top: 38px; } }
+
 @-webkit-keyframes rotatePlaceholder {
   0% {
     transform: rotate(-45deg);
     -webkit-transform: rotate(-45deg); }
+
   5% {
     transform: rotate(-45deg);
     -webkit-transform: rotate(-45deg); }
+
   12% {
     transform: rotate(-405deg);
     -webkit-transform: rotate(-405deg); }
+
   100% {
     transform: rotate(-405deg);
     -webkit-transform: rotate(-405deg); } }
-@-moz-keyframes rotatePlaceholder {
-  0% {
-    transform: rotate(-45deg);
-    -webkit-transform: rotate(-45deg); }
-  5% {
-    transform: rotate(-45deg);
-    -webkit-transform: rotate(-45deg); }
-  12% {
-    transform: rotate(-405deg);
-    -webkit-transform: rotate(-405deg); }
-  100% {
-    transform: rotate(-405deg);
-    -webkit-transform: rotate(-405deg); } }
+
 @keyframes rotatePlaceholder {
   0% {
     transform: rotate(-45deg);
     -webkit-transform: rotate(-45deg); }
+
   5% {
     transform: rotate(-45deg);
     -webkit-transform: rotate(-45deg); }
+
   12% {
     transform: rotate(-405deg);
     -webkit-transform: rotate(-405deg); }
+
   100% {
     transform: rotate(-405deg);
     -webkit-transform: rotate(-405deg); } }
+
 .animateSuccessTip {
   -webkit-animation: animateSuccessTip 0.75s;
-  -moz-animation: animateSuccessTip 0.75s;
   animation: animateSuccessTip 0.75s; }
 
 .animateSuccessLong {
   -webkit-animation: animateSuccessLong 0.75s;
-  -moz-animation: animateSuccessLong 0.75s;
   animation: animateSuccessLong 0.75s; }
 
-.icon.success.animate::after {
+.sa-icon.sa-success.animate::after {
   -webkit-animation: rotatePlaceholder 4.25s ease-in;
-  -moz-animation: rotatePlaceholder 4.25s ease-in;
   animation: rotatePlaceholder 4.25s ease-in; }
 
 @-webkit-keyframes animateErrorIcon {
@@ -461,31 +627,25 @@
     transform: rotateX(100deg);
     -webkit-transform: rotateX(100deg);
     opacity: 0; }
+
   100% {
     transform: rotateX(0deg);
     -webkit-transform: rotateX(0deg);
     opacity: 1; } }
-@-moz-keyframes animateErrorIcon {
-  0% {
-    transform: rotateX(100deg);
-    -webkit-transform: rotateX(100deg);
-    opacity: 0; }
-  100% {
-    transform: rotateX(0deg);
-    -webkit-transform: rotateX(0deg);
-    opacity: 1; } }
+
 @keyframes animateErrorIcon {
   0% {
     transform: rotateX(100deg);
     -webkit-transform: rotateX(100deg);
     opacity: 0; }
+
   100% {
     transform: rotateX(0deg);
     -webkit-transform: rotateX(0deg);
     opacity: 1; } }
+
 .animateErrorIcon {
   -webkit-animation: animateErrorIcon 0.5s;
-  -moz-animation: animateErrorIcon 0.5s;
   animation: animateErrorIcon 0.5s; }
 
 @-webkit-keyframes animateXMark {
@@ -494,108 +654,104 @@
     -webkit-transform: scale(0.4);
     margin-top: 26px;
     opacity: 0; }
+
   50% {
     transform: scale(0.4);
     -webkit-transform: scale(0.4);
     margin-top: 26px;
     opacity: 0; }
+
   80% {
     transform: scale(1.15);
     -webkit-transform: scale(1.15);
     margin-top: -6px; }
+
   100% {
     transform: scale(1);
     -webkit-transform: scale(1);
     margin-top: 0;
     opacity: 1; } }
-@-moz-keyframes animateXMark {
-  0% {
-    transform: scale(0.4);
-    -webkit-transform: scale(0.4);
-    margin-top: 26px;
-    opacity: 0; }
-  50% {
-    transform: scale(0.4);
-    -webkit-transform: scale(0.4);
-    margin-top: 26px;
-    opacity: 0; }
-  80% {
-    transform: scale(1.15);
-    -webkit-transform: scale(1.15);
-    margin-top: -6px; }
-  100% {
-    transform: scale(1);
-    -webkit-transform: scale(1);
-    margin-top: 0;
-    opacity: 1; } }
+
 @keyframes animateXMark {
   0% {
     transform: scale(0.4);
     -webkit-transform: scale(0.4);
     margin-top: 26px;
     opacity: 0; }
+
   50% {
     transform: scale(0.4);
     -webkit-transform: scale(0.4);
     margin-top: 26px;
     opacity: 0; }
+
   80% {
     transform: scale(1.15);
     -webkit-transform: scale(1.15);
     margin-top: -6px; }
+
   100% {
     transform: scale(1);
     -webkit-transform: scale(1);
     margin-top: 0;
     opacity: 1; } }
+
 .animateXMark {
   -webkit-animation: animateXMark 0.5s;
-  -moz-animation: animateXMark 0.5s;
   animation: animateXMark 0.5s; }
 
-/*@include keyframes(simpleRotate) {
-	0%		{ transform: rotateY(0deg);    }
-  100% 	{ transform: rotateY(-360deg); }
-}
-.simpleRotate {
-	@include animation('simpleRotate 0.75s');
-}*/
 @-webkit-keyframes pulseWarning {
   0% {
     border-color: #F8D486; }
+
   100% {
     border-color: #F8BB86; } }
-@-moz-keyframes pulseWarning {
-  0% {
-    border-color: #F8D486; }
-  100% {
-    border-color: #F8BB86; } }
+
 @keyframes pulseWarning {
   0% {
     border-color: #F8D486; }
+
   100% {
     border-color: #F8BB86; } }
+
 .pulseWarning {
   -webkit-animation: pulseWarning 0.75s infinite alternate;
-  -moz-animation: pulseWarning 0.75s infinite alternate;
   animation: pulseWarning 0.75s infinite alternate; }
 
 @-webkit-keyframes pulseWarningIns {
   0% {
     background-color: #F8D486; }
+
   100% {
     background-color: #F8BB86; } }
-@-moz-keyframes pulseWarningIns {
-  0% {
-    background-color: #F8D486; }
-  100% {
-    background-color: #F8BB86; } }
+
 @keyframes pulseWarningIns {
   0% {
     background-color: #F8D486; }
+
   100% {
     background-color: #F8BB86; } }
+
 .pulseWarningIns {
   -webkit-animation: pulseWarningIns 0.75s infinite alternate;
-  -moz-animation: pulseWarningIns 0.75s infinite alternate;
   animation: pulseWarningIns 0.75s infinite alternate; }
+
+/* Internet Explorer 9 has some special quirks that are fixed here */
+/* The icons are not animated. */
+/* This file is automatically merged into sweet-alert.min.js through Gulp */
+/* Error icon */
+.sweet-alert .sa-icon.sa-error .sa-line.sa-left {
+  -ms-transform: rotate(45deg) \9; }
+
+.sweet-alert .sa-icon.sa-error .sa-line.sa-right {
+  -ms-transform: rotate(-45deg) \9; }
+
+/* Success icon */
+.sweet-alert .sa-icon.sa-success {
+  border-color: transparent\9; }
+
+.sweet-alert .sa-icon.sa-success .sa-line.sa-tip {
+  -ms-transform: rotate(45deg) \9; }
+
+.sweet-alert .sa-icon.sa-success .sa-line.sa-long {
+  -ms-transform: rotate(-45deg) \9; }
diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html
index 6924583d86..4a75279e8f 100644
--- a/domain-server/resources/web/header.html
+++ b/domain-server/resources/web/header.html
@@ -3,10 +3,10 @@
   <head>
     <title>domain-server</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    
+
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/style.css" rel="stylesheet" media="screen">
-    <link href="/css/sweet-alert.css" rel="stylesheet" media="screen">
+    <link href="/css/sweetalert.css" rel="stylesheet" media="screen">
     <link href="/stats/css/json.human.css" rel="stylesheet" media="screen">
   </head>
   <body>
@@ -22,7 +22,7 @@
           </button>
           <a class="navbar-brand" href="/">domain-server</a>
         </div>
-        
+
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
           <ul class="nav navbar-nav">
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 9c9321451f..273d35b1d8 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -17,7 +17,8 @@ var Settings = {
   ADD_DEL_BUTTONS_CLASSES: 'buttons add-del-buttons',
   REORDER_BUTTONS_CLASS: 'reorder-buttons',
   REORDER_BUTTONS_CLASSES: 'buttons reorder-buttons',
-  NEW_ROW_CLASS: 'new-row'
+  NEW_ROW_CLASS: 'new-row',
+  DISCONNECT_ACCOUNT_BTN_ID: 'disconnect-account-btn'
 };
 
 var viewHelpers = {
@@ -81,7 +82,7 @@ var viewHelpers = {
           // If so, we use an anchor tag instead of a button tag
 
           if (setting.href) {
-            form_group += "<a href='" + setting.href + "'style='display: block;' role='button"
+            form_group += "<a href='" + setting.href + "'style='display: block;' role='button'"
               + common_attrs("btn " + setting.classes) + ">"
               + setting.button_label + "</a>";
           } else {
@@ -176,23 +177,28 @@ $(document).ready(function(){
     var advancedSelector = $('.' + Settings.ADVANCED_CLASS)
 
     if (Settings.showAdvanced) {
-      advancedSelector.show()
+      advancedSelector.show();
       $(this).html("Hide advanced")
     } else {
-      advancedSelector.hide()
+      advancedSelector.hide();
       $(this).html("Show advanced")
     }
 
-    $(this).blur()
+    $(this).blur();
   })
 
   $('#settings-form').on('click', '#choose-domain-btn', function(){
     chooseFromHighFidelityDomains($(this))
-  })
+  });
 
   $('#settings-form').on('change', 'select', function(){
     $("input[name='" +  $(this).attr('data-hidden-input') + "']").val($(this).val()).change()
-  })
+  });
+
+  $('#settings-form').on('click', '#' + Settings.DISCONNECT_ACCOUNT_BTN_ID, function(e){
+    disonnectHighFidelityAccount();
+    e.preventDefault();
+  });
 
   var panelsSource = $('#panels-template').html()
   Settings.panelsTemplate = _.template(panelsSource)
@@ -222,9 +228,10 @@ function setupHFAccountButton() {
     buttonSetting.help = "Click the button above to clear your OAuth token and disconnect your High Fidelity account.";
     buttonSetting.classes = "btn-danger";
     buttonSetting.button_label = "Disconnect High Fidelity Account";
-    buttonSetting.id = "disconnect-account-btn";
+    buttonSetting.id = Settings.DISCONNECT_ACCOUNT_BTN_ID;
   } else {
     buttonSetting.help = "Click the button above to connect your High Fidelity account.";
+    buttonSetting.classes = "btn-primary";
     buttonSetting.button_label = "Connect High Fidelity Account";
     buttonSetting.id = "connect-account-btn";
 
@@ -247,6 +254,47 @@ function setupHFAccountButton() {
   $('#metaverse .panel-body').prepend(buttonGroup);
 }
 
+function disonnectHighFidelityAccount() {
+  // the user clicked on the disconnect account btn - give them a sweet alert to make sure this is what they want to do
+  swal({
+    title: "Are you sure?",
+    text: "This will remove your domain-server OAuth access token."
+      + "</br></br>This could cause your domain to appear offline and no longer be reachable via any place names.",
+    type: "warning",
+    html: true,
+    showCancelButton: true,
+    closeOnConfirm: false
+  }, function(){
+    // we need to post to settings to clear the access-token
+    // setup that object
+
+    var clearAccessToken = {
+      "metaverse": {
+        "access_token": ""
+      }
+    };
+
+    swal.close();
+
+    // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+    $.ajax('/settings.json', {
+      data: JSON.stringify(clearAccessToken),
+      contentType: 'application/json',
+      type: 'POST'
+    }).done(function(data){
+      if (data.status == "success") {
+        showRestartModal();
+      } else {
+        showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
+        reloadSettings();
+      }
+    }).fail(function(){
+      showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
+      reloadSettings();
+    });
+  });
+}
+
 function reloadSettings() {
   $.getJSON('/settings.json', function(data){
     _.extend(data, viewHelpers)
@@ -404,7 +452,7 @@ function makeTable(setting, keypath, setting_value, isLocked) {
     html += "</tr>"
 
     row_num++
-  })
+  });
 
   // populate inputs in the table for new values
   if (!isLocked) {
diff --git a/domain-server/resources/web/js/sweet-alert.min.js b/domain-server/resources/web/js/sweet-alert.min.js
deleted file mode 100755
index 6775a82da8..0000000000
--- a/domain-server/resources/web/js/sweet-alert.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e,t){function n(){var e='<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="icon error"><span class="x-mark"><span class="line left"></span><span class="line right"></span></span></div><div class="icon warning"> <span class="body"></span> <span class="dot"></span> </div> <div class="icon info"></div> <div class="icon success"> <span class="line tip"></span> <span class="line long"></span> <div class="placeholder"></div> <div class="fix"></div> </div> <div class="icon custom"></div> <h2>Title</h2><p>Text</p><button class="cancel" tabIndex="2">Cancel</button><button class="confirm" tabIndex="1">OK</button></div>',n=t.createElement("div");n.innerHTML=e,t.body.appendChild(n)}function o(t){var n=y(),o=n.querySelector("h2"),r=n.querySelector("p"),a=n.querySelector("button.cancel"),c=n.querySelector("button.confirm");if(o.innerHTML=b(t.title).split("\n").join("<br>"),r.innerHTML=b(t.text||"").split("\n").join("<br>"),t.text&&w(r),x(n.querySelectorAll(".icon")),t.type){for(var l=!1,s=0;s<f.length;s++)if(t.type===f[s]){l=!0;break}if(!l)return e.console.error("Unknown alert type: "+t.type),!1;var u=n.querySelector(".icon."+t.type);switch(w(u),t.type){case"success":g(u,"animate"),g(u.querySelector(".tip"),"animateSuccessTip"),g(u.querySelector(".long"),"animateSuccessLong");break;case"error":g(u,"animateErrorIcon"),g(u.querySelector(".x-mark"),"animateXMark");break;case"warning":g(u,"pulseWarning"),g(u.querySelector(".body"),"pulseWarningIns"),g(u.querySelector(".dot"),"pulseWarningIns")}}if(t.imageUrl){var d=n.querySelector(".icon.custom");d.style.backgroundImage="url("+t.imageUrl+")",w(d);var p=80,m=80;if(t.imageSize){var v=t.imageSize.split("x")[0],h=t.imageSize.split("x")[1];v&&h?(p=v,m=h,d.css({width:v+"px",height:h+"px"})):e.console.error("Parameter imageSize expects value with format WIDTHxHEIGHT, got "+t.imageSize)}d.setAttribute("style",d.getAttribute("style")+"width:"+p+"px; height:"+m+"px")}n.setAttribute("data-has-cancel-button",t.showCancelButton),t.showCancelButton?a.style.display="inline-block":x(a),t.cancelButtonText&&(a.innerHTML=b(t.cancelButtonText)),t.confirmButtonText&&(c.innerHTML=b(t.confirmButtonText)),c.style.backgroundColor=t.confirmButtonColor,i(c,t.confirmButtonColor),n.setAttribute("data-allow-ouside-click",t.allowOutsideClick);var S=t.doneFunction?!0:!1;n.setAttribute("data-has-done-function",S)}function r(e,t){e=String(e).replace(/[^0-9a-f]/gi,""),e.length<6&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]),t=t||0;var n="#",o,r;for(r=0;3>r;r++)o=parseInt(e.substr(2*r,2),16),o=Math.round(Math.min(Math.max(0,o+o*t),255)).toString(16),n+=("00"+o).substr(o.length);return n}function a(e){var t=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e);return t?parseInt(t[1],16)+", "+parseInt(t[2],16)+", "+parseInt(t[3],16):null}function i(e,t){var n=a(t);e.style.boxShadow="0 0 2px rgba("+n+", 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)"}function c(){var e=y();B(p(),10),w(e),g(e,"showSweetAlert"),v(e,"hideSweetAlert"),I=t.activeElement;var n=e.querySelector("button.confirm");n.focus(),setTimeout(function(){g(e,"visible")},500)}function l(){var n=y();T(p(),5),T(n,5),v(n,"showSweetAlert"),g(n,"hideSweetAlert"),v(n,"visible");var o=n.querySelector(".icon.success");v(o,"animate"),v(o.querySelector(".tip"),"animateSuccessTip"),v(o.querySelector(".long"),"animateSuccessLong");var r=n.querySelector(".icon.error");v(r,"animateErrorIcon"),v(r.querySelector(".x-mark"),"animateXMark");var a=n.querySelector(".icon.warning");v(a,"pulseWarning"),v(a.querySelector(".body"),"pulseWarningIns"),v(a.querySelector(".dot"),"pulseWarningIns"),e.onkeydown=M,t.onclick=A,I&&I.focus(),L=void 0}function s(){var e=y();e.style.marginTop=C(y())}var u=".sweet-alert",d=".sweet-overlay",f=["error","warning","info","success"],y=function(){return t.querySelector(u)},p=function(){return t.querySelector(d)},m=function(e,t){return new RegExp(" "+t+" ").test(" "+e.className+" ")},g=function(e,t){m(e,t)||(e.className+=" "+t)},v=function(e,t){var n=" "+e.className.replace(/[\t\r\n]/g," ")+" ";if(m(e,t)){for(;n.indexOf(" "+t+" ")>=0;)n=n.replace(" "+t+" "," ");e.className=n.replace(/^\s+|\s+$/g,"")}},b=function(e){var n=t.createElement("div");return n.appendChild(t.createTextNode(e)),n.innerHTML},h=function(e){e.style.opacity="",e.style.display="block"},w=function(e){if(e&&!e.length)return h(e);for(var t=0;t<e.length;++t)h(e[t])},S=function(e){e.style.opacity="",e.style.display="none"},x=function(e){if(e&&!e.length)return S(e);for(var t=0;t<e.length;++t)S(e[t])},k=function(e,t){for(var n=t.parentNode;null!==n;){if(n===e)return!0;n=n.parentNode}return!1},C=function(e){e.style.left="-9999px",e.style.display="block";var t=e.clientHeight,n=parseInt(getComputedStyle(e).getPropertyValue("padding"),10);return e.style.left="",e.style.display="none","-"+parseInt(t/2+n)+"px"},B=function(e,t){t=t||16,e.style.opacity=0,e.style.display="block";var n=+new Date,o=function(){e.style.opacity=+e.style.opacity+(new Date-n)/100,n=+new Date,+e.style.opacity<1&&setTimeout(o,t)};o()},T=function(e,t){t=t||16,e.style.opacity=1;var n=+new Date,o=function(){e.style.opacity=+e.style.opacity-(new Date-n)/100,n=+new Date,+e.style.opacity>0?setTimeout(o,t):e.style.display="none"};o()},E=function(n){if(MouseEvent){var o=new MouseEvent("click",{view:e,bubbles:!1,cancelable:!0});n.dispatchEvent(o)}else if(t.createEvent){var r=t.createEvent("MouseEvents");r.initEvent("click",!1,!1),n.dispatchEvent(r)}else t.createEventObject?n.fireEvent("onclick"):"function"==typeof n.onclick&&n.onclick()},q=function(t){"function"==typeof t.stopPropagation?(t.stopPropagation(),t.preventDefault()):e.event&&e.event.hasOwnProperty("cancelBubble")&&(e.event.cancelBubble=!0)},I,A,M,L;e.sweetAlert=e.swal=function(){function n(e){var t=e.keyCode||e.which;if(-1!==[9,13,32,27].indexOf(t)){for(var n=e.target||e.srcElement,o=-1,r=0;r<h.length;r++)if(n===h[r]){o=r;break}9===t?(n=-1===o?v:o===h.length-1?h[0]:h[o+1],q(e),n.focus(),i(n,u.confirmButtonColor)):(n=13===t||32===t?-1===o?v:void 0:27!==t||b.hidden||"none"===b.style.display?void 0:b,void 0!==n&&E(n,e))}}function a(e){var t=e.target||e.srcElement,n=e.relatedTarget,o=m(d,"visible");if(o){var r=-1;if(null!==n){for(var a=0;a<h.length;a++)if(n===h[a]){r=a;break}-1===r&&t.focus()}else L=t}}var u={title:"",text:"",type:null,allowOutsideClick:!1,showCancelButton:!1,confirmButtonText:"OK",confirmButtonColor:"#AEDEF4",cancelButtonText:"Cancel",imageUrl:null,imageSize:null};if(void 0===arguments[0])return e.console.error("sweetAlert expects at least 1 attribute!"),!1;switch(typeof arguments[0]){case"string":u.title=arguments[0],u.text=arguments[1]||"",u.type=arguments[2]||"";break;case"object":if(void 0===arguments[0].title)return e.console.error('Missing "title" argument!'),!1;u.title=arguments[0].title,u.text=arguments[0].text||u.text,u.type=arguments[0].type||u.type,u.allowOutsideClick=arguments[0].allowOutsideClick||u.allowOutsideClick,u.showCancelButton=arguments[0].showCancelButton||u.showCancelButton,u.confirmButtonText=u.showCancelButton?"Confirm":u.confirmButtonText,u.confirmButtonText=arguments[0].confirmButtonText||u.confirmButtonText,u.confirmButtonColor=arguments[0].confirmButtonColor||u.confirmButtonColor,u.cancelButtonText=arguments[0].cancelButtonText||u.cancelButtonText,u.imageUrl=arguments[0].imageUrl||u.imageUrl,u.imageSize=arguments[0].imageSize||u.imageSize,u.doneFunction=arguments[1]||null;break;default:return e.console.error('Unexpected type of argument! Expected "string" or "object", got '+typeof arguments[0]),!1}o(u),s(),c();for(var d=y(),f=function(e){var t=e.target||e.srcElement,n="confirm"===t.className,o=m(d,"visible"),a=u.doneFunction&&"true"===d.getAttribute("data-has-done-function");switch(e.type){case"mouseover":n&&(e.target.style.backgroundColor=r(u.confirmButtonColor,-.04));break;case"mouseout":n&&(e.target.style.backgroundColor=u.confirmButtonColor);break;case"mousedown":n&&(e.target.style.backgroundColor=r(u.confirmButtonColor,-.14));break;case"mouseup":n&&(e.target.style.backgroundColor=r(u.confirmButtonColor,-.04));break;case"focus":var i=d.querySelector("button.confirm"),c=d.querySelector("button.cancel");n?c.style.boxShadow="none":i.style.boxShadow="none";break;case"click":n&&a&&o&&u.doneFunction(),l()}},p=d.querySelectorAll("button"),g=0;g<p.length;g++)p[g].onclick=f,p[g].onmouseover=f,p[g].onmouseout=f,p[g].onmousedown=f,p[g].onfocus=f;A=t.onclick,t.onclick=function(e){var t=e.target||e.srcElement,n=d===t,o=k(d,e.target),r=m(d,"visible"),a="true"===d.getAttribute("data-allow-ouside-click");!n&&!o&&r&&a&&l()};var v=d.querySelector("button.confirm"),b=d.querySelector("button.cancel"),h=d.querySelectorAll("button:not([type=hidden])");M=e.onkeydown,e.onkeydown=n,v.onblur=a,b.onblur=a,e.onfocus=function(){e.setTimeout(function(){void 0!==L&&(L.focus(),L=void 0)},0)}},function(){"complete"===t.readyState||"interactive"===t.readyState?n():t.addEventListener?t.addEventListener("DOMContentLoaded",function e(){t.removeEventListener("DOMContentLoaded",arguments.callee,!1),n()},!1):t.attachEvent&&t.attachEvent("onreadystatechange",function(){"complete"===t.readyState&&(t.detachEvent("onreadystatechange",arguments.callee),n())})}()}(window,document);
\ No newline at end of file
diff --git a/domain-server/resources/web/js/sweetalert.min.js b/domain-server/resources/web/js/sweetalert.min.js
new file mode 100755
index 0000000000..d81d1e906b
--- /dev/null
+++ b/domain-server/resources/web/js/sweetalert.min.js
@@ -0,0 +1 @@
+!function(e,t,n){"use strict";!function o(e,t,n){function a(s,l){if(!t[s]){if(!e[s]){var i="function"==typeof require&&require;if(!l&&i)return i(s,!0);if(r)return r(s,!0);var u=new Error("Cannot find module '"+s+"'");throw u.code="MODULE_NOT_FOUND",u}var c=t[s]={exports:{}};e[s][0].call(c.exports,function(t){var n=e[s][1][t];return a(n?n:t)},c,c.exports,o,e,t,n)}return t[s].exports}for(var r="function"==typeof require&&require,s=0;s<n.length;s++)a(n[s]);return a}({1:[function(o,a){var r,s,l,i,u=function(e){return e&&e.__esModule?e:{"default":e}},c=o("./modules/handle-dom"),d=o("./modules/utils"),f=o("./modules/handle-swal-dom"),p=o("./modules/handle-click"),m=o("./modules/handle-key"),v=u(m),y=o("./modules/default-params"),h=u(y),g=o("./modules/set-params"),b=u(g);l=i=function(){function o(e){var t=a;return t[e]===n?h["default"][e]:t[e]}var a=arguments[0];if(c.addClass(t.body,"stop-scrolling"),f.resetInput(),a===n)return d.logStr("SweetAlert expects at least 1 attribute!"),!1;var l=d.extend({},h["default"]);switch(typeof a){case"string":l.title=a,l.text=arguments[1]||"",l.type=arguments[2]||"";break;case"object":if(a.title===n)return d.logStr('Missing "title" argument!'),!1;l.title=a.title;for(var i in h["default"])l[i]=o(i);l.confirmButtonText=l.showCancelButton?"Confirm":h["default"].confirmButtonText,l.confirmButtonText=o("confirmButtonText"),l.doneFunction=arguments[1]||null;break;default:return d.logStr('Unexpected type of argument! Expected "string" or "object", got '+typeof a),!1}b["default"](l),f.fixVerticalPosition(),f.openModal();for(var u=f.getModal(),m=u.querySelectorAll("button"),y=["onclick","onmouseover","onmouseout","onmousedown","onmouseup","onfocus"],g=function(e){return p.handleButton(e,l,u)},w=0;w<m.length;w++)for(var C=0;C<y.length;C++){var S=y[C];m[w][S]=g}f.getOverlay().onclick=g,r=e.onkeydown;var x=function(e){return v["default"](e,l,u)};e.onkeydown=x,e.onfocus=function(){setTimeout(function(){s!==n&&(s.focus(),s=n)},0)}},l.setDefaults=i.setDefaults=function(e){if(!e)throw new Error("userParams is required");if("object"!=typeof e)throw new Error("userParams has to be a object");d.extend(h["default"],e)},l.close=i.close=function(){var o=f.getModal();c.fadeOut(f.getOverlay(),5),c.fadeOut(o,5),c.removeClass(o,"showSweetAlert"),c.addClass(o,"hideSweetAlert"),c.removeClass(o,"visible");var a=o.querySelector(".sa-icon.sa-success");c.removeClass(a,"animate"),c.removeClass(a.querySelector(".sa-tip"),"animateSuccessTip"),c.removeClass(a.querySelector(".sa-long"),"animateSuccessLong");var l=o.querySelector(".sa-icon.sa-error");c.removeClass(l,"animateErrorIcon"),c.removeClass(l.querySelector(".sa-x-mark"),"animateXMark");var i=o.querySelector(".sa-icon.sa-warning");return c.removeClass(i,"pulseWarning"),c.removeClass(i.querySelector(".sa-body"),"pulseWarningIns"),c.removeClass(i.querySelector(".sa-dot"),"pulseWarningIns"),c.removeClass(t.body,"stop-scrolling"),e.onkeydown=r,e.previousActiveElement&&e.previousActiveElement.focus(),s=n,clearTimeout(o.timeout),!0},l.showInputError=i.showInputError=function(e){var t=f.getModal(),n=t.querySelector(".sa-input-error");c.addClass(n,"show");var o=t.querySelector(".sa-error-container");c.addClass(o,"show"),o.querySelector("p").innerHTML=e,t.querySelector("input").focus()},l.resetInputError=i.resetInputError=function(e){if(e&&13===e.keyCode)return!1;var t=f.getModal(),n=t.querySelector(".sa-input-error");c.removeClass(n,"show");var o=t.querySelector(".sa-error-container");c.removeClass(o,"show")},"function"==typeof define&&define.amd?define(function(){return l}):"undefined"!=typeof e?e.sweetAlert=e.swal=l:"undefined"!=typeof a&&a.exports&&(a.exports=l)},{"./modules/default-params":2,"./modules/handle-click":3,"./modules/handle-dom":4,"./modules/handle-key":5,"./modules/handle-swal-dom":6,"./modules/set-params":8,"./modules/utils":9}],2:[function(e,t,n){Object.defineProperty(n,"__esModule",{value:!0});var o={title:"",text:"",type:null,allowOutsideClick:!1,showConfirmButton:!0,showCancelButton:!1,closeOnConfirm:!0,closeOnCancel:!0,confirmButtonText:"OK",confirmButtonColor:"#AEDEF4",cancelButtonText:"Cancel",imageUrl:null,imageSize:null,timer:null,customClass:"",html:!1,animation:!0,allowEscapeKey:!0,inputType:"text",inputPlaceholder:""};n["default"]=o,t.exports=n["default"]},{}],3:[function(t,n,o){Object.defineProperty(o,"__esModule",{value:!0});var a=t("./utils"),r=(t("./handle-swal-dom"),t("./handle-dom")),s=function(t,n,o){function s(e){m&&n.confirmButtonColor&&(p.style.backgroundColor=e)}var u,c,d,f=t||e.event,p=f.target||f.srcElement,m=-1!==p.className.indexOf("confirm"),v=-1!==p.className.indexOf("sweet-overlay"),y=r.hasClass(o,"visible"),h=n.doneFunction&&"true"===o.getAttribute("data-has-done-function");switch(m&&n.confirmButtonColor&&(u=n.confirmButtonColor,c=a.colorLuminance(u,-.04),d=a.colorLuminance(u,-.14)),f.type){case"mouseover":s(c);break;case"mouseout":s(u);break;case"mousedown":s(d);break;case"mouseup":s(c);break;case"focus":var g=o.querySelector("button.confirm"),b=o.querySelector("button.cancel");m?b.style.boxShadow="none":g.style.boxShadow="none";break;case"click":var w=o===p,C=r.isDescendant(o,p);if(!w&&!C&&y&&!n.allowOutsideClick)break;m&&h&&y?l(o,n):h&&y||v?i(o,n):r.isDescendant(o,p)&&"BUTTON"===p.tagName&&sweetAlert.close()}},l=function(e,t){var n=!0;r.hasClass(e,"show-input")&&(n=e.querySelector("input").value,n||(n="")),t.doneFunction(n),t.closeOnConfirm&&sweetAlert.close()},i=function(e,t){var n=String(t.doneFunction).replace(/\s/g,""),o="function("===n.substring(0,9)&&")"!==n.substring(9,10);o&&t.doneFunction(!1),t.closeOnCancel&&sweetAlert.close()};o["default"]={handleButton:s,handleConfirm:l,handleCancel:i},n.exports=o["default"]},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],4:[function(n,o,a){Object.defineProperty(a,"__esModule",{value:!0});var r=function(e,t){return new RegExp(" "+t+" ").test(" "+e.className+" ")},s=function(e,t){r(e,t)||(e.className+=" "+t)},l=function(e,t){var n=" "+e.className.replace(/[\t\r\n]/g," ")+" ";if(r(e,t)){for(;n.indexOf(" "+t+" ")>=0;)n=n.replace(" "+t+" "," ");e.className=n.replace(/^\s+|\s+$/g,"")}},i=function(e){var n=t.createElement("div");return n.appendChild(t.createTextNode(e)),n.innerHTML},u=function(e){e.style.opacity="",e.style.display="block"},c=function(e){if(e&&!e.length)return u(e);for(var t=0;t<e.length;++t)u(e[t])},d=function(e){e.style.opacity="",e.style.display="none"},f=function(e){if(e&&!e.length)return d(e);for(var t=0;t<e.length;++t)d(e[t])},p=function(e,t){for(var n=t.parentNode;null!==n;){if(n===e)return!0;n=n.parentNode}return!1},m=function(e){e.style.left="-9999px",e.style.display="block";var t,n=e.clientHeight;return t="undefined"!=typeof getComputedStyle?parseInt(getComputedStyle(e).getPropertyValue("padding-top"),10):parseInt(e.currentStyle.padding),e.style.left="",e.style.display="none","-"+parseInt((n+t)/2)+"px"},v=function(e,t){if(+e.style.opacity<1){t=t||16,e.style.opacity=0,e.style.display="block";var n=+new Date,o=function(e){function t(){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(){e.style.opacity=+e.style.opacity+(new Date-n)/100,n=+new Date,+e.style.opacity<1&&setTimeout(o,t)});o()}e.style.display="block"},y=function(e,t){t=t||16,e.style.opacity=1;var n=+new Date,o=function(e){function t(){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(){e.style.opacity=+e.style.opacity-(new Date-n)/100,n=+new Date,+e.style.opacity>0?setTimeout(o,t):e.style.display="none"});o()},h=function(n){if("function"==typeof MouseEvent){var o=new MouseEvent("click",{view:e,bubbles:!1,cancelable:!0});n.dispatchEvent(o)}else if(t.createEvent){var a=t.createEvent("MouseEvents");a.initEvent("click",!1,!1),n.dispatchEvent(a)}else t.createEventObject?n.fireEvent("onclick"):"function"==typeof n.onclick&&n.onclick()},g=function(t){"function"==typeof t.stopPropagation?(t.stopPropagation(),t.preventDefault()):e.event&&e.event.hasOwnProperty("cancelBubble")&&(e.event.cancelBubble=!0)};a.hasClass=r,a.addClass=s,a.removeClass=l,a.escapeHtml=i,a._show=u,a.show=c,a._hide=d,a.hide=f,a.isDescendant=p,a.getTopMargin=m,a.fadeIn=v,a.fadeOut=y,a.fireClick=h,a.stopEventPropagation=g},{}],5:[function(t,o,a){Object.defineProperty(a,"__esModule",{value:!0});var r=t("./handle-dom"),s=t("./handle-swal-dom"),l=function(t,o,a){var l=t||e.event,i=l.keyCode||l.which,u=a.querySelector("button.confirm"),c=a.querySelector("button.cancel"),d=a.querySelectorAll("button[tabindex]");if(-1!==[9,13,32,27].indexOf(i)){for(var f=l.target||l.srcElement,p=-1,m=0;m<d.length;m++)if(f===d[m]){p=m;break}9===i?(f=-1===p?u:p===d.length-1?d[0]:d[p+1],r.stopEventPropagation(l),f.focus(),o.confirmButtonColor&&s.setFocusStyle(f,o.confirmButtonColor)):13===i?("INPUT"===f.tagName&&(f=u,u.focus()),f=-1===p?u:n):27===i&&o.allowEscapeKey===!0?(f=c,r.fireClick(f,l)):f=n}};a["default"]=l,o.exports=a["default"]},{"./handle-dom":4,"./handle-swal-dom":6}],6:[function(n,o,a){var r=function(e){return e&&e.__esModule?e:{"default":e}};Object.defineProperty(a,"__esModule",{value:!0});var s=n("./utils"),l=n("./handle-dom"),i=n("./default-params"),u=r(i),c=n("./injected-html"),d=r(c),f=".sweet-alert",p=".sweet-overlay",m=function(){var e=t.createElement("div");for(e.innerHTML=d["default"];e.firstChild;)t.body.appendChild(e.firstChild)},v=function(e){function t(){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(){var e=t.querySelector(f);return e||(m(),e=v()),e}),y=function(){var e=v();return e?e.querySelector("input"):void 0},h=function(){return t.querySelector(p)},g=function(e,t){var n=s.hexToRgb(t);e.style.boxShadow="0 0 2px rgba("+n+", 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)"},b=function(){var n=v();l.fadeIn(h(),10),l.show(n),l.addClass(n,"showSweetAlert"),l.removeClass(n,"hideSweetAlert"),e.previousActiveElement=t.activeElement;var o=n.querySelector("button.confirm");o.focus(),setTimeout(function(){l.addClass(n,"visible")},500);var a=n.getAttribute("data-timer");"null"!==a&&""!==a&&(n.timeout=setTimeout(function(){swal.close()},a))},w=function(){var e=v(),t=y();l.removeClass(e,"show-input"),t.value="",t.setAttribute("type",u["default"].inputType),t.setAttribute("placeholder",u["default"].inputPlaceholder),C()},C=function(e){if(e&&13===e.keyCode)return!1;var t=v(),n=t.querySelector(".sa-input-error");l.removeClass(n,"show");var o=t.querySelector(".sa-error-container");l.removeClass(o,"show")},S=function(){var e=v();e.style.marginTop=l.getTopMargin(v())};a.sweetAlertInitialize=m,a.getModal=v,a.getOverlay=h,a.getInput=y,a.setFocusStyle=g,a.openModal=b,a.resetInput=w,a.resetInputError=C,a.fixVerticalPosition=S},{"./default-params":2,"./handle-dom":4,"./injected-html":7,"./utils":9}],7:[function(e,t,n){Object.defineProperty(n,"__esModule",{value:!0});var o='<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert"><div class="sa-icon sa-error">\n      <span class="sa-x-mark">\n        <span class="sa-line sa-left"></span>\n        <span class="sa-line sa-right"></span>\n      </span>\n    </div><div class="sa-icon sa-warning">\n      <span class="sa-body"></span>\n      <span class="sa-dot"></span>\n    </div><div class="sa-icon sa-info"></div><div class="sa-icon sa-success">\n      <span class="sa-line sa-tip"></span>\n      <span class="sa-line sa-long"></span>\n\n      <div class="sa-placeholder"></div>\n      <div class="sa-fix"></div>\n    </div><div class="sa-icon sa-custom"></div><h2>Title</h2>\n    <p>Text</p>\n    <fieldset>\n      <input type="text" tabIndex="3" />\n      <div class="sa-input-error"></div>\n    </fieldset><div class="sa-error-container">\n      <div class="icon">!</div>\n      <p>Not valid!</p>\n    </div><div class="sa-button-container">\n      <button class="cancel" tabIndex="2">Cancel</button>\n      <button class="confirm" tabIndex="1">OK</button>\n    </div></div>';n["default"]=o,t.exports=n["default"]},{}],8:[function(e,t,o){Object.defineProperty(o,"__esModule",{value:!0});var a=e("./utils"),r=e("./handle-swal-dom"),s=e("./handle-dom"),l=["error","warning","info","success","input","prompt"],i=function(e){var t=r.getModal(),o=t.querySelector("h2"),i=t.querySelector("p"),u=t.querySelector("button.cancel"),c=t.querySelector("button.confirm");if(o.innerHTML=e.html?e.title:s.escapeHtml(e.title).split("\n").join("<br>"),i.innerHTML=e.html?e.text:s.escapeHtml(e.text||"").split("\n").join("<br>"),e.text&&s.show(i),e.customClass)s.addClass(t,e.customClass),t.setAttribute("data-custom-class",e.customClass);else{var d=t.getAttribute("data-custom-class");s.removeClass(t,d),t.setAttribute("data-custom-class","")}if(s.hide(t.querySelectorAll(".sa-icon")),e.type&&!a.isIE8()){var f=function(){for(var o=!1,a=0;a<l.length;a++)if(e.type===l[a]){o=!0;break}if(!o)return logStr("Unknown alert type: "+e.type),{v:!1};var i=["success","error","warning","info"],u=n;-1!==i.indexOf(e.type)&&(u=t.querySelector(".sa-icon.sa-"+e.type),s.show(u));var c=r.getInput();switch(e.type){case"success":s.addClass(u,"animate"),s.addClass(u.querySelector(".sa-tip"),"animateSuccessTip"),s.addClass(u.querySelector(".sa-long"),"animateSuccessLong");break;case"error":s.addClass(u,"animateErrorIcon"),s.addClass(u.querySelector(".sa-x-mark"),"animateXMark");break;case"warning":s.addClass(u,"pulseWarning"),s.addClass(u.querySelector(".sa-body"),"pulseWarningIns"),s.addClass(u.querySelector(".sa-dot"),"pulseWarningIns");break;case"input":case"prompt":c.setAttribute("type",e.inputType),c.setAttribute("placeholder",e.inputPlaceholder),s.addClass(t,"show-input"),setTimeout(function(){c.focus(),c.addEventListener("keyup",swal.resetInputError)},400)}}();if("object"==typeof f)return f.v}if(e.imageUrl){var p=t.querySelector(".sa-icon.sa-custom");p.style.backgroundImage="url("+e.imageUrl+")",s.show(p);var m=80,v=80;if(e.imageSize){var y=e.imageSize.toString().split("x"),h=y[0],g=y[1];h&&g?(m=h,v=g):logStr("Parameter imageSize expects value with format WIDTHxHEIGHT, got "+e.imageSize)}p.setAttribute("style",p.getAttribute("style")+"width:"+m+"px; height:"+v+"px")}t.setAttribute("data-has-cancel-button",e.showCancelButton),e.showCancelButton?u.style.display="inline-block":s.hide(u),t.setAttribute("data-has-confirm-button",e.showConfirmButton),e.showConfirmButton?c.style.display="inline-block":s.hide(c),e.cancelButtonText&&(u.innerHTML=s.escapeHtml(e.cancelButtonText)),e.confirmButtonText&&(c.innerHTML=s.escapeHtml(e.confirmButtonText)),e.confirmButtonColor&&(c.style.backgroundColor=e.confirmButtonColor,r.setFocusStyle(c,e.confirmButtonColor)),t.setAttribute("data-allow-outside-click",e.allowOutsideClick);var b=e.doneFunction?!0:!1;t.setAttribute("data-has-done-function",b),e.animation?"string"==typeof e.animation?t.setAttribute("data-animation",e.animation):t.setAttribute("data-animation","pop"):t.setAttribute("data-animation","none"),t.setAttribute("data-timer",e.timer)};o["default"]=i,t.exports=o["default"]},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],9:[function(t,n,o){Object.defineProperty(o,"__esModule",{value:!0});var a=function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},r=function(e){var t=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e);return t?parseInt(t[1],16)+", "+parseInt(t[2],16)+", "+parseInt(t[3],16):null},s=function(){return e.attachEvent&&!e.addEventListener},l=function(t){e.console&&e.console.log("SweetAlert: "+t)},i=function(e,t){e=String(e).replace(/[^0-9a-f]/gi,""),e.length<6&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]),t=t||0;var n,o,a="#";for(o=0;3>o;o++)n=parseInt(e.substr(2*o,2),16),n=Math.round(Math.min(Math.max(0,n+n*t),255)).toString(16),a+=("00"+n).substr(n.length);return a};o.extend=a,o.hexToRgb=r,o.isIE8=s,o.logStr=l,o.colorLuminance=i},{}]},{},[1])}(window,document);
\ 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 c94073d106..9dfca3b7af 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -99,7 +99,7 @@
 <script src='/js/underscore-min.js'></script>
 <script src='/js/underscore-keypath.min.js'></script>
 <script src='/js/bootbox.min.js'></script>
-<script src='/js/sweet-alert.min.js'></script>
+<script src='/js/sweetalert.min.js'></script>
 <script src='/js/settings.js'></script>
 <script src='/js/form2js.min.js'></script>
 <!--#include virtual="page-end.html"-->

From fabe19a92c57d37ed9fd1bc1cdbd26fa9348fef1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 May 2015 11:19:07 -0700
Subject: [PATCH 13/33] ask for OAuth token directly

---
 .../resources/web/js/query-string.js          |  5 +++
 domain-server/resources/web/js/settings.js    | 10 +++--
 domain-server/resources/web/js/setup.js       | 33 ----------------
 domain-server/resources/web/stats/index.shtml |  1 +
 domain-server/resources/web/stats/js/stats.js | 38 ++++++++-----------
 5 files changed, 28 insertions(+), 59 deletions(-)
 create mode 100644 domain-server/resources/web/js/query-string.js
 delete mode 100644 domain-server/resources/web/js/setup.js

diff --git a/domain-server/resources/web/js/query-string.js b/domain-server/resources/web/js/query-string.js
new file mode 100644
index 0000000000..7bf8f2dda1
--- /dev/null
+++ b/domain-server/resources/web/js/query-string.js
@@ -0,0 +1,5 @@
+function qs(key) {
+    key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, "\\$&"); // escape RegEx meta chars
+    var match = location.search.match(new RegExp("[?&]"+key+"=([^&]+)(&|$)"));
+    return match && decodeURIComponent(match[1].replace(/\+/g, " "));
+}
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 273d35b1d8..26df779626 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='form-group " + (isAdvanced ? Settings.ADVANCED_CLASS : "") + "'>";
     setting_value = _(values).valueForKeyPath(keypath);
 
-    if (setting_value === undefined || setting_value === null) {
+    if (typeof setting_value == 'undefined' || setting_value === null) {
       if (_.has(setting, 'default')) {
         setting_value = setting.default;
       } else {
@@ -40,11 +40,11 @@ var viewHelpers = {
     }
 
     function common_attrs(extra_classes) {
-      extra_classes = typeof extra_classes !== 'undefined' ? extra_classes : "";
+      extra_classes = (typeof extra_classes !== 'undefined' ? extra_classes : "");
       return " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
         + " " + Settings.TRIGGER_CHANGE_CLASS + " " + extra_classes + "' data-short-name='"
         + setting.name + "' name='" + keypath + "' "
-        + "id='" + (setting.id !== 'undefined' ? setting.id : keypath) + "'";
+        + "id='" + (typeof setting.id !== 'undefined' ? setting.id : keypath) + "'";
     }
 
     if (setting.type === 'checkbox') {
@@ -239,7 +239,9 @@ function setupHFAccountButton() {
     // This is the hard coded client ID for a localhost domain.
     // Users who access their domain remotely will in the future need to create an OAuth application and for now
     // will need to generate an access token the old fashioned way
-    buttonSetting.href = "https://metaverse.highfidelity.com/oauth/authorize?client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Foauth&response_type=code&scope=domains"
+    buttonSetting.href = "https://metaverse.highfidelity.com/oauth/authorize?" +
+      "client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4" +
+      "&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Foauth&response_type=token&scope=domains"
   }
 
   // use the existing getFormGroup helper to ask for a button
diff --git a/domain-server/resources/web/js/setup.js b/domain-server/resources/web/js/setup.js
deleted file mode 100644
index 2f49fc0cc9..0000000000
--- a/domain-server/resources/web/js/setup.js
+++ /dev/null
@@ -1,33 +0,0 @@
-$(document).ready(function(){
-  /*
-  * Clamped-width. 
-  * Usage:
-  *  <div data-clampedwidth=".myParent">This long content will force clamped width</div>
-  *
-  * Author: LV
-  */
-  
-  $('[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);
-      };
-
-      resizeFn();
-      $(window).resize(resizeFn);
-  });
-  
-  
-  var listSource = $('#list-group-template').html();
-  var listTemplate = _.template(listSource);
-
-  reloadSettings();
-
-  function reloadSettings() {
-    $.getJSON('describe-setup.json', function(data){
-      $('.list-group').html(listTemplate(data));
-    });
-  }
-});
\ No newline at end of file
diff --git a/domain-server/resources/web/stats/index.shtml b/domain-server/resources/web/stats/index.shtml
index 13967d4e36..c60f156cea 100644
--- a/domain-server/resources/web/stats/index.shtml
+++ b/domain-server/resources/web/stats/index.shtml
@@ -5,6 +5,7 @@
 </div>
 <div class="col-xs-12" id="stats-container"></div>
 <!--#include virtual="footer.html"-->
+<script src='/js/query-string.js'></script>
 <script src='js/stats.js'></script>
 <script src='js/json.human.js'></script>
 <script src='js/highcharts-custom.js'></script>
diff --git a/domain-server/resources/web/stats/js/stats.js b/domain-server/resources/web/stats/js/stats.js
index 9b6fdb217b..1ad824aa53 100644
--- a/domain-server/resources/web/stats/js/stats.js
+++ b/domain-server/resources/web/stats/js/stats.js
@@ -1,24 +1,18 @@
-function qs(key) {
-    key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, "\\$&"); // escape RegEx meta chars
-    var match = location.search.match(new RegExp("[?&]"+key+"=([^&]+)(&|$)"));
-    return match && decodeURIComponent(match[1].replace(/\+/g, " "));
-}
-
 $(document).ready(function(){
   var currentHighchart;
 
   // setup a function to grab the nodeStats
   function getNodeStats() {
-    
+
     var uuid = qs("uuid");
-    
+
     $.getJSON("/nodes/" + uuid + ".json", function(json){
-      
+
       // update the table header with the right node type
       $('#stats-lead h3').html(json.node_type + " stats (" + uuid + ")");
-      
+
       delete json.node_type;
-      
+
       var stats = JsonHuman.format(json);
 
       $('#stats-container').html(stats);
@@ -27,33 +21,33 @@ $(document).ready(function(){
         var x = (new Date()).getTime();
 
         // get the last value using underscore-keypath
-        var y = _(json).valueForKeyPath(graphKeypath); 
-        
+        var y = _(json).valueForKeyPath(graphKeypath);
+
         // start shifting the chart once we hit 20 data points
         var shift = currentHighchart.series[0].data.length > 20;
         currentHighchart.series[0].addPoint([x, y], true, shift);
-      } 
+      }
     }).fail(function(data) {
       $('#stats-container th').each(function(){
         $(this).addClass('stale');
       });
-    });    
+    });
   }
-  
+
   // do the first GET on page load
   getNodeStats();
   // grab the new assignments JSON every second
   var getNodeStatsInterval = setInterval(getNodeStats, 1000);
-  
+
   var graphKeypath = "";
-  
+
   // set the global Highcharts option
   Highcharts.setOptions({
     global: {
       useUTC: false
     }
   });
-  
+
   // add a function to help create the graph modal
   function createGraphModal() {
     var chartModal = bootbox.dialog({
@@ -66,7 +60,7 @@ $(document).ready(function(){
     chartModal.on('hidden.bs.modal', function(e) {
       currentHighchart.destroy();
       currentHighchart = null;
-    }); 
+    });
 
     currentHighchart = new Highcharts.Chart({
       chart: {
@@ -94,11 +88,11 @@ $(document).ready(function(){
       }]
     });
   }
- 
+
   // handle clicks on numerical values - this lets the user show a line graph in a modal
   $('#stats-container').on('click', '.jh-type-number', function(){
     graphKeypath = $(this).data('keypath');
-    
+
     // setup the new graph modal
     createGraphModal();
   });

From 4de006f9b93d434591997e7a45280ae22f225db9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 May 2015 12:22:23 -0700
Subject: [PATCH 14/33] handle OAuth access token retrieval

---
 domain-server/resources/web/js/settings.js    | 100 ++++++++++++------
 domain-server/src/DomainServer.cpp            |  14 ++-
 domain-server/src/DomainServer.h              |   4 +-
 .../src/DomainServerSettingsManager.cpp       |   8 +-
 .../src/DomainServerSettingsManager.h         |   3 +
 5 files changed, 88 insertions(+), 41 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 26df779626..8ef8c97408 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -129,23 +129,26 @@ $(document).ready(function(){
 
     resizeFn();
     $(window).resize(resizeFn);
-  })
+  });
+
+  // check if we have a new access token to post to the domain-server
+  checkForNewAccessToken();
 
   $('#settings-form').on('click', '.' + Settings.ADD_ROW_BUTTON_CLASS, function(){
     addTableRow(this);
-  })
+  });
 
   $('#settings-form').on('click', '.' + Settings.DEL_ROW_BUTTON_CLASS, function(){
     deleteTableRow(this);
-  })
+  });
 
   $('#settings-form').on('click', '.' + Settings.MOVE_UP_BUTTON_CLASS, function(){
     moveTableRow(this, true);
-  })
+  });
 
   $('#settings-form').on('click', '.' + Settings.MOVE_DOWN_BUTTON_CLASS, function(){
     moveTableRow(this, false);
-  })
+  });
 
   $('#settings-form').on('keypress', 'table input', function(e){
     if (e.keyCode == 13) {
@@ -211,6 +214,40 @@ $(document).ready(function(){
   reloadSettings();
 });
 
+function urlFragment() {
+  var fragmentString = location.hash.substr(1);
+  var fragment = {};
+  var fragmentItemStrings = fragmentString.split('&');
+  for (var i in fragmentItemStrings) {
+    var fragmentItem = fragmentItemStrings[i].split('=');
+    if (fragmentItem.length !== 2) {
+      continue;
+    }
+    fragment[fragmentItem[0]] = fragmentItem[1];
+  }
+
+  return fragment;
+}
+
+function postSettings(jsonSettings) {
+  // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
+  $.ajax('/settings.json', {
+    data: JSON.stringify(jsonSettings),
+    contentType: 'application/json',
+    type: 'POST'
+  }).done(function(data){
+    if (data.status == "success") {
+      showRestartModal();
+    } else {
+      showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
+      reloadSettings();
+    }
+  }).fail(function(){
+    showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
+    reloadSettings();
+  });
+}
+
 function setupHFAccountButton() {
   // figure out how we should handle the HF connect button
   var accessToken = Settings.data.values.metaverse.access_token;
@@ -241,7 +278,7 @@ function setupHFAccountButton() {
     // will need to generate an access token the old fashioned way
     buttonSetting.href = "https://metaverse.highfidelity.com/oauth/authorize?" +
       "client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4" +
-      "&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Foauth&response_type=token&scope=domains"
+      "&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Fsettings%2F&response_type=token&scope=domains"
   }
 
   // use the existing getFormGroup helper to ask for a button
@@ -256,6 +293,31 @@ function setupHFAccountButton() {
   $('#metaverse .panel-body').prepend(buttonGroup);
 }
 
+function postNewAccessToken(access_token) {
+  var newAccessToken = {
+      "metaverse": {
+        "access_token": access_token
+      }
+    };
+
+    postSettings(newAccessToken);
+}
+
+function checkForNewAccessToken() {
+  // check the fragment for an access token
+  var fragment = urlFragment();
+  var access_token = fragment['access_token'];
+
+  if (typeof access_token !== 'undefined') {
+    // clear the fragment before we refresh
+    window.location.hash = "";
+
+    // we have an access token - send that up to the domain-server
+    postNewAccessToken(access_token);
+  }
+}
+
+
 function disonnectHighFidelityAccount() {
   // the user clicked on the disconnect account btn - give them a sweet alert to make sure this is what they want to do
   swal({
@@ -268,32 +330,10 @@ function disonnectHighFidelityAccount() {
     closeOnConfirm: false
   }, function(){
     // we need to post to settings to clear the access-token
-    // setup that object
-
-    var clearAccessToken = {
-      "metaverse": {
-        "access_token": ""
-      }
-    };
+    postNewAccessToken("");
 
+    // close the sweet-alert
     swal.close();
-
-    // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
-    $.ajax('/settings.json', {
-      data: JSON.stringify(clearAccessToken),
-      contentType: 'application/json',
-      type: 'POST'
-    }).done(function(data){
-      if (data.status == "success") {
-        showRestartModal();
-      } else {
-        showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
-        reloadSettings();
-      }
-    }).fail(function(){
-      showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
-      reloadSettings();
-    });
   });
 }
 
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 0b42f78fe2..253236e45b 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -279,13 +279,15 @@ void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
 }
 
 bool DomainServer::didSetupAccountManagerWithAccessToken() {
-    AccountManager& accountManager = AccountManager::getInstance();
-
-    if (accountManager.hasValidAccessToken()) {
+    if (AccountManager::getInstance().hasValidAccessToken()) {
         // we already gave the account manager a valid access token
         return true;
     }
 
+    return resetAccountManagerAccessToken();
+}
+
+bool DomainServer::resetAccountManagerAccessToken() {
     if (!_oauthProviderURL.isEmpty()) {
         // check for an access-token in our settings, can optionally be overidden by env value
         const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token";
@@ -310,7 +312,7 @@ bool DomainServer::didSetupAccountManagerWithAccessToken() {
         }
 
         // give this access token to the AccountManager
-        accountManager.setAccessTokenForCurrentAuthURL(accessToken);
+        AccountManager::getInstance().setAccessTokenForCurrentAuthURL(accessToken);
 
         return true;
 
@@ -1509,12 +1511,15 @@ QString pathForAssignmentScript(const QUuid& assignmentUUID) {
     return newPath;
 }
 
+const QString URI_OAUTH = "/oauth";
+
 bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url, bool skipSubHandler) {
     const QString JSON_MIME_TYPE = "application/json";
 
     const QString URI_ASSIGNMENT = "/assignment";
     const QString URI_ASSIGNMENT_SCRIPTS = URI_ASSIGNMENT + "/scripts";
     const QString URI_NODES = "/nodes";
+    const QString URI_SETTINGS = "/settings";
 
     const QString UUID_REGEX_STRING = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
 
@@ -1792,7 +1797,6 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
 const QString HIFI_SESSION_COOKIE_KEY = "DS_WEB_SESSION_UUID";
 
 bool DomainServer::handleHTTPSRequest(HTTPSConnection* connection, const QUrl &url, bool skipSubHandler) {
-    const QString URI_OAUTH = "/oauth";
     qDebug() << "HTTPS request received at" << url.toString();
     if (url.path() == URI_OAUTH) {
 
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 3863084191..9e9d3f13f3 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -72,9 +72,11 @@ private:
     void setupNodeListAndAssignments(const QUuid& sessionUUID = QUuid::createUuid());
     bool optionallySetupOAuth();
     bool optionallyReadX509KeyAndCertificate();
-    bool didSetupAccountManagerWithAccessToken();
     bool optionallySetupAssignmentPayment();
 
+    bool didSetupAccountManagerWithAccessToken();
+    bool resetAccountManagerAccessToken();
+
     void setupAutomaticNetworking();
     void sendHeartbeatToDataServer(const QString& networkAddress);
     void processICEPingReply(const QByteArray& packet, const HifiSockAddr& senderSockAddr);
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index fd356da985..9e98c09093 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -101,10 +101,8 @@ QVariant DomainServerSettingsManager::valueOrDefaultValueForKeyPath(const QStrin
     return QVariant();
 }
 
-const QString SETTINGS_PATH = "/settings.json";
-
 bool DomainServerSettingsManager::handlePublicHTTPRequest(HTTPConnection* connection, const QUrl &url) {
-    if (connection->requestOperation() == QNetworkAccessManager::GetOperation && url.path() == SETTINGS_PATH) {
+    if (connection->requestOperation() == QNetworkAccessManager::GetOperation && url.path() == SETTINGS_PATH_JSON) {
         // this is a GET operation for our settings
 
         // check if there is a query parameter for settings affecting a particular type of assignment
@@ -127,7 +125,7 @@ bool DomainServerSettingsManager::handlePublicHTTPRequest(HTTPConnection* connec
 }
 
 bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection *connection, const QUrl &url) {
-    if (connection->requestOperation() == QNetworkAccessManager::PostOperation && url.path() == SETTINGS_PATH) {
+    if (connection->requestOperation() == QNetworkAccessManager::PostOperation && url.path() == SETTINGS_PATH_JSON) {
         // this is a POST operation to change one or more settings
         QJsonDocument postedDocument = QJsonDocument::fromJson(connection->requestContent());
         QJsonObject postedObject = postedDocument.object();
@@ -149,7 +147,7 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
         QTimer::singleShot(DOMAIN_SERVER_RESTART_TIMER_MSECS, qApp, SLOT(restart()));
 
         return true;
-    } else if (connection->requestOperation() == QNetworkAccessManager::GetOperation && url.path() == SETTINGS_PATH) {
+    } else if (connection->requestOperation() == QNetworkAccessManager::GetOperation && url.path() == SETTINGS_PATH_JSON) {
         // setup a JSON Object with descriptions and non-omitted settings
         const QString SETTINGS_RESPONSE_DESCRIPTION_KEY = "descriptions";
         const QString SETTINGS_RESPONSE_VALUE_KEY = "values";
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 450baf66ae..32cfcbcb4d 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -20,6 +20,9 @@
 
 const QString SETTINGS_PATHS_KEY = "paths";
 
+const QString SETTINGS_PATH = "/settings";
+const QString SETTINGS_PATH_JSON = SETTINGS_PATH + ".json";
+
 class DomainServerSettingsManager : public QObject {
     Q_OBJECT
 public:

From a668ea7a4cab1066b99a6931fd2ceed669cccdcb Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 May 2015 12:53:23 -0700
Subject: [PATCH 15/33] remove a blank line

---
 domain-server/resources/web/js/settings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 8ef8c97408..40c278b136 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -317,7 +317,6 @@ function checkForNewAccessToken() {
   }
 }
 
-
 function disonnectHighFidelityAccount() {
   // the user clicked on the disconnect account btn - give them a sweet alert to make sure this is what they want to do
   swal({

From 5645fdc8b92d9e1ffed69ca79bbd3261c65e195a Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 May 2015 15:21:33 -0700
Subject: [PATCH 16/33] send user to token creation page

---
 .../resources/describe-settings.json          |  2 +-
 domain-server/resources/web/js/settings.js    | 26 ++-----------------
 domain-server/src/DomainServer.cpp            |  3 ++-
 .../src/DomainServerSettingsManager.h         |  1 +
 libraries/networking/src/AccountManager.h     |  6 ++---
 5 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index c6139d3767..252f1d05f6 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -6,7 +6,7 @@
       {
         "name": "access_token",
         "label": "Access Token",
-        "help": "This is your OAuth access token to connect this domain-server with your High Fidelity account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>Alternatively, you can go to the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</a> page of your account and generate a token with the 'domains' scope and paste it here.",
+        "help": "This is your OAuth access token to connect this domain-server with your High Fidelity account. <br/>It can be generated by clicking the 'Connect Account' button above.<br/>You can also go to the <a href='https://metaverse.highfidelity.com/user/security' target='_blank'>My Security</a> page of your account and generate a token with the 'domains' scope and paste it here.",
         "advanced": true
       },
       {
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 40c278b136..a6cb936581 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -83,7 +83,7 @@ var viewHelpers = {
 
           if (setting.href) {
             form_group += "<a href='" + setting.href + "'style='display: block;' role='button'"
-              + common_attrs("btn " + setting.classes) + ">"
+              + common_attrs("btn " + setting.classes) + " target='_blank' onclick='this.blur();'>"
               + setting.button_label + "</a>";
           } else {
             form_group += "<button " + common_attrs("btn " + setting.classes) + ">"
@@ -131,9 +131,6 @@ $(document).ready(function(){
     $(window).resize(resizeFn);
   });
 
-  // check if we have a new access token to post to the domain-server
-  checkForNewAccessToken();
-
   $('#settings-form').on('click', '.' + Settings.ADD_ROW_BUTTON_CLASS, function(){
     addTableRow(this);
   });
@@ -273,12 +270,7 @@ function setupHFAccountButton() {
     buttonSetting.id = "connect-account-btn";
 
 
-    // This is the hard coded client ID for a localhost domain.
-    // Users who access their domain remotely will in the future need to create an OAuth application and for now
-    // will need to generate an access token the old fashioned way
-    buttonSetting.href = "https://metaverse.highfidelity.com/oauth/authorize?" +
-      "client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4" +
-      "&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Fsettings%2F&response_type=token&scope=domains"
+    buttonSetting.href = "http://localhost:3000/user/tokens/new?for_domain_server=true";
   }
 
   // use the existing getFormGroup helper to ask for a button
@@ -303,20 +295,6 @@ function postNewAccessToken(access_token) {
     postSettings(newAccessToken);
 }
 
-function checkForNewAccessToken() {
-  // check the fragment for an access token
-  var fragment = urlFragment();
-  var access_token = fragment['access_token'];
-
-  if (typeof access_token !== 'undefined') {
-    // clear the fragment before we refresh
-    window.location.hash = "";
-
-    // we have an access token - send that up to the domain-server
-    postNewAccessToken(access_token);
-  }
-}
-
 function disonnectHighFidelityAccount() {
   // the user clicked on the disconnect account btn - give them a sweet alert to make sure this is what they want to do
   swal({
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 253236e45b..4075ad133b 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -287,10 +287,11 @@ bool DomainServer::didSetupAccountManagerWithAccessToken() {
     return resetAccountManagerAccessToken();
 }
 
+const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token";
+
 bool DomainServer::resetAccountManagerAccessToken() {
     if (!_oauthProviderURL.isEmpty()) {
         // check for an access-token in our settings, can optionally be overidden by env value
-        const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token";
         const QString ENV_ACCESS_TOKEN_KEY = "DOMAIN_SERVER_ACCESS_TOKEN";
 
         QString accessToken = QProcessEnvironment::systemEnvironment().value(ENV_ACCESS_TOKEN_KEY);
diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h
index 32cfcbcb4d..cf9c0525c8 100644
--- a/domain-server/src/DomainServerSettingsManager.h
+++ b/domain-server/src/DomainServerSettingsManager.h
@@ -33,6 +33,7 @@ public:
     void setupConfigMap(const QStringList& argumentList);
     QVariant valueOrDefaultValueForKeyPath(const QString& keyPath);
 
+    QVariantMap& getUserSettingsMap() { return _configMap.getUserConfig(); }
     QVariantMap& getSettingsMap() { return _configMap.getMergedConfig(); }
 private:
     QJsonObject responseObjectForType(const QString& typeValue, bool isAuthenticated = false);
diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h
index b9c85d71e0..719279b0cf 100644
--- a/libraries/networking/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@@ -65,7 +65,7 @@ public:
     const QUrl& getAuthURL() const { return _authURL; }
     void setAuthURL(const QUrl& authURL);
     bool hasAuthEndpoint() { return !_authURL.isEmpty(); }
-    
+
     void disableSettingsFilePersistence() { _shouldPersistToSettingsFile = false; }
 
     bool isLoggedIn() { return !_authURL.isEmpty() && hasValidAccessToken(); }
@@ -79,7 +79,7 @@ public:
 
 public slots:
     void requestAccessToken(const QString& login, const QString& password);
-    
+
     void requestAccessTokenFinished();
     void requestProfileFinished();
     void requestAccessTokenError(QNetworkReply::NetworkError error);
@@ -105,7 +105,7 @@ private:
     AccountManager();
     AccountManager(AccountManager const& other); // not implemented
     void operator=(AccountManager const& other); // not implemented
-    
+
     void persistAccountToSettings();
 
     void passSuccessToCallback(QNetworkReply* reply);

From 20940b55ba58d2bd9a7a4e5296e2e498286cdb2f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 May 2015 15:47:20 -0700
Subject: [PATCH 17/33] handle access token storage via sweet-alert

---
 domain-server/resources/web/js/settings.js | 80 ++++++++++++----------
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index a6cb936581..010662b4ef 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -1,5 +1,6 @@
 var Settings = {
   showAdvanced: false,
+  METAVERSE_URL: 'http://localhost:3000/',
   ADVANCED_CLASS: 'advanced-setting',
   TRIGGER_CHANGE_CLASS: 'trigger-change',
   DATA_ROW_CLASS: 'value-row',
@@ -18,6 +19,7 @@ var Settings = {
   REORDER_BUTTONS_CLASS: 'reorder-buttons',
   REORDER_BUTTONS_CLASSES: 'buttons reorder-buttons',
   NEW_ROW_CLASS: 'new-row',
+  CONNECT_ACCOUNT_BTN_ID: 'connect-account-btn',
   DISCONNECT_ACCOUNT_BTN_ID: 'disconnect-account-btn'
 };
 
@@ -83,7 +85,7 @@ var viewHelpers = {
 
           if (setting.href) {
             form_group += "<a href='" + setting.href + "'style='display: block;' role='button'"
-              + common_attrs("btn " + setting.classes) + " target='_blank' onclick='this.blur();'>"
+              + common_attrs("btn " + setting.classes) + " target='_blank'>"
               + setting.button_label + "</a>";
           } else {
             form_group += "<button " + common_attrs("btn " + setting.classes) + ">"
@@ -200,6 +202,11 @@ $(document).ready(function(){
     e.preventDefault();
   });
 
+  $('#settings-form').on('click', '#' + Settings.CONNECT_ACCOUNT_BTN_ID, function(e){
+    $(this).blur();
+    prepareAccessTokenPrompt();
+  });
+
   var panelsSource = $('#panels-template').html()
   Settings.panelsTemplate = _.template(panelsSource)
 
@@ -211,21 +218,6 @@ $(document).ready(function(){
   reloadSettings();
 });
 
-function urlFragment() {
-  var fragmentString = location.hash.substr(1);
-  var fragment = {};
-  var fragmentItemStrings = fragmentString.split('&');
-  for (var i in fragmentItemStrings) {
-    var fragmentItem = fragmentItemStrings[i].split('=');
-    if (fragmentItem.length !== 2) {
-      continue;
-    }
-    fragment[fragmentItem[0]] = fragmentItem[1];
-  }
-
-  return fragment;
-}
-
 function postSettings(jsonSettings) {
   // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
   $.ajax('/settings.json', {
@@ -267,10 +259,9 @@ function setupHFAccountButton() {
     buttonSetting.help = "Click the button above to connect your High Fidelity account.";
     buttonSetting.classes = "btn-primary";
     buttonSetting.button_label = "Connect High Fidelity Account";
-    buttonSetting.id = "connect-account-btn";
+    buttonSetting.id = Settings.CONNECT_ACCOUNT_BTN_ID;
 
-
-    buttonSetting.href = "http://localhost:3000/user/tokens/new?for_domain_server=true";
+    buttonSetting.href = Settings.METAVERSE_URL + "/user/tokens/new?for_domain_server=true";
   }
 
   // use the existing getFormGroup helper to ask for a button
@@ -314,6 +305,32 @@ function disonnectHighFidelityAccount() {
   });
 }
 
+function prepareAccessTokenPrompt() {
+  swal({
+    title: "Connect Account",
+    type: "input",
+    text: "Paste your created access token here." +
+      "</br></br>If you did not successfully create an access token click cancel below and attempt to connect your account again.</br></br>",
+    showCancelButton: true,
+    closeOnConfirm: false,
+    html: true
+  }, function(inputValue){
+    if (inputValue === false) return false;
+
+    if (inputValue === "") {
+      swal.showInputError("Please paste your access token in the input field.")
+      return false
+    }
+
+    // we have an input value - set the access token input with this and save settings
+    $("[name='metaverse.access_token']").val(inputValue).change();
+    swal.close();
+
+    // save the new settings
+    saveSettings();
+  });
+}
+
 function reloadSettings() {
   $.getJSON('/settings.json', function(data){
     _.extend(data, viewHelpers)
@@ -348,7 +365,7 @@ function appendDomainSelectionModal() {
 
 var SETTINGS_ERROR_MESSAGE = "There was a problem saving domain settings. Please try again!";
 
-$('body').on('click', '.save-button', function(e){
+function saveSettings() {
   // disable any inputs not changed
   $("input:not([data-changed])").each(function(){
     $(this).prop('disabled', true);
@@ -365,25 +382,14 @@ $('body').on('click', '.save-button', function(e){
   });
 
   // remove focus from the button
-  $(this).blur()
+  $(this).blur();
 
   // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
-  $.ajax('/settings.json', {
-    data: JSON.stringify(formJSON),
-    contentType: 'application/json',
-    type: 'POST'
-  }).done(function(data){
-    if (data.status == "success") {
-      showRestartModal();
-    } else {
-      showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
-      reloadSettings();
-    }
-  }).fail(function(){
-    showErrorMessage("Error", SETTINGS_ERROR_MESSAGE)
-    reloadSettings();
-  });
+  postSettings(formJSON);
+}
 
+$('body').on('click', '.save-button', function(e){
+  saveSettings();
   return false;
 });
 
@@ -797,7 +803,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
     clickedButton.attr('disabled', 'disabled')
 
     // get a list of user domains from data-web
-    data_web_domains_url = "https://metaverse.highfidelity.com/api/v1/domains?access_token="
+    data_web_domains_url = Settings.METAVERSE_URL + "/api/v1/domains?access_token="
     $.getJSON(data_web_domains_url + Settings.initialValues.metaverse.access_token, function(data){
 
       modal_buttons = {

From c4f926b25f6bf1970f564e1271c6802e509563b0 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 May 2015 16:15:28 -0700
Subject: [PATCH 18/33] hide domain ID + auto network options without account

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

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 010662b4ef..a65d3fe503 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -25,7 +25,7 @@ var Settings = {
 
 var viewHelpers = {
   getFormGroup: function(keypath, setting, values, isAdvanced, isLocked) {
-    form_group = "<div class='form-group " + (isAdvanced ? Settings.ADVANCED_CLASS : "") + "'>";
+    form_group = "<div class='form-group " + (isAdvanced ? Settings.ADVANCED_CLASS : "") + "' data-keypath='" + keypath + "'>";
     setting_value = _(values).valueForKeyPath(keypath);
 
     if (typeof setting_value == 'undefined' || setting_value === null) {
@@ -262,6 +262,11 @@ function setupHFAccountButton() {
     buttonSetting.id = Settings.CONNECT_ACCOUNT_BTN_ID;
 
     buttonSetting.href = Settings.METAVERSE_URL + "/user/tokens/new?for_domain_server=true";
+
+    // since we do not have an access token we change hide domain ID and auto networking settings
+    // without an access token niether of them can do anything
+    $("[data-keypath='metaverse.id']").hide();
+    $("[data-keypath='metaverse.automatic_networking']").hide();
   }
 
   // use the existing getFormGroup helper to ask for a button

From bb936657ae70201ae2d0a04f6c5bd5ab93bed078 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 11:09:00 -0700
Subject: [PATCH 19/33] handle domain creation during account connect flow

---
 domain-server/resources/web/css/style.css  |  45 +++++++
 domain-server/resources/web/js/settings.js | 143 +++++++++++++++++++--
 2 files changed, 179 insertions(+), 9 deletions(-)

diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index e38ff8eda0..607288f2c1 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -99,3 +99,48 @@ table {
 #advanced-toggle-button-xs {
   width: 100%;
 }
+
+.spinner {
+  margin: 30px auto 0;
+  width: 70px;
+  text-align: center;
+}
+
+.spinner > div {
+  width: 18px;
+  height: 18px;
+  background-color: #333;
+
+  border-radius: 100%;
+  display: inline-block;
+  -webkit-animation: bouncedelay 1.4s infinite ease-in-out;
+  animation: bouncedelay 1.4s infinite ease-in-out;
+  /* Prevent first frame from flickering when animation starts */
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+}
+
+.spinner .bounce1 {
+  -webkit-animation-delay: -0.32s;
+  animation-delay: -0.32s;
+}
+
+.spinner .bounce2 {
+  -webkit-animation-delay: -0.16s;
+  animation-delay: -0.16s;
+}
+
+@-webkit-keyframes bouncedelay {
+  0%, 80%, 100% { -webkit-transform: scale(0.0) }
+  40% { -webkit-transform: scale(1.0) }
+}
+
+@keyframes bouncedelay {
+  0%, 80%, 100% {
+    transform: scale(0.0);
+    -webkit-transform: scale(0.0);
+  } 40% {
+    transform: scale(1.0);
+    -webkit-transform: scale(1.0);
+  }
+}
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index a65d3fe503..96aadac061 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -1,6 +1,6 @@
 var Settings = {
   showAdvanced: false,
-  METAVERSE_URL: 'http://localhost:3000/',
+  METAVERSE_URL: 'http://localhost:3000',
   ADVANCED_CLASS: 'advanced-setting',
   TRIGGER_CHANGE_CLASS: 'trigger-change',
   DATA_ROW_CLASS: 'value-row',
@@ -300,13 +300,9 @@ function disonnectHighFidelityAccount() {
     type: "warning",
     html: true,
     showCancelButton: true,
-    closeOnConfirm: false
   }, function(){
     // we need to post to settings to clear the access-token
     postNewAccessToken("");
-
-    // close the sweet-alert
-    swal.close();
   });
 }
 
@@ -329,10 +325,139 @@ function prepareAccessTokenPrompt() {
 
     // we have an input value - set the access token input with this and save settings
     $("[name='metaverse.access_token']").val(inputValue).change();
-    swal.close();
 
-    // save the new settings
-    saveSettings();
+    // if the user doesn't have a domain ID set, give them the option to create one now
+    if (!Settings.data.values.metaverse.id) {
+      // show domain ID selection alert
+      showDomainIDChoiceAlert();
+    } else {
+      swal.close();
+      saveSettings();
+    }
+  });
+}
+
+function showDomainIDChoiceAlert() {
+  swal({
+    title: 'Domain ID',
+    type: 'info',
+    text: "You do not currently have a domain ID." +
+      "</br></br>This is required to point place names at your domain and to use automatic networking</br></br>" +
+      "Would you like to create a domain ID via the Metaverse API?</br></br>",
+    showCancelButton: true,
+    confirmButtonText: "Create new domain ID",
+    cancelButtonText: "Skip",
+    closeOnConfirm: false,
+    html: true
+  }, function(isConfirm){
+    if (isConfirm) {
+      // show the swal to create a new domain via API
+      showDomainCreationAlert(true);
+    } else {
+      // user cancelled, close this swal and save the access token we got
+      swal.close();
+      saveSettings();
+    }
+  });
+}
+
+function showDomainCreationAlert(justConnected) {
+  swal({
+    title: 'Create new domain ID',
+    type: 'input',
+    text: 'Enter a short description for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>',
+    showCancelButton: true,
+    confirmButtonText: "Create new domain ID",
+    closeOnConfirm: false,
+    html: true
+  }, function(inputValue){
+    if (inputValue === false) {
+      swal.close();
+
+      // user cancelled domain ID creation - if we're supposed to save after cancel then save here
+      if (justConnected) {
+        saveSettings();
+      }
+    } else {
+      // we're going to change the alert to a new one with a spinner while we create this domain
+      swal({
+        title: 'Creating domain ID',
+        text: '<div class="spinner" style="color:black;"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div>',
+        html: true,
+        showConfirmButton: false,
+        allowEscapeKey: false
+      });
+
+      createNewDomainID(inputValue, justConnected);
+    }
+  });
+}
+
+function createNewDomainID(description, justConnected) {
+  // get the JSON object ready that we'll use to create a new domain
+  var domainJSON = {
+    "domain": {
+       "description": description
+    },
+    "access_token": $("[name='metaverse.access_token']").val()
+  }
+
+  $.post(Settings.METAVERSE_URL + "/api/v1/domains", domainJSON, function(data){
+    if (data.status == "success") {
+      // we successfully created a domain ID, set it on that field
+      var domainID = data.domain.id;
+      $("[name='metaverse.id']").val(domainID);
+
+      if (justConnected) {
+        var successText = "We connnected your High Fidelity account and created a new domain ID for this machine."
+      } else {
+        var successText = "We created a new domain ID for this machine."
+      }
+
+      successText += "</br></br>Click the button below to save your new settings and restart your domain-server.";
+
+      // show a sweet alert to say we are all finished up and that we need to save
+      swal({
+        title: 'Success!',
+        type: 'success',
+        text: successText,
+        html: true,
+        confirmButtonText: 'Save'
+      }, function(){
+        saveSettings();
+      });
+    }
+  }).fail(function(){
+
+    var errorText = "There was a problem creating your new domain ID. Do you want to try again or";
+
+    if (justConnected) {
+      errorText += " just save your new access token?</br></br>You can always create a new domain ID later.";
+    } else {
+      errorText += " cancel?"
+    }
+
+    // we failed to create the new domain ID, show a sweet-alert that lets them try again or cancel
+    swal({
+      title: '',
+      type: 'error',
+      text: errorText,
+      html: true,
+      confirmButtonText: 'Try again',
+      showCancelButton: true,
+      closeOnConfirm: false
+    }, function(isConfirm){
+      if (isConfirm) {
+        // they want to try creating a domain ID again
+        showDomainCreationAlert(justConnected);
+      } else {
+        // they want to cancel
+        if (justConnected) {
+          // since they just connected we need to save the access token here
+          saveSettings();
+        }
+      }
+    });
   });
 }
 
@@ -823,7 +948,7 @@ function chooseFromHighFidelityDomains(clickedButton) {
         modal_body = "<p>Choose the High Fidelity domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>"
         domain_select = $("<select id='domain-name-select' class='form-control'></select>")
         _.each(data.data.domains, function(domain){
-          domain_select.append("<option value='" + domain.id + "'>(" + domain.id + ")" + (domain.names.length > 0 ? " [" + domain.names + "]" : "") + "</option>");
+          domain_select.append("<option value='" + domain.id + "'>(" + domain.id + ")" + (domain.owner_names.length > 0 ? " [" + domain.owner_names + "]" : "") + "</option>");
         })
         modal_body += "<label for='domain-name-select'>Domains</label>" + domain_select[0].outerHTML
         modal_buttons["success"] = {

From c0473adec93d27fe6ee68f9c4e63155bb92f37f3 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 11:18:12 -0700
Subject: [PATCH 20/33] add button to create new domain ID in settings

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

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 96aadac061..b89f9699e5 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -20,8 +20,10 @@ var Settings = {
   REORDER_BUTTONS_CLASSES: 'buttons reorder-buttons',
   NEW_ROW_CLASS: 'new-row',
   CONNECT_ACCOUNT_BTN_ID: 'connect-account-btn',
-  DISCONNECT_ACCOUNT_BTN_ID: 'disconnect-account-btn'
-};
+  DISCONNECT_ACCOUNT_BTN_ID: 'disconnect-account-btn',
+  CREATE_DOMAIN_ID_BTN_ID: 'create-domain-btn',
+  CHOOSE_DOMAIN_ID_BTN_ID: 'choose-domain-btn'
+  };
 
 var viewHelpers = {
   getFormGroup: function(keypath, setting, values, isAdvanced, isLocked) {
@@ -189,7 +191,11 @@ $(document).ready(function(){
     $(this).blur();
   })
 
-  $('#settings-form').on('click', '#choose-domain-btn', function(){
+  $('#settings-form').on('click', '#' + Settings.CREATE_DOMAIN_ID_BTN_ID, function(){
+    showDomainCreationAlert(false);
+  })
+
+  $('#settings-form').on('click', '#' + Settings.CHOOSE_DOMAIN_ID_BTN_ID, function(){
     chooseFromHighFidelityDomains($(this))
   });
 
@@ -367,7 +373,7 @@ function showDomainCreationAlert(justConnected) {
     type: 'input',
     text: 'Enter a short description for this machine.</br></br>This will help you identify which domain ID belongs to which machine.</br></br>',
     showCancelButton: true,
-    confirmButtonText: "Create new domain ID",
+    confirmButtonText: "Create",
     closeOnConfirm: false,
     html: true
   }, function(inputValue){
@@ -406,7 +412,7 @@ function createNewDomainID(description, justConnected) {
     if (data.status == "success") {
       // we successfully created a domain ID, set it on that field
       var domainID = data.domain.id;
-      $("[name='metaverse.id']").val(domainID);
+      $("[name='metaverse.id']").val(domainID).change();
 
       if (justConnected) {
         var successText = "We connnected your High Fidelity account and created a new domain ID for this machine."
@@ -489,8 +495,14 @@ function reloadSettings() {
 
 function appendDomainSelectionModal() {
   var metaverseInput = $("[name='metaverse.id']");
-  var chooseButton = $("<button type='button' id='choose-domain-btn' class='btn btn-primary' style='margin-top:10px'>Choose ID from my domains</button>");
+
+  var createButton = $("<button type='button' id='create-domain-btn' class='btn btn-primary'" +
+    " style='margin-top:10px'>Create new domain ID</button>");
+  var chooseButton = $("<button type='button' id='choose-domain-btn' class='btn btn-primary'" +
+    " style='margin-top:10px; margin-left:10px'>Choose from my domains</button>");
+
   metaverseInput.after(chooseButton);
+  metaverseInput.after(createButton);
 }
 
 var SETTINGS_ERROR_MESSAGE = "There was a problem saving domain settings. Please try again!";

From 78fa82515a99b1681b48708f1ce2fbbf6ddb4c5f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 11:19:44 -0700
Subject: [PATCH 21/33] use constant IDs for domain buttons

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

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index b89f9699e5..88ae786b66 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -485,7 +485,7 @@ function reloadSettings() {
 
     if (!_.has(data["locked"], "metaverse") && !_.has(data["locked"]["metaverse"], "id")) {
       // append the domain selection modal, as long as it's not locked
-      appendDomainSelectionModal();
+      appendDomainIDButtons();
     }
 
     // call our method to setup the HF account button
@@ -493,12 +493,12 @@ function reloadSettings() {
   });
 }
 
-function appendDomainSelectionModal() {
+function appendDomainIDButtons() {
   var metaverseInput = $("[name='metaverse.id']");
 
-  var createButton = $("<button type='button' id='create-domain-btn' class='btn btn-primary'" +
+  var createButton = $("<button type='button' id='" + Settings.CREATE_DOMAIN_ID_BTN_ID + "' class='btn btn-primary'" +
     " style='margin-top:10px'>Create new domain ID</button>");
-  var chooseButton = $("<button type='button' id='choose-domain-btn' class='btn btn-primary'" +
+  var chooseButton = $("<button type='button' id='" + Settings.CHOOSE_DOMAIN_ID_BTN_ID + "' class='btn btn-primary'" +
     " style='margin-top:10px; margin-left:10px'>Choose from my domains</button>");
 
   metaverseInput.after(chooseButton);

From 82cb55e602d63a95ef68b7b8dd09ffa253945dad Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 11:26:06 -0700
Subject: [PATCH 22/33] handle case where account is locked

---
 domain-server/resources/web/js/settings.js | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 88ae786b66..00a9546906 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -87,10 +87,12 @@ var viewHelpers = {
 
           if (setting.href) {
             form_group += "<a href='" + setting.href + "'style='display: block;' role='button'"
+              + (isLocked ? " disabled" : "") +
               + common_attrs("btn " + setting.classes) + " target='_blank'>"
               + setting.button_label + "</a>";
           } else {
-            form_group += "<button " + common_attrs("btn " + setting.classes) + ">"
+            form_group += "<button " + common_attrs("btn " + setting.classes)
+              + (isLocked ? " disabled" : "") + ">"
               + setting.button_label + "</button>";
           }
 
@@ -275,13 +277,10 @@ function setupHFAccountButton() {
     $("[data-keypath='metaverse.automatic_networking']").hide();
   }
 
-  // use the existing getFormGroup helper to ask for a button
-  var buttonGroup = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values, false, false);
-
   var tokenLocked = _(Settings.data).valueForKeyPath("locked.metaverse.access_token");
-  if (tokenLocked) {
-    // the access_token is locked so we should disable the connect/disconnect button and explain why it is disabled
-  }
+
+  // use the existing getFormGroup helper to ask for a button
+  var buttonGroup = viewHelpers.getFormGroup('', buttonSetting, Settings.data.values, false, tokenLocked);
 
   // add the button group to the top of the metaverse panel
   $('#metaverse .panel-body').prepend(buttonGroup);
@@ -477,12 +476,6 @@ function reloadSettings() {
     Settings.data = data;
     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'
-    })
-
     if (!_.has(data["locked"], "metaverse") && !_.has(data["locked"]["metaverse"], "id")) {
       // append the domain selection modal, as long as it's not locked
       appendDomainIDButtons();
@@ -490,6 +483,12 @@ function reloadSettings() {
 
     // call our method to setup the HF account button
     setupHFAccountButton();
+
+    // add tooltip to locked settings
+    $('label.locked').tooltip({
+      placement: 'right',
+      title: 'This setting is in the master config file and cannot be changed'
+    });
   });
 }
 

From a675b0a8918317bb25eada480fdd35c78e5c1419 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 13:10:32 -0700
Subject: [PATCH 23/33] fix locked link button in settings

---
 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 00a9546906..4efa3ff02d 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -87,7 +87,7 @@ var viewHelpers = {
 
           if (setting.href) {
             form_group += "<a href='" + setting.href + "'style='display: block;' role='button'"
-              + (isLocked ? " disabled" : "") +
+              + (isLocked ? " disabled" : "")
               + common_attrs("btn " + setting.classes) + " target='_blank'>"
               + setting.button_label + "</a>";
           } else {
@@ -347,7 +347,7 @@ function showDomainIDChoiceAlert() {
     title: 'Domain ID',
     type: 'info',
     text: "You do not currently have a domain ID." +
-      "</br></br>This is required to point place names at your domain and to use automatic networking</br></br>" +
+      "</br></br>This is required to point place names at your domain and to use automatic networking.</br></br>" +
       "Would you like to create a domain ID via the Metaverse API?</br></br>",
     showCancelButton: true,
     confirmButtonText: "Create new domain ID",

From bfa069a26bfb1068926ec977ec3365796800bb63 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 13:15:09 -0700
Subject: [PATCH 24/33] handle domain ID removal and account disconnection

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

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 4efa3ff02d..2388c5708d 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -22,7 +22,8 @@ var Settings = {
   CONNECT_ACCOUNT_BTN_ID: 'connect-account-btn',
   DISCONNECT_ACCOUNT_BTN_ID: 'disconnect-account-btn',
   CREATE_DOMAIN_ID_BTN_ID: 'create-domain-btn',
-  CHOOSE_DOMAIN_ID_BTN_ID: 'choose-domain-btn'
+  CHOOSE_DOMAIN_ID_BTN_ID: 'choose-domain-btn',
+  ACCESS_TOKEN_SELECTOR: '[name="metaverse.access_token"]'
   };
 
 var viewHelpers = {
@@ -286,16 +287,6 @@ function setupHFAccountButton() {
   $('#metaverse .panel-body').prepend(buttonGroup);
 }
 
-function postNewAccessToken(access_token) {
-  var newAccessToken = {
-      "metaverse": {
-        "access_token": access_token
-      }
-    };
-
-    postSettings(newAccessToken);
-}
-
 function disonnectHighFidelityAccount() {
   // the user clicked on the disconnect account btn - give them a sweet alert to make sure this is what they want to do
   swal({
@@ -307,7 +298,8 @@ function disonnectHighFidelityAccount() {
     showCancelButton: true,
   }, function(){
     // we need to post to settings to clear the access-token
-    postNewAccessToken("");
+    $(Settings.ACCESS_TOKEN_SELECTOR).val('').change();
+    saveSettings();
   });
 }
 
@@ -329,7 +321,7 @@ function prepareAccessTokenPrompt() {
     }
 
     // we have an input value - set the access token input with this and save settings
-    $("[name='metaverse.access_token']").val(inputValue).change();
+    $(Settings.ACCESS_TOKEN_SELECTOR).val(inputValue).change();
 
     // if the user doesn't have a domain ID set, give them the option to create one now
     if (!Settings.data.values.metaverse.id) {
@@ -404,7 +396,7 @@ function createNewDomainID(description, justConnected) {
     "domain": {
        "description": description
     },
-    "access_token": $("[name='metaverse.access_token']").val()
+    "access_token": $(Settings.ACCESS_TOKEN_SELECTOR).val()
   }
 
   $.post(Settings.METAVERSE_URL + "/api/v1/domains", domainJSON, function(data){

From 7caaa757fd3de337f42ab6a36ef9114e7c916a1d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 14:51:53 -0700
Subject: [PATCH 25/33] change paths label to places/paths

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

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 252f1d05f6..3ed715016c 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -46,11 +46,11 @@
     ]
   },
   {
-    "label": "Paths",
+    "label": "Places / Paths",
     "settings": [
       {
         "name": "paths",
-        "label": "",
+        "label": "Paths",
         "help": "Clients can enter a path to reach an exact viewpoint in your domain.<br/>Add rows to the table below to map a path to a viewpoint.<br/>The index path ( / ) is where clients will enter if they do not enter an explicit path.",
         "type": "table",
         "key": {

From 60a8dc1eb3649f44f9de9bcebecc59ebfb669da0 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 16:33:12 -0700
Subject: [PATCH 26/33] add initial version of places table in domain-server

---
 .../resources/describe-settings.json          |   1 +
 domain-server/resources/web/js/settings.js    | 426 ++++++++++++------
 .../resources/web/settings/index.shtml        |   2 +-
 3 files changed, 284 insertions(+), 145 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 3ed715016c..60f541c10b 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -47,6 +47,7 @@
   },
   {
     "label": "Places / Paths",
+    "html_id": "places_paths",
     "settings": [
       {
         "name": "paths",
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 2388c5708d..300744dd4d 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -23,8 +23,12 @@ var Settings = {
   DISCONNECT_ACCOUNT_BTN_ID: 'disconnect-account-btn',
   CREATE_DOMAIN_ID_BTN_ID: 'create-domain-btn',
   CHOOSE_DOMAIN_ID_BTN_ID: 'choose-domain-btn',
-  ACCESS_TOKEN_SELECTOR: '[name="metaverse.access_token"]'
-  };
+  GET_TEMPORARY_NAME_BTN_ID: 'get-temp-name-btn',
+  DOMAIN_ID_SELECTOR: '[name="metaverse.id"]',
+  ACCESS_TOKEN_SELECTOR: '[name="metaverse.access_token"]',
+  PLACES_TABLE_ID: 'places-table',
+  FORM_ID: 'settings-form'
+};
 
 var viewHelpers = {
   getFormGroup: function(keypath, setting, values, isAdvanced, isLocked) {
@@ -49,7 +53,7 @@ var viewHelpers = {
       return " class='" + (setting.type !== 'checkbox' ? 'form-control' : '')
         + " " + Settings.TRIGGER_CHANGE_CLASS + " " + extra_classes + "' data-short-name='"
         + setting.name + "' name='" + keypath + "' "
-        + "id='" + (typeof setting.id !== 'undefined' ? setting.id : keypath) + "'";
+        + "id='" + (typeof setting.html_id !== 'undefined' ? setting.html_id : keypath) + "'";
     }
 
     if (setting.type === 'checkbox') {
@@ -138,23 +142,23 @@ $(document).ready(function(){
     $(window).resize(resizeFn);
   });
 
-  $('#settings-form').on('click', '.' + Settings.ADD_ROW_BUTTON_CLASS, function(){
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.ADD_ROW_BUTTON_CLASS, function(){
     addTableRow(this);
   });
 
-  $('#settings-form').on('click', '.' + Settings.DEL_ROW_BUTTON_CLASS, function(){
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.DEL_ROW_BUTTON_CLASS, function(){
     deleteTableRow(this);
   });
 
-  $('#settings-form').on('click', '.' + Settings.MOVE_UP_BUTTON_CLASS, function(){
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_UP_BUTTON_CLASS, function(){
     moveTableRow(this, true);
   });
 
-  $('#settings-form').on('click', '.' + Settings.MOVE_DOWN_BUTTON_CLASS, function(){
+  $('#' + Settings.FORM_ID).on('click', '.' + Settings.MOVE_DOWN_BUTTON_CLASS, function(){
     moveTableRow(this, false);
   });
 
-  $('#settings-form').on('keypress', 'table input', function(e){
+  $('#' + Settings.FORM_ID).on('keypress', 'table input', function(e){
     if (e.keyCode == 13) {
       // capture enter in table input
       // if we have a sibling next to us that has an input, jump to it, otherwise check if we have a glyphicon for add to click
@@ -172,7 +176,7 @@ $(document).ready(function(){
     }
   });
 
-  $('#settings-form').on('change', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
+  $('#' + Settings.FORM_ID).on('change', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true)
 
@@ -194,24 +198,32 @@ $(document).ready(function(){
     $(this).blur();
   })
 
-  $('#settings-form').on('click', '#' + Settings.CREATE_DOMAIN_ID_BTN_ID, function(){
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.CREATE_DOMAIN_ID_BTN_ID, function(){
+    $(this).blur();
     showDomainCreationAlert(false);
   })
 
-  $('#settings-form').on('click', '#' + Settings.CHOOSE_DOMAIN_ID_BTN_ID, function(){
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.CHOOSE_DOMAIN_ID_BTN_ID, function(){
+    $(this).blur();
     chooseFromHighFidelityDomains($(this))
   });
 
-  $('#settings-form').on('change', 'select', function(){
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.GET_TEMPORARY_NAME_ID, function(){
+    $(this).blur();
+    createTemporaryDomain();
+  });
+
+
+  $('#' + Settings.FORM_ID).on('change', 'select', function(){
     $("input[name='" +  $(this).attr('data-hidden-input') + "']").val($(this).val()).change()
   });
 
-  $('#settings-form').on('click', '#' + Settings.DISCONNECT_ACCOUNT_BTN_ID, function(e){
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.DISCONNECT_ACCOUNT_BTN_ID, function(e){
     disonnectHighFidelityAccount();
     e.preventDefault();
   });
 
-  $('#settings-form').on('click', '#' + Settings.CONNECT_ACCOUNT_BTN_ID, function(e){
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.CONNECT_ACCOUNT_BTN_ID, function(e){
     $(this).blur();
     prepareAccessTokenPrompt();
   });
@@ -227,6 +239,10 @@ $(document).ready(function(){
   reloadSettings();
 });
 
+function dynamicButton(button_id, text) {
+  return $("<button type='button' id='" + button_id + "' class='btn btn-primary'>" + text + "</button>");
+}
+
 function postSettings(jsonSettings) {
   // POST the form JSON to the domain-server settings.json endpoint so the settings are saved
   $.ajax('/settings.json', {
@@ -263,12 +279,12 @@ function setupHFAccountButton() {
     buttonSetting.help = "Click the button above to clear your OAuth token and disconnect your High Fidelity account.";
     buttonSetting.classes = "btn-danger";
     buttonSetting.button_label = "Disconnect High Fidelity Account";
-    buttonSetting.id = Settings.DISCONNECT_ACCOUNT_BTN_ID;
+    buttonSetting.html_id = Settings.DISCONNECT_ACCOUNT_BTN_ID;
   } else {
     buttonSetting.help = "Click the button above to connect your High Fidelity account.";
     buttonSetting.classes = "btn-primary";
     buttonSetting.button_label = "Connect High Fidelity Account";
-    buttonSetting.id = Settings.CONNECT_ACCOUNT_BTN_ID;
+    buttonSetting.html_id = Settings.CONNECT_ACCOUNT_BTN_ID;
 
     buttonSetting.href = Settings.METAVERSE_URL + "/user/tokens/new?for_domain_server=true";
 
@@ -358,6 +374,16 @@ function showDomainIDChoiceAlert() {
   });
 }
 
+function showSpinnerAlert(title) {
+  swal({
+    title: title,
+    text: '<div class="spinner" style="color:black;"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div>',
+    html: true,
+    showConfirmButton: false,
+    allowEscapeKey: false
+  });
+}
+
 function showDomainCreationAlert(justConnected) {
   swal({
     title: 'Create new domain ID',
@@ -377,14 +403,7 @@ function showDomainCreationAlert(justConnected) {
       }
     } else {
       // we're going to change the alert to a new one with a spinner while we create this domain
-      swal({
-        title: 'Creating domain ID',
-        text: '<div class="spinner" style="color:black;"><div class="bounce1"></div><div class="bounce2"></div><div class="bounce3"></div></div>',
-        html: true,
-        showConfirmButton: false,
-        allowEscapeKey: false
-      });
-
+      showSpinnerAlert('Creating domain ID');
       createNewDomainID(inputValue, justConnected);
     }
   });
@@ -403,7 +422,7 @@ function createNewDomainID(description, justConnected) {
     if (data.status == "success") {
       // we successfully created a domain ID, set it on that field
       var domainID = data.domain.id;
-      $("[name='metaverse.id']").val(domainID).change();
+      $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
 
       if (justConnected) {
         var successText = "We connnected your High Fidelity account and created a new domain ID for this machine."
@@ -458,6 +477,198 @@ function createNewDomainID(description, justConnected) {
   });
 }
 
+function setupPlacesTable() {
+  // create a dummy table using our view helper
+  var placesTableSetting = {
+    type: 'table',
+    name: 'places',
+    label: 'Places',
+    html_id: Settings.PLACES_TABLE_ID,
+    help: "The following places currently point to this domain.</br>To point your places to this domain, "
+      + " go to the <a href='https://metaverse.highfidelity.com/user/places'>My Places</a> "
+      + "page in your High Fidelity Metaverse account.",
+    read_only: true,
+    columns: [
+      {
+        "name": "name",
+        "label": "Name"
+      },
+      {
+        "name": "path",
+        "label": "Path"
+      }
+    ]
+  }
+
+  // get a table for the places
+  var placesTableGroup = viewHelpers.getFormGroup('', placesTableSetting, Settings.data.values, false, false);
+
+  // append the places table in the right place
+  $('#places_paths .panel-body').prepend(placesTableGroup);
+
+  // do we have a domain ID?
+  if (Settings.data.values.metaverse.id.length > 0) {
+    // now, ask the API for what places, if any, point to this domain
+    reloadPlacesOrTemporaryName();
+  } else {
+    // we don't have a domain ID - add a button to offer the user a chance to get a temporary one
+    var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_ID, 'Get a temporary place name');
+    $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
+  }
+
+}
+
+function placeTableRow(name, path, isTemporary) {
+  if (!isTemporary) {
+    var name_link = "<a href='" + Settings.METAVERSE_URL + "/user/places/" + name + "/edit'>" + name + "</a>";
+  } else {
+    var name_link = name;
+  }
+
+  return "<tr><td>" + name_link + "</td><td>" + path + "</td></tr>";
+}
+
+function placeTableRowForPlaceObject(place) {
+  var placePathOrIndex = (place.path ? place.path : "/");
+  return placeTableRow(place.name, placePathOrIndex, false);
+}
+
+function reloadPlacesOrTemporaryName() {
+  // we only need to do this if we have a current domain ID
+  var domainID = Settings.data.values.metaverse.id;
+  if (domainID.length > 0) {
+    var domainURL = Settings.METAVERSE_URL + "/api/v1/domains/" + domainID;
+
+    $.getJSON(domainURL, function(data){
+      // check if we have owner_places (for a real domain) or a name (for a temporary domain)
+      if (data.status == "success") {
+        if (data.domain.owner_places) {
+          // add a table row for each of these names
+          _.each(data.domain.owner_places, function(place){
+            $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRowForPlaceObject(place));
+          });
+        } else if (data.domain.name) {
+          // add a table row for this temporary domain name
+          $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRow(data.domain.name + " (temporary)", '/', true));
+        }
+      }
+    });
+  }
+}
+
+function appendDomainIDButtons() {
+  var domainIDInput = $(Settings.DOMAIN_ID_SELECTOR);
+
+  var createButton = dynamicButton(Settings.CREATE_DOMAIN_ID_BTN_ID, "Create new domain ID");
+  createButton.css('margin-top', '10px');
+  var chooseButton = dynamicButton(Settings.CHOOSE_DOMAIN_ID_BTN_ID, "Choose from my domains");
+  chooseButton.css('margin', '10px 0px 0px 10px');
+
+  domainIDInput.after(chooseButton);
+  domainIDInput.after(createButton);
+}
+
+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 = Settings.METAVERSE_URL + "/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 = "<p>Choose the High Fidelity domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>"
+        domain_select = $("<select id='domain-name-select' class='form-control'></select>")
+        _.each(data.data.domains, function(domain){
+          domain_select.append("<option value='" + domain.id + "'>(" + domain.id + ")" + (domain.names.length > 0 ? " [" + domain.owner_names + "]" : "") + "</option>");
+        })
+        modal_body += "<label for='domain-name-select'>Domains</label>" + domain_select[0].outerHTML
+        modal_buttons["success"] = {
+          label: 'Choose domain',
+          callback: function() {
+            domainID = $('#domain-name-select').val()
+            // set the domain ID on the form
+            $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
+          }
+        }
+      } else {
+        modal_buttons["success"] = {
+          label: 'Create new domain',
+          callback: function() {
+            window.open("https://metaverse.highfidelity.com/user/domains", '_blank');
+          }
+        }
+        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>"
+      }
+
+      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.<br><br>" +
+        "Please follow the instructions on the settings page to add an access token.",
+      title: "Access token required"
+    })
+  }
+}
+
+function createTemporaryDomain() {
+  swal({
+    title: 'Create temporary place name',
+    text: 'This will create a temporary place name and domain ID so other users can easily connect to your domain.',
+    showCancelButton: true,
+    confirmButtonText: 'Create',
+    closeOnConfirm: false
+  }, function(isConfirm){
+    if (isConfirm) {
+      showSpinnerAlert('Creating temporary place name');
+
+      // make a get request to get a temporary domain
+      $.post(Settings.METAVERSE_URL + '/api/v1/domains/temporary', function(data){
+        if (data.status == "success") {
+          var domain = data.data.domain;
+
+          // we should have a new domain ID - set it on the domain ID value
+          $(Settings.DOMAIN_ID_SELECTOR).val(domain.id).change();
+          swal({
+            type: 'success',
+            title: 'Success!',
+            text: "We have created a temporary name and domain ID for you.</br></br>"
+              + "Your temporary place name is <strong>" + domain.name + "</strong>.</br></br>"
+              + "Press the button below to save your new settings and restart your domain-server.",
+            confirmButtonText: 'Save',
+            html: true
+          }, function(){
+            saveSettings();
+          });
+        }
+      });
+    }
+  });
+}
+
 function reloadSettings() {
   $.getJSON('/settings.json', function(data){
     _.extend(data, viewHelpers)
@@ -476,6 +687,9 @@ function reloadSettings() {
     // call our method to setup the HF account button
     setupHFAccountButton();
 
+    // call our method to setup the place names table
+    setupPlacesTable();
+
     // add tooltip to locked settings
     $('label.locked').tooltip({
       placement: 'right',
@@ -484,17 +698,6 @@ function reloadSettings() {
   });
 }
 
-function appendDomainIDButtons() {
-  var metaverseInput = $("[name='metaverse.id']");
-
-  var createButton = $("<button type='button' id='" + Settings.CREATE_DOMAIN_ID_BTN_ID + "' class='btn btn-primary'" +
-    " style='margin-top:10px'>Create new domain ID</button>");
-  var chooseButton = $("<button type='button' id='" + Settings.CHOOSE_DOMAIN_ID_BTN_ID + "' class='btn btn-primary'" +
-    " style='margin-top:10px; margin-left:10px'>Choose from my domains</button>");
-
-  metaverseInput.after(chooseButton);
-  metaverseInput.after(createButton);
-}
 
 var SETTINGS_ERROR_MESSAGE = "There was a problem saving domain settings. Please try again!";
 
@@ -540,7 +743,7 @@ function makeTable(setting, keypath, setting_value, isLocked) {
   }
 
   html += "<table class='table table-bordered " + (isLocked ? "locked-table" : "") + "' data-short-name='" + setting.name
-    + "' name='" + keypath + "' data-setting-type='" + (isArray ? 'array' : 'hash') + "'>"
+    + "' name='" + keypath + "' id='" + setting.html_id + "' data-setting-type='" + (isArray ? 'array' : 'hash') + "'>";
 
   // Column names
   html += "<tr class='headers'>"
@@ -557,7 +760,7 @@ function makeTable(setting, keypath, setting_value, isLocked) {
     html += "<td class='data'><strong>" + col.label + "</strong></td>" // Data
   })
 
-  if (!isLocked) {
+  if (!isLocked && !setting.read_only) {
     if (setting.can_order) {
       html += "<td class=" + Settings.REORDER_BUTTONS_CLASSES +
               "><span class='glyphicon glyphicon-sort'></span></td>";
@@ -566,54 +769,56 @@ function makeTable(setting, keypath, setting_value, isLocked) {
   }
 
   // populate rows in the table from existing values
-  var row_num = 1
+  var row_num = 1;
 
-  _.each(setting_value, function(row, indexOrName) {
-    html += "<tr class='" + Settings.DATA_ROW_CLASS + "'" + (isArray ? "" : "name='" + keypath + "." + indexOrName + "'") + ">"
+  if (setting_value.length > 0) {
+    _.each(setting_value, function(row, indexOrName) {
+      html += "<tr class='" + Settings.DATA_ROW_CLASS + "'" + (isArray ? "" : "name='" + keypath + "." + indexOrName + "'") + ">"
 
-    if (setting.numbered === true) {
-      html += "<td class='numbered'>" + row_num + "</td>"
-    }
-
-    if (setting.key) {
-        html += "<td class='key'>" + indexOrName + "</td>"
-    }
-
-    _.each(setting.columns, function(col) {
-      html += "<td class='" + Settings.DATA_COL_CLASS + "'>"
-
-      if (isArray) {
-        rowIsObject = setting.columns.length > 1
-        colValue = rowIsObject ? row[col.name] : row
-        html += colValue
-
-        // for arrays we add a hidden input to this td so that values can be posted appropriately
-        html += "<input type='hidden' name='" + keypath + "[" + indexOrName + "]"
-          + (rowIsObject ? "." + col.name : "") + "' value='" + colValue + "'/>"
-      } else if (row.hasOwnProperty(col.name)) {
-        html += row[col.name]
+      if (setting.numbered === true) {
+        html += "<td class='numbered'>" + row_num + "</td>"
       }
 
-      html += "</td>"
-    })
-
-    if (!isLocked) {
-      if (setting.can_order) {
-        html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES+
-                "'><span class='" + Settings.MOVE_UP_SPAN_CLASSES + "'></span><span class='" +
-                Settings.MOVE_DOWN_SPAN_CLASSES + "'></span></td>"
+      if (setting.key) {
+          html += "<td class='key'>" + indexOrName + "</td>"
       }
-      html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES +
-              "'><span class='" + Settings.DEL_ROW_SPAN_CLASSES + "'></span></td>"
-    }
 
-    html += "</tr>"
+      _.each(setting.columns, function(col) {
+        html += "<td class='" + Settings.DATA_COL_CLASS + "'>"
 
-    row_num++
-  });
+        if (isArray) {
+          rowIsObject = setting.columns.length > 1
+          colValue = rowIsObject ? row[col.name] : row
+          html += colValue
+
+          // for arrays we add a hidden input to this td so that values can be posted appropriately
+          html += "<input type='hidden' name='" + keypath + "[" + indexOrName + "]"
+            + (rowIsObject ? "." + col.name : "") + "' value='" + colValue + "'/>"
+        } else if (row.hasOwnProperty(col.name)) {
+          html += row[col.name]
+        }
+
+        html += "</td>"
+      })
+
+      if (!isLocked && !setting.read_only) {
+        if (setting.can_order) {
+          html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES+
+                  "'><span class='" + Settings.MOVE_UP_SPAN_CLASSES + "'></span><span class='" +
+                  Settings.MOVE_DOWN_SPAN_CLASSES + "'></span></td>"
+        }
+        html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES +
+                "'><span class='" + Settings.DEL_ROW_SPAN_CLASSES + "'></span></td>"
+      }
+
+      html += "</tr>"
+
+      row_num++
+    });
+  }
 
   // populate inputs in the table for new values
-  if (!isLocked) {
+  if (!isLocked && !setting.read_only) {
      html += makeTableInputs(setting)
   }
   html += "</table>"
@@ -926,70 +1131,3 @@ function cleanupFormValues(node) {
 function showErrorMessage(title, message) {
   swal(title, message)
 }
-
-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 = Settings.METAVERSE_URL + "/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 = "<p>Choose the High Fidelity domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>"
-        domain_select = $("<select id='domain-name-select' class='form-control'></select>")
-        _.each(data.data.domains, function(domain){
-          domain_select.append("<option value='" + domain.id + "'>(" + domain.id + ")" + (domain.owner_names.length > 0 ? " [" + domain.owner_names + "]" : "") + "</option>");
-        })
-        modal_body += "<label for='domain-name-select'>Domains</label>" + 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://metaverse.highfidelity.com/user/domains", '_blank');
-          }
-        }
-        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>"
-      }
-
-
-      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.<br><br>" +
-        "Please follow the instructions on the settings page to add an access token.",
-      title: "Access token required"
-    })
-  }
-}
diff --git a/domain-server/resources/web/settings/index.shtml b/domain-server/resources/web/settings/index.shtml
index 9dfca3b7af..957ff2192f 100644
--- a/domain-server/resources/web/settings/index.shtml
+++ b/domain-server/resources/web/settings/index.shtml
@@ -47,7 +47,7 @@
             <% } %>
 
             <% isGrouped = !!group.name %>
-            <% panelID = isGrouped ? group.name : group.label %>
+            <% panelID = isGrouped ? group.name : group.html_id %>
 
             <div class="panel panel-default<%- (isAdvanced) ? ' advanced-setting' : '' %><%- (isGrouped) ? ' grouped' : '' %>"
                  id="<%- panelID %>">

From edf9042ed5032989dfb257f1c9c95d6dfd4962b7 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 17:12:19 -0700
Subject: [PATCH 27/33] add hifi link to table, make table icons anchors

---
 domain-server/resources/web/css/style.css  |  5 +++
 domain-server/resources/web/js/settings.js | 50 ++++++++++++++--------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 607288f2c1..51275da509 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -78,6 +78,11 @@ td.reorder-buttons .glyphicon {
   display: inherit;
 }
 
+td a.glyphicon {
+  color: black;
+  text-decoration: none;
+}
+
 tr.new-row {
   color: #3c763d;
   background-color: #dff0d8;
diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 300744dd4d..cd26d0e43e 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -173,6 +173,8 @@ $(document).ready(function(){
         // set focus to the first input in the new row
         $(this).closest('table').find('tr.inputs input:first').focus()
       }
+
+      e.preventDefault();
     }
   });
 
@@ -208,7 +210,7 @@ $(document).ready(function(){
     chooseFromHighFidelityDomains($(this))
   });
 
-  $('#' + Settings.FORM_ID).on('click', '#' + Settings.GET_TEMPORARY_NAME_ID, function(){
+  $('#' + Settings.FORM_ID).on('click', '#' + Settings.GET_TEMPORARY_NAME_BTN_ID, function(){
     $(this).blur();
     createTemporaryDomain();
   });
@@ -496,6 +498,11 @@ function setupPlacesTable() {
       {
         "name": "path",
         "label": "Path"
+      },
+      {
+        "name": "edit",
+        "label": "",
+        "class": "buttons"
       }
     ]
   }
@@ -519,13 +526,16 @@ function setupPlacesTable() {
 }
 
 function placeTableRow(name, path, isTemporary) {
-  if (!isTemporary) {
-    var name_link = "<a href='" + Settings.METAVERSE_URL + "/user/places/" + name + "/edit'>" + name + "</a>";
+  var name_link = "<a href='hifi://" + name + "'>" + name + "</a>";
+
+  if (isTemporary) {
+    var editColumn = "<td class='buttons'></td>";
   } else {
-    var name_link = name;
+    var editColumn = "<td class='buttons'><a class='glyphicon glyphicon-pencil'"
+      + " href='" + Settings.METAVERSE_URL + "/user/places/" + name + "/edit" + "'</a></td>";
   }
 
-  return "<tr><td>" + name_link + "</td><td>" + path + "</td></tr>";
+  return "<tr><td>" + name_link + "</td><td>" + path + "</td>" + editColumn + "</tr>";
 }
 
 function placeTableRowForPlaceObject(place) {
@@ -637,10 +647,11 @@ function chooseFromHighFidelityDomains(clickedButton) {
 function createTemporaryDomain() {
   swal({
     title: 'Create temporary place name',
-    text: 'This will create a temporary place name and domain ID so other users can easily connect to your domain.',
+    text: "This will create a temporary place name and domain ID (valid for 30 days) so other users can easily connect to your domain.",
     showCancelButton: true,
     confirmButtonText: 'Create',
-    closeOnConfirm: false
+    closeOnConfirm: false,
+    html: true
   }, function(isConfirm){
     if (isConfirm) {
       showSpinnerAlert('Creating temporary place name');
@@ -757,15 +768,15 @@ function makeTable(setting, keypath, setting_value, isLocked) {
   }
 
   _.each(setting.columns, function(col) {
-    html += "<td class='data'><strong>" + col.label + "</strong></td>" // Data
+    html += "<td class='data " + (col.class ? col.class : '') + "'><strong>" + col.label + "</strong></td>" // Data
   })
 
   if (!isLocked && !setting.read_only) {
     if (setting.can_order) {
       html += "<td class=" + Settings.REORDER_BUTTONS_CLASSES +
-              "><span class='glyphicon glyphicon-sort'></span></td>";
+              "><a href='javascript:void(0);' class='glyphicon glyphicon-sort'></a></td>";
     }
-    html += "<td class=" + Settings.ADD_DEL_BUTTONS_CLASSES + "></td></tr>"
+    html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES + "'></td></tr>"
   }
 
   // populate rows in the table from existing values
@@ -804,11 +815,11 @@ function makeTable(setting, keypath, setting_value, isLocked) {
       if (!isLocked && !setting.read_only) {
         if (setting.can_order) {
           html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES+
-                  "'><span class='" + Settings.MOVE_UP_SPAN_CLASSES + "'></span><span class='" +
-                  Settings.MOVE_DOWN_SPAN_CLASSES + "'></span></td>"
+                  "'><a href='javascript:void(0);' class='" + Settings.MOVE_UP_SPAN_CLASSES + "'></a>"
+                  + "<a href='javascript:void(0);' class='" + Settings.MOVE_DOWN_SPAN_CLASSES + "'></a></td>"
         }
         html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES +
-                "'><span class='" + Settings.DEL_ROW_SPAN_CLASSES + "'></span></td>"
+                "'><a href='javascript:void(0);' class='" + Settings.DEL_ROW_SPAN_CLASSES + "'></a></td>"
       }
 
       html += "</tr>"
@@ -850,7 +861,7 @@ function makeTableInputs(setting) {
     html += "<td class='" + Settings.REORDER_BUTTONS_CLASSES + "'></td>"
   }
     html += "<td class='" + Settings.ADD_DEL_BUTTONS_CLASSES +
-            "'><span class='glyphicon glyphicon-plus " + Settings.ADD_ROW_BUTTON_CLASS + "'></span></td>"
+            "'><a href='javascript:void(0);' class='glyphicon glyphicon-plus " + Settings.ADD_ROW_BUTTON_CLASS + "'></a></td>"
   html += "</tr>"
 
   return html
@@ -956,13 +967,14 @@ function addTableRow(add_glyphicon) {
         $(element).html(1)
       }
   } else if ($(element).hasClass(Settings.REORDER_BUTTONS_CLASS)) {
-    $(element).html("<td class='" + Settings.REORDER_BUTTONS_CLASSES + "'><span class='" + Settings.MOVE_UP_SPAN_CLASSES +
-                    "'></span><span class='" + Settings.MOVE_DOWN_SPAN_CLASSES + "'></span></td>")
+    $(element).html("<td class='" + Settings.REORDER_BUTTONS_CLASSES + "'><a href='javascript:void(0);'"
+        + " class='" + Settings.MOVE_UP_SPAN_CLASSES + "'></a><a href='javascript:void(0);' class='"
+        + Settings.MOVE_DOWN_SPAN_CLASSES + "'></span></td>")
   } else if ($(element).hasClass(Settings.ADD_DEL_BUTTONS_CLASS)) {
       // Change buttons
-      var span = $(element).children("span")
-      span.removeClass(Settings.ADD_ROW_SPAN_CLASSES)
-      span.addClass(Settings.DEL_ROW_SPAN_CLASSES)
+      var anchor = $(element).children("a")
+      anchor.removeClass(Settings.ADD_ROW_SPAN_CLASSES)
+      anchor.addClass(Settings.DEL_ROW_SPAN_CLASSES)
     } else if ($(element).hasClass("key")) {
       var input = $(element).children("input")
       $(element).html(input.val())

From b8b5ff4aca9cc04489b5c1870c1f71890fe2c6f2 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 17:14:51 -0700
Subject: [PATCH 28/33] fixes for temporary domain creation

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

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index cd26d0e43e..b1be529280 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -486,7 +486,7 @@ function setupPlacesTable() {
     name: 'places',
     label: 'Places',
     html_id: Settings.PLACES_TABLE_ID,
-    help: "The following places currently point to this domain.</br>To point your places to this domain, "
+    help: "The following places currently point to this domain.</br>To point places to this domain, "
       + " go to the <a href='https://metaverse.highfidelity.com/user/places'>My Places</a> "
       + "page in your High Fidelity Metaverse account.",
     read_only: true,
@@ -519,14 +519,14 @@ function setupPlacesTable() {
     reloadPlacesOrTemporaryName();
   } else {
     // we don't have a domain ID - add a button to offer the user a chance to get a temporary one
-    var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_ID, 'Get a temporary place name');
+    var temporaryPlaceButton = dynamicButton(Settings.GET_TEMPORARY_NAME_BTN_ID, 'Get a temporary place name');
     $('#' + Settings.PLACES_TABLE_ID).after(temporaryPlaceButton);
   }
 
 }
 
 function placeTableRow(name, path, isTemporary) {
-  var name_link = "<a href='hifi://" + name + "'>" + name + "</a>";
+  var name_link = "<a href='hifi://" + name + "'>" + (isTemporary ? name + " (temporary)" : name) + "</a>";
 
   if (isTemporary) {
     var editColumn = "<td class='buttons'></td>";
@@ -559,7 +559,7 @@ function reloadPlacesOrTemporaryName() {
           });
         } else if (data.domain.name) {
           // add a table row for this temporary domain name
-          $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRow(data.domain.name + " (temporary)", '/', true));
+          $('#' + Settings.PLACES_TABLE_ID + " tbody").append(placeTableRow(data.domain.name, '/', true));
         }
       }
     });

From 9024f15d252d8ea909ff3c802ee0fb13ee724664 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 17:19:22 -0700
Subject: [PATCH 29/33] show description for existing domain selection

---
 domain-server/resources/web/js/settings.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index b1be529280..eca0d119d8 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -602,7 +602,15 @@ function chooseFromHighFidelityDomains(clickedButton) {
         modal_body = "<p>Choose the High Fidelity domain you want this domain-server to represent.<br/>This will set your domain ID on the settings page.</p>"
         domain_select = $("<select id='domain-name-select' class='form-control'></select>")
         _.each(data.data.domains, function(domain){
-          domain_select.append("<option value='" + domain.id + "'>(" + domain.id + ")" + (domain.names.length > 0 ? " [" + domain.owner_names + "]" : "") + "</option>");
+          var domainString = "";
+
+          if (domain.description) {
+            domainString += '"' + domain.description + '" - ';
+          }
+
+          domainString += domain.id;
+
+          domain_select.append("<option value='" + domain.id + "'>" + domainString + "</option>");
         })
         modal_body += "<label for='domain-name-select'>Domains</label>" + domain_select[0].outerHTML
         modal_buttons["success"] = {

From 23378a79ab0e4585c7fbe6bfff81c289c1116c1c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 17:25:18 -0700
Subject: [PATCH 30/33] enable full auto networking for temporary name

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

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index eca0d119d8..0c7d282d9c 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -655,7 +655,9 @@ function chooseFromHighFidelityDomains(clickedButton) {
 function createTemporaryDomain() {
   swal({
     title: 'Create temporary place name',
-    text: "This will create a temporary place name and domain ID (valid for 30 days) so other users can easily connect to your domain.",
+    text: "This will create a temporary place name and domain ID (valid for 30 days)"
+      + " so other users can easily connect to your domain.</br></br>"
+      + "In order to make your domain reachable, this will also enable full automatic networking.",
     showCancelButton: true,
     confirmButtonText: 'Create',
     closeOnConfirm: false,
@@ -671,6 +673,10 @@ function createTemporaryDomain() {
 
           // we should have a new domain ID - set it on the domain ID value
           $(Settings.DOMAIN_ID_SELECTOR).val(domain.id).change();
+
+          // we also need to make sure auto networking is set to full
+          $('[data-hidden-input="metaverse.automatic_networking"]').val("full").change();
+
           swal({
             type: 'success',
             title: 'Success!',

From bc0cb6105d23a94d6c9abde4fb2c87b0495929ae Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 15 May 2015 17:28:37 -0700
Subject: [PATCH 31/33] fix sidebar badging for grouped values

---
 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 0c7d282d9c..a1b5383182 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -883,10 +883,10 @@ function makeTableInputs(setting) {
 
 function badgeSidebarForDifferences(changedElement) {
   // figure out which group this input is in
-  var panelParentID = changedElement.closest('.panel').attr('id')
+  var panelParentID = changedElement.closest('.panel').attr('id');
 
   // if the panel contains non-grouped settings, the initial value is Settings.initialValues
-  var isGrouped = $(panelParentID).hasClass('grouped');
+  var isGrouped = $('#' + panelParentID).hasClass('grouped');
 
   if (isGrouped) {
     var initialPanelJSON = Settings.initialValues[panelParentID];

From 6c5626da43b77679e5acee552ca5b70f6f652130 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 18 May 2015 10:19:11 -0700
Subject: [PATCH 32/33] save input on enter or act on table

---
 domain-server/resources/web/js/settings.js | 36 ++++++++++++++--------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index a1b5383182..8e6587695e 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -158,26 +158,39 @@ $(document).ready(function(){
     moveTableRow(this, false);
   });
 
-  $('#' + Settings.FORM_ID).on('keypress', 'table input', function(e){
+  $('#' + Settings.FORM_ID).on('keyup', function(e){
+    var $target = $(e.target);
     if (e.keyCode == 13) {
-      // capture enter in table input
-      // if we have a sibling next to us that has an input, jump to it, otherwise check if we have a glyphicon for add to click
-      sibling = $(this).parent('td').next();
+      if ($target.is('table input')) {
+        // capture enter in table input
+        // if we have a sibling next to us that has an input, jump to it, otherwise check if we have a glyphicon for add to click
+        sibling = $target.parent('td').next();
 
-      if (sibling.hasClass(Settings.DATA_COL_CLASS)) {
-        // set focus to next input
-        sibling.find('input').focus()
-      } else if (sibling.hasClass(Settings.ADD_DEL_BUTTONS_CLASS)) {
-        sibling.find('.' + Settings.ADD_ROW_BUTTON_CLASS).click()
+        if (sibling.hasClass(Settings.DATA_COL_CLASS)) {
+          // set focus to next input
+          sibling.find('input').focus()
+        } else if (sibling.hasClass(Settings.ADD_DEL_BUTTONS_CLASS)) {
+          sibling.find('.' + Settings.ADD_ROW_BUTTON_CLASS).click()
 
-        // set focus to the first input in the new row
-        $(this).closest('table').find('tr.inputs input:first').focus()
+          // set focus to the first input in the new row
+          $target.closest('table').find('tr.inputs input:first').focus()
+        }
+
+      } else if ($target.is('input')) {
+        $target.change().blur();
       }
 
       e.preventDefault();
     }
   });
 
+  $('#' + Settings.FORM_ID).on('keypress', function(e){
+    if (e.keyCode == 13) {
+
+      e.preventDefault();
+    }
+  });
+
   $('#' + Settings.FORM_ID).on('change', '.' + Settings.TRIGGER_CHANGE_CLASS , function(){
     // this input was changed, add the changed data attribute to it
     $(this).attr('data-changed', true)
@@ -222,7 +235,6 @@ $(document).ready(function(){
 
   $('#' + Settings.FORM_ID).on('click', '#' + Settings.DISCONNECT_ACCOUNT_BTN_ID, function(e){
     disonnectHighFidelityAccount();
-    e.preventDefault();
   });
 
   $('#' + Settings.FORM_ID).on('click', '#' + Settings.CONNECT_ACCOUNT_BTN_ID, function(e){

From 1a1b304319095e97a78b24612fc65b2a4d71ec46 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 18 May 2015 10:24:10 -0700
Subject: [PATCH 33/33] update METAVERSE_URL to correct url

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

diff --git a/domain-server/resources/web/js/settings.js b/domain-server/resources/web/js/settings.js
index 8e6587695e..0d37067981 100644
--- a/domain-server/resources/web/js/settings.js
+++ b/domain-server/resources/web/js/settings.js
@@ -1,6 +1,6 @@
 var Settings = {
   showAdvanced: false,
-  METAVERSE_URL: 'http://localhost:3000',
+  METAVERSE_URL: 'https://metaverse.highfidelity.com',
   ADVANCED_CLASS: 'advanced-setting',
   TRIGGER_CHANGE_CLASS: 'trigger-change',
   DATA_ROW_CLASS: 'value-row',