From 7dc475c695b9a931132bbb6ea1180f0665709b32 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 5 Oct 2017 13:24:51 -0700 Subject: [PATCH] Update domain server settings Move requests that require access token to go through DS Update various styling and ease of use on DS settings page Update domain server settings CP CP --- .../resources/describe-settings.json | 5 +- domain-server/resources/web/css/style.css | 26 +- domain-server/resources/web/header.html | 4 +- .../resources/web/js/domain-server.js | 3 +- .../resources/web/settings/index.shtml | 5 +- .../resources/web/settings/js/settings.js | 360 +++++++++++++++--- domain-server/src/DomainServer.cpp | 199 ++++++++++ .../embedded-webserver/src/HTTPConnection.cpp | 24 +- .../embedded-webserver/src/HTTPConnection.h | 2 + 9 files changed, 567 insertions(+), 61 deletions(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 19f1718370..44713accdb 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -14,7 +14,8 @@ { "name": "id", "label": "Domain ID", - "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank." + "help": "This is your High Fidelity domain ID. If you do not want your domain to be registered in the High Fidelity metaverse you can leave this blank.", + "advanced": true }, { "name": "automatic_networking", @@ -1513,4 +1514,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css index 553f408e15..e157e17b8e 100644 --- a/domain-server/resources/web/css/style.css +++ b/domain-server/resources/web/css/style.css @@ -1,6 +1,7 @@ body { position: relative; padding-bottom: 30px; + margin-top: 70px; } [hidden] { @@ -81,7 +82,7 @@ span.port { #setup-sidebar.affix { position: fixed; - top: 15px; + top: 70px; } #setup-sidebar button { @@ -255,3 +256,26 @@ table .headers + .headers td { -webkit-transform: scale(1.0); } } + +/* From https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d */ +.glyphicon-refresh-animate { + -animation: spin .7s infinite linear; + -ms-animation: spin .7s infinite linear; + -webkit-animation: spinw .7s infinite linear; + -moz-animation: spinm .7s infinite linear; +} + +@keyframes spin { + from { transform: scale(1) rotate(0deg);} + to { transform: scale(1) rotate(360deg);} +} + +@-webkit-keyframes spinw { + from { -webkit-transform: rotate(0deg);} + to { -webkit-transform: rotate(360deg);} +} + +@-moz-keyframes spinm { + from { -moz-transform: rotate(0deg);} + to { -moz-transform: rotate(360deg);} +} diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html index a37e9a6ff0..803b36d121 100644 --- a/domain-server/resources/web/header.html +++ b/domain-server/resources/web/header.html @@ -13,7 +13,7 @@ -