CR

domain-server/resources/web/css/style.css

@@ -315,17 +315,6 @@ table .headers + .headers td {
   color: #2F80ED;
 }
 
-#cloud-domains-alert {
-  position:fixed; top: 55px; width: 100%; z-index: 99;
-}
-
-#cloud-domains-alert .glyphicon {
-  font-size: 11px;
-  color: #000000;
-  mix-blend-mode: normal;
-  opacity: 0.2;
-}
-
 #manage-cloud-domains-link {
   text-align: center;
   margin-top: 20px;

domain-server/resources/web/header.html

@@ -45,10 +45,6 @@
         </div>
       </div><!-- /.container-fluid -->
     </nav>
-    <div id="cloud-domains-alert" class="alert alert-info" role="alert" style="display: none;">
-      <span class="alert-link"><a href="https://highfidelity.com/user/cloud_domains" target="_blank" class="blue-link">Visit Cloud Hosted Domains</a> to manage all your cloud domains</span>
-      <a href="javascript:void(0);" class="glyphicon glyphicon-remove pull-right"></a>
-    </div>
 
     <div class="modal fade" id="restart-modal">
       <div class="modal-dialog">

domain-server/resources/web/js/shared.js

@@ -288,7 +288,6 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
                   });
                 }
 
-
                 return false;
               }
             }

domain-server/resources/web/settings/index.shtml

@@ -12,6 +12,7 @@
       <div id="setup-sidebar" data-clampedwidth="#setup-sidebar-col">
         <script id="list-group-template" type="text/template">
           <% _.each(descriptions, function(group){ %>
+            <% if (!group.hidden) { %>
               <% panelID = group.name ? group.name : group.html_id %>
               <li>
                 <a href="#<%- panelID %>" class="list-group-item">
@@ -19,6 +20,7 @@
                   <%- group.label %>
                 </a>
               </li>
+            <% } %>
           <% }); %>
         </script>
 
@@ -34,20 +36,25 @@
     </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">
 
+        <div id="cloud-domains-alert" class="alert alert-info alert-dismissible" role="alert" style="display: none;">
+          <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+          <span class="alert-link">
+            <a href="https://highfidelity.com/user/cloud_domains" target="_blank" class="blue-link">Visit Cloud Hosted Domains</a> to manage all your cloud domains
+          </span>
+        </div>
+
         <form id="settings-form" role="form">
 
         <script id="panels-template" type="text/template">
           <% _.each(descriptions, function(group){ %>
-            <% if (group.hidden) { %>
+            <% if (!group.hidden) { %>
-              <% $("a[href=#" + group.name + "]").remove() %>
-              <% return %>
-            <% } %>
               <% var settings = _.partition(group.settings, function(value, index) { return !value.deprecated })[0] %>
               <% split_settings = _.partition(settings, function(value, index) { return !value.advanced }) %>
               <% isAdvanced = _.isEmpty(split_settings[0]) && !_.isEmpty(split_settings[1]) %>
@@ -77,6 +84,7 @@
                   <% }%>
                 </div>
               </div>
+            <% } %>
           <% }); %>
         </script>
         <div id="panels"></div>

domain-server/resources/web/settings/js/settings.js

@@ -679,7 +679,7 @@ function setupDomainLabelSetting() {
                 dialog.modal('hide');
                 reloadDomainInfo();
               },
-              error:function(xhr) {
+              error: function(xhr) {
                 var data = parseJSONResponse(xhr);
                 console.log(data, data.status, data.data);
                 if (data.status === "fail") {
@@ -1281,9 +1281,6 @@ function reloadSettings(callback) {
       var cloudWizardExit = qs["cloud-wizard-exit"];
       if (cloudWizardExit != undefined) {
         $('#cloud-domains-alert').show();
-        $('#cloud-domains-alert .glyphicon').on('click', function() {
-          $('#cloud-domains-alert').remove();
-        });
       }
     }
 

domain-server/resources/web/wizard/header.html

@@ -5,7 +5,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
-    <link href="/stats/css/json.human.css" rel="stylesheet" media="screen">
     <link href="/css/style.css" rel="stylesheet" media="screen">
     <link href="/wizard/css/style.css" rel="stylesheet" media="screen">
     <link href="/css/sweetalert.css" rel="stylesheet" media="screen">

domain-server/resources/web/wizard/index.shtml

@@ -3,12 +3,12 @@
   <h4 class="step-title"></h4>
   <dl class="row">
     <dd class="col-md-12">
-      <span class='step-description'>By connecting you High Fidelity Account you will be granting access to your account information.</span>
+      <span class='step-description'>By connecting your High Fidelity Account you will be granting access to your account information.</span>
     </dd>
   </dl>
   <dl class="row">
     <dd class="col-md-12">
-      <a id="connect-account-btn" role="button" class="btn btn-primary btn-md btn-block" href="https://staging.highfidelity.com/user/tokens/new?for_domain_server=true" target="_blank">Connect your High Fidelity account</a>
+      <a id="connect-account-btn" role="button" class="btn btn-primary btn-md btn-block" target="_blank">Connect your High Fidelity account</a>
     </dd>
   </dl>
 
@@ -37,7 +37,7 @@
         <p id="place-name-link"></p>
           <div id="place-name-edit">
             <span class='glyphicon glyphicon-pencil'></span>
-            <a href="javascript:void(0);" id="change-place-name">Choose a custom Place Name instead</a>
+            <a href="#" id="change-place-name">Choose a custom Place Name instead</a>
           </div>
       </div>
     </div>

domain-server/resources/web/wizard/js/wizard.js

@@ -6,6 +6,8 @@ $(document).ready(function(){
   Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE = "You must have an access token to query your High Fidelity places.<br><br>" +
     "Please go back and connect your account.";
 
+  $('#connect-account-btn').attr('href', URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true");
+
   $('[data-toggle="tooltip"]').tooltip();
 
   $('body').on('click', '.next-button', function() {
@@ -51,7 +53,6 @@ $(document).ready(function(){
   });
 
   $('body').on('click', '#explore-settings', function() {
-    console.log('explore-settings')
     exploreSettings();
   });