diff --git a/cmake/externals/draco/CMakeLists.txt b/cmake/externals/draco/CMakeLists.txt index 44ddd6d3de..6a894e76b6 100644 --- a/cmake/externals/draco/CMakeLists.txt +++ b/cmake/externals/draco/CMakeLists.txt @@ -13,7 +13,7 @@ ExternalProject_Add( ${EXTERNAL_NAME} URL http://hifi-public.s3.amazonaws.com/dependencies/draco-1.1.0.zip URL_MD5 208f8b04c91d5f1c73d731a3ea37c5bb - CONFIGURE_COMMAND CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH= ${EXTRA_CMAKE_FLAGS} + CONFIGURE_COMMAND CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=-$ ${EXTRA_CMAKE_FLAGS} LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1 @@ -23,10 +23,11 @@ ExternalProject_Add( set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals") ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR) +set(SUFFIXED_INSTALL_DIR "${INSTALL_DIR}-$") string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER) -set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of Draco include directories") +set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SUFFIXED_INSTALL_DIR}/include CACHE PATH "List of Draco include directories") if (UNIX) set(LIB_PREFIX "lib") @@ -35,6 +36,6 @@ elseif (WIN32) set(LIB_EXT "lib") endif () -set(${EXTERNAL_NAME_UPPER}_LIBRARY ${INSTALL_DIR}/lib/${LIB_PREFIX}draco.${LIB_EXT} CACHE FILEPATH "Path to Draco release library") -set(${EXTERNAL_NAME_UPPER}_ENCODER_LIBRARY ${INSTALL_DIR}/lib/${LIB_PREFIX}dracoenc.${LIB_EXT} CACHE FILEPATH "Path to Draco encoder release library") -set(${EXTERNAL_NAME_UPPER}_DECODER_LIBRARY ${INSTALL_DIR}/lib/${LIB_PREFIX}dracodec.${LIB_EXT} CACHE FILEPATH "Path to Draco decoder release library") +set(${EXTERNAL_NAME_UPPER}_LIBRARY ${SUFFIXED_INSTALL_DIR}/lib/${LIB_PREFIX}draco.${LIB_EXT} CACHE FILEPATH "Path to Draco release library") +set(${EXTERNAL_NAME_UPPER}_ENCODER_LIBRARY ${SUFFIXED_INSTALL_DIR}/lib/${LIB_PREFIX}dracoenc.${LIB_EXT} CACHE FILEPATH "Path to Draco encoder release library") +set(${EXTERNAL_NAME_UPPER}_DECODER_LIBRARY ${SUFFIXED_INSTALL_DIR}/lib/${LIB_PREFIX}dracodec.${LIB_EXT} CACHE FILEPATH "Path to Draco decoder release library") diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index cade6b25dc..d55da6c848 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -1,6 +1,12 @@ { - "version": 1.9, + "version": 2.0, "settings": [ + { + "name": "label", + "label": "Label", + "settings": [ + ] + }, { "name": "metaverse", "label": "Metaverse / Networking", @@ -14,7 +20,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", @@ -82,11 +89,13 @@ { "name": "description", "label": "Description", + "advanced": true, "help": "A description of your domain (256 character limit)." }, { "name": "maturity", "label": "Maturity", + "advanced": true, "help": "A maturity rating, available as a guideline for content on your domain.", "default": "unrated", "type": "select", @@ -116,6 +125,7 @@ { "name": "hosts", "label": "Hosts", + "advanced": true, "type": "table", "can_add_new_rows": true, "help": "Usernames of hosts who can reliably show your domain to new visitors.", @@ -131,6 +141,7 @@ { "name": "tags", "label": "Tags", + "advanced": true, "type": "table", "can_add_new_rows": true, "help": "Common categories under which your domain falls.", @@ -1625,6 +1636,29 @@ ] } ] + }, + { + "name": "wizard", + "label": "Setup Wizard", + "restart": false, + "hidden": true, + "settings": [ + { + "name": "cloud_domain", + "type": "checkbox", + "default": false + }, + { + "name": "steps_completed", + "type": "int", + "default": 0 + }, + { + "name": "completed_once", + "type": "checkbox", + "default": false + } + ] } ] -} \ 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..8b004687b9 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] { @@ -27,14 +28,14 @@ body { .table .value-row td, .table .value-category td, .table .inputs td { - vertical-align: middle; + vertical-align: middle; } .table .table-checkbox { - /* Fix IE sizing checkboxes to fill table cell */ - width: auto; - margin-left: auto; - margin-right: auto; + /* Fix IE sizing checkboxes to fill table cell */ + width: auto; + margin-left: auto; + margin-right: auto; } .value-category:not(.inputs) { @@ -80,8 +81,10 @@ span.port { } #setup-sidebar.affix { - position: fixed; - top: 15px; + /* This overrides a case where going to the bottom of the page, + * then scrolling up, causes `position: relative` to be added to the style + */ + position: fixed !important; } #setup-sidebar button { @@ -145,55 +148,55 @@ table { } caption { - color: #333; - font-weight: 700; - padding-top: 0; + color: #333; + font-weight: 700; + padding-top: 0; } table > tbody > .headers > td { - vertical-align: middle; + vertical-align: middle; } table .headers + .headers td { - font-size: 13px; - color: #222; + font-size: 13px; + color: #222; } #security table .headers td + td { - text-align: center; + text-align: center; } .tooltip.top .tooltip-arrow { - border-top-color: #fff; - border-width: 10px 10px 0; - margin-bottom: -5px; + border-top-color: #fff; + border-width: 10px 10px 0; + margin-bottom: -5px; } .tooltip-inner { - padding: 20px 20px 10px 20px; - font-size: 14px; - text-align: left; - color: #333; - background-color: #fff; - box-shadow: 0 3px 8px 8px #e8e8e8; + padding: 20px 20px 10px 20px; + font-size: 14px; + text-align: left; + color: #333; + background-color: #fff; + box-shadow: 0 3px 8px 8px #e8e8e8; } .tooltip.in { - opacity: 1; + opacity: 1; } .tooltip-inner ul { - padding-left: 0; - margin-bottom: 15px; + padding-left: 0; + margin-bottom: 15px; } .tooltip-inner li { - list-style-type: none; - margin-bottom: 5px; + list-style-type: none; + margin-bottom: 5px; } #security .tooltip-inner { - max-width: 520px; + max-width: 520px; } #xs-advanced-container { @@ -241,6 +244,20 @@ table .headers + .headers td { animation-delay: -0.16s; } +.col-centered { + float: none; + margin: 0 auto; +} + +.centered-hack-parent { + text-align: center; +} + +.centered-hack { + text-align: left; + display: inline-block; +} + @-webkit-keyframes bouncedelay { 0%, 80%, 100% { -webkit-transform: scale(0.0) } 40% { -webkit-transform: scale(1.0) } @@ -255,3 +272,50 @@ 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); } +} + +.warning-text { + padding-top: 10px; + color: #EB5757; +} + +.account-connected-header { + color: #6FCF97; + font-size: 30px; + margin-right: 20px; +} + +#visit-domain-link, +.blue-link { + font-size: 14px; + text-decoration-line: underline; + font-weight: normal; + color: #2F80ED; +} + +#manage-cloud-domains-link { + text-align: center; + margin-top: 20px; +} diff --git a/domain-server/resources/web/favicon.ico b/domain-server/resources/web/favicon.ico new file mode 100644 index 0000000000..becc1b8e8b Binary files /dev/null and b/domain-server/resources/web/favicon.ico differ diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html index a37e9a6ff0..7b07458784 100644 --- a/domain-server/resources/web/header.html +++ b/domain-server/resources/web/header.html @@ -13,7 +13,7 @@ -