Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-04 15:30:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR

Browse source
This commit is contained in:
Atlante45 2017-10-27 14:23:10 -07:00
parent 75e98dcef9
commit c7b8d1114d
8 changed files with 88 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
domain-server/resources/web/css/style.css
View file

@ -28,14 +28,14 @@ body {
.table .value-row td, .table .value-row td,
.table .value-category td, .table .value-category td,
.table .inputs td { .table .inputs td {
vertical-align: middle; vertical-align: middle;
} }
.table .table-checkbox { .table .table-checkbox {
/* Fix IE sizing checkboxes to fill table cell */ /* Fix IE sizing checkboxes to fill table cell */
width: auto; width: auto;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
.value-category:not(.inputs) { .value-category:not(.inputs) {
@ -82,7 +82,7 @@ span.port {
#setup-sidebar.affix { #setup-sidebar.affix {
/* This overrides a case where going to the bottom of the page, /* This overrides a case where going to the bottom of the page,
* then scrolling up, causes `position: relative` to be added to the style * then scrolling up, causes `position: relative` to be added to the style
*/ */
position: fixed !important; position: fixed !important;
} }
@ -148,55 +148,55 @@ table {
} }
caption { caption {
color: #333; color: #333;
font-weight: 700; font-weight: 700;
padding-top: 0; padding-top: 0;
} }
table > tbody > .headers > td { table > tbody > .headers > td {
vertical-align: middle; vertical-align: middle;
} }
table .headers + .headers td { table .headers + .headers td {
font-size: 13px; font-size: 13px;
color: #222; color: #222;
} }
#security table .headers td + td { #security table .headers td + td {
text-align: center; text-align: center;
} }
.tooltip.top .tooltip-arrow { .tooltip.top .tooltip-arrow {
border-top-color: #fff; border-top-color: #fff;
border-width: 10px 10px 0; border-width: 10px 10px 0;
margin-bottom: -5px; margin-bottom: -5px;
} }
.tooltip-inner { .tooltip-inner {
padding: 20px 20px 10px 20px; padding: 20px 20px 10px 20px;
font-size: 14px; font-size: 14px;
text-align: left; text-align: left;
color: #333; color: #333;
background-color: #fff; background-color: #fff;
box-shadow: 0 3px 8px 8px #e8e8e8; box-shadow: 0 3px 8px 8px #e8e8e8;
} }
.tooltip.in { .tooltip.in {
opacity: 1; opacity: 1;
} }
.tooltip-inner ul { .tooltip-inner ul {
padding-left: 0; padding-left: 0;
margin-bottom: 15px; margin-bottom: 15px;
} }
.tooltip-inner li { .tooltip-inner li {
list-style-type: none; list-style-type: none;
margin-bottom: 5px; margin-bottom: 5px;
} }
#security .tooltip-inner { #security .tooltip-inner {
max-width: 520px; max-width: 520px;
} }
#xs-advanced-container { #xs-advanced-container {
@ -245,8 +245,8 @@ table .headers + .headers td {
} }
.col-centered { .col-centered {
float: none; float: none;
margin: 0 auto; margin: 0 auto;
} }
.centered-hack-parent { .centered-hack-parent {
@ -275,20 +275,20 @@ table .headers + .headers td {
/* From https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d */ /* From https://gist.github.com/alexandrevicenzi/680147013e902a4eaa5d */
.glyphicon-refresh-animate { .glyphicon-refresh-animate {
-animation: spin .7s infinite linear; -animation: spin .7s infinite linear;
-ms-animation: spin .7s infinite linear; -ms-animation: spin .7s infinite linear;
-webkit-animation: spinw .7s infinite linear; -webkit-animation: spinw .7s infinite linear;
-moz-animation: spinm .7s infinite linear; -moz-animation: spinm .7s infinite linear;
} }
@keyframes spin { @keyframes spin {
from { transform: scale(1) rotate(0deg); } from { transform: scale(1) rotate(0deg); }
to { transform: scale(1) rotate(360deg); } to { transform: scale(1) rotate(360deg); }
} }
@-webkit-keyframes spinw { @-webkit-keyframes spinw {
from { -webkit-transform: rotate(0deg); } from { -webkit-transform: rotate(0deg); }
to { -webkit-transform: rotate(360deg); } to { -webkit-transform: rotate(360deg); }
} }
@-moz-keyframes spinm { @-moz-keyframes spinm {
@ -315,17 +315,6 @@ table .headers + .headers td {
color: #2F80ED; 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 { #manage-cloud-domains-link {
text-align: center; text-align: center;
margin-top: 20px; margin-top: 20px;

4
domain-server/resources/web/header.html
View file

@ -45,10 +45,6 @@
</div> </div>
</div><!-- /.container-fluid --> </div><!-- /.container-fluid -->
</nav> </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 fade" id="restart-modal">
<div class="modal-dialog"> <div class="modal-dialog">

1
domain-server/resources/web/js/shared.js
View file

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

78
domain-server/resources/web/settings/index.shtml
View file

@ -12,13 +12,15 @@
<div id="setup-sidebar" data-clampedwidth="#setup-sidebar-col"> <div id="setup-sidebar" data-clampedwidth="#setup-sidebar-col">
<script id="list-group-template" type="text/template"> <script id="list-group-template" type="text/template">
<% _.each(descriptions, function(group){ %> <% _.each(descriptions, function(group){ %>
<% panelID = group.name ? group.name : group.html_id %> <% if (!group.hidden) { %>
<li> <% panelID = group.name ? group.name : group.html_id %>
<a href="#<%- panelID %>" class="list-group-item"> <li>
<span class="badge"></span> <a href="#<%- panelID %>" class="list-group-item">
<%- group.label %> <span class="badge"></span>
</a> <%- group.label %>
</li> </a>
</li>
<% } %>
<% }); %> <% }); %>
</script> </script>
@ -34,49 +36,55 @@
</div> </div>
<div class="col-md-9 col-sm-9 col-xs-12"> <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"> <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> <button id="advanced-toggle-button-xs" class="btn btn-info advanced-toggle">Show advanced</button>
</div> </div>
<div class="col-xs-12"> <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"> <form id="settings-form" role="form">
<script id="panels-template" type="text/template"> <script id="panels-template" type="text/template">
<% _.each(descriptions, function(group){ %> <% _.each(descriptions, function(group){ %>
<% if (group.hidden) { %> <% if (!group.hidden) { %>
<% $("a[href=#" + group.name + "]").remove() %> <% var settings = _.partition(group.settings, function(value, index) { return !value.deprecated })[0] %>
<% return %> <% split_settings = _.partition(settings, function(value, index) { return !value.advanced }) %>
<% } %> <% isAdvanced = _.isEmpty(split_settings[0]) && !_.isEmpty(split_settings[1]) %>
<% var settings = _.partition(group.settings, function(value, index) { return !value.deprecated })[0] %> <% if (isAdvanced) { %>
<% split_settings = _.partition(settings, function(value, index) { return !value.advanced }) %> <% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
<% isAdvanced = _.isEmpty(split_settings[0]) && !_.isEmpty(split_settings[1]) %> <% } %>
<% if (isAdvanced) { %>
<% $("a[href=#" + group.name + "]").addClass('advanced-setting').hide() %>
<% } %>
<% isGrouped = !!group.name %> <% isGrouped = !!group.name %>
<% panelID = isGrouped ? group.name : group.html_id %> <% panelID = isGrouped ? group.name : group.html_id %>
<div class="panel panel-default<%- (isAdvanced) ? ' advanced-setting' : '' %><%- (isGrouped) ? ' grouped' : '' %>" <div class="panel panel-default<%- (isAdvanced) ? ' advanced-setting' : '' %><%- (isGrouped) ? ' grouped' : '' %>"
id="<%- panelID %>"> id="<%- panelID %>">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"><%- group.label %></h3> <h3 class="panel-title"><%- group.label %></h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<% _.each(split_settings[0], function(setting) { %> <% _.each(split_settings[0], function(setting) { %>
<% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
<%= getFormGroup(keypath, setting, values, false) %>
<% }); %>
<% if (!_.isEmpty(split_settings[1])) { %>
<% $("#advanced-toggle-button").show() %>
<% _.each(split_settings[1], function(setting) { %>
<% keypath = isGrouped ? group.name + "." + setting.name : setting.name %> <% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
<%= getFormGroup(keypath, setting, values, true) %> <%= getFormGroup(keypath, setting, values, false) %>
<% }); %> <% }); %>
<% }%> <% if (!_.isEmpty(split_settings[1])) { %>
<% $("#advanced-toggle-button").show() %>
<% _.each(split_settings[1], function(setting) { %>
<% keypath = isGrouped ? group.name + "." + setting.name : setting.name %>
<%= getFormGroup(keypath, setting, values, true) %>
<% }); %>
<% }%>
</div>
</div> </div>
</div> <% } %>
<% }); %> <% }); %>
</script> </script>
<div id="panels"></div> <div id="panels"></div>

5
domain-server/resources/web/settings/js/settings.js
View file

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

1
domain-server/resources/web/wizard/header.html
View file

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

6
domain-server/resources/web/wizard/index.shtml
View file

@ -3,12 +3,12 @@
<h4 class="step-title"></h4> <h4 class="step-title"></h4>
<dl class="row"> <dl class="row">
<dd class="col-md-12"> <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> </dd>
</dl> </dl>
<dl class="row"> <dl class="row">
<dd class="col-md-12"> <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> </dd>
</dl> </dl>
@ -37,7 +37,7 @@
<p id="place-name-link"></p> <p id="place-name-link"></p>
<div id="place-name-edit"> <div id="place-name-edit">
<span class='glyphicon glyphicon-pencil'></span> <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> </div>
</div> </div>

5
domain-server/resources/web/wizard/js/wizard.js
View file

@ -4,7 +4,9 @@ var Metaverse = {
$(document).ready(function(){ $(document).ready(function(){
Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE = "You must have an access token to query your High Fidelity places.<br><br>" + 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."; "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(); $('[data-toggle="tooltip"]').tooltip();
@ -51,7 +53,6 @@ $(document).ready(function(){
}); });
$('body').on('click', '#explore-settings', function() { $('body').on('click', '#explore-settings', function() {
console.log('explore-settings')
exploreSettings(); exploreSettings();
}); });