From c047a1d0a453fcc382c4d994eca0bc3f445c7096 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 9 Nov 2017 17:30:32 -0800 Subject: [PATCH 1/6] Rework perms wizard page --- domain-server/resources/web/css/style.css | 1 - domain-server/resources/web/header.html | 2 +- .../resources/web/wizard/css/style.css | 6 ++++ .../resources/web/wizard/index.shtml | 21 ++++--------- .../resources/web/wizard/js/wizard.js | 30 +++++++++++++++++++ 5 files changed, 43 insertions(+), 17 deletions(-) diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css index 8b004687b9..547b903b15 100644 --- a/domain-server/resources/web/css/style.css +++ b/domain-server/resources/web/css/style.css @@ -307,7 +307,6 @@ table .headers + .headers td { margin-right: 20px; } -#visit-domain-link, .blue-link { font-size: 14px; text-decoration-line: underline; diff --git a/domain-server/resources/web/header.html b/domain-server/resources/web/header.html index 7b07458784..1e32e9f02f 100644 --- a/domain-server/resources/web/header.html +++ b/domain-server/resources/web/header.html @@ -39,7 +39,7 @@
  • Settings
    • diff --git a/domain-server/resources/web/wizard/css/style.css b/domain-server/resources/web/wizard/css/style.css index dcb34ef887..cadba7453e 100644 --- a/domain-server/resources/web/wizard/css/style.css +++ b/domain-server/resources/web/wizard/css/style.css @@ -31,6 +31,12 @@ label { color: #373A3C; } +.wizard-link { + font-size: 16px; + font-weight: normal; + color: #2F80ED; +} + #admin-row { margin-top: 20px; margin-bottom: 20px; diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml index fedf7a0599..a4dc646625 100644 --- a/domain-server/resources/web/wizard/index.shtml +++ b/domain-server/resources/web/wizard/index.shtml @@ -60,8 +60,7 @@

    - Add your High Fidelity username and any other usernames to grant administrator privileges. - + Add your High Fidelity username and any other usernames to grant administrator privileges

    @@ -78,7 +77,7 @@

    - Who can connect to your domain? + Who can connect to your domain?

    @@ -87,25 +86,21 @@

    @@ -113,7 +108,7 @@

    - Who can rez items in your domain? + Who can rez items in your domain?

    @@ -122,25 +117,21 @@

    diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js index 1af3f305b7..41dc06d6c8 100644 --- a/domain-server/resources/web/wizard/js/wizard.js +++ b/domain-server/resources/web/wizard/js/wizard.js @@ -56,6 +56,36 @@ $(document).ready(function(){ exploreSettings(); }); + $('input[type=radio][name=connect-radio]').change(function() { + var inputs = $('input[type=radio][name=rez-radio]'); + var disabled = []; + + switch (this.value) { + case 'none': + disabled = inputs.splice(1); + break; + case 'friends': + disabled = inputs.splice(2); + break; + case 'logged-in': + disabled = inputs.splice(3); + break; + case 'everyone': + disabled = inputs.splice(4); + break; + } + + $.each(inputs, function() { + $(this).prop('disabled', false); + }); + $.each(disabled, function() { + if ($(this).prop('checked')) { + $(inputs.last()).prop('checked', true); + } + $(this).prop('disabled', true); + }); + }); + reloadSettings(function(success) { if (success) { getDomainFromAPI(); From 2782ae03c573a5e507ea75d56b6e36f336026b74 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 9 Nov 2017 18:23:00 -0800 Subject: [PATCH 2/6] Add back buttons --- domain-server/resources/web/wizard/index.shtml | 12 +++++++++--- domain-server/resources/web/wizard/js/wizard.js | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml index a4dc646625..192997fb66 100644 --- a/domain-server/resources/web/wizard/index.shtml +++ b/domain-server/resources/web/wizard/index.shtml @@ -137,9 +137,12 @@
    -
    +
    + +
    +
    -
    +
    @@ -179,7 +182,10 @@
    -
    +
    + +
    +
    diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js index 41dc06d6c8..75d0ca6c41 100644 --- a/domain-server/resources/web/wizard/js/wizard.js +++ b/domain-server/resources/web/wizard/js/wizard.js @@ -108,7 +108,7 @@ function setupWizardSteps() { if (Settings.data.values.wizard.cloud_domain) { $('.desktop-only').remove(); - $('.wizard-step').find('.back-button').hide(); + $('.wizard-step:first').find('.back-button').hide(); steps = $('.wizard-step'); $(steps).each(function(i) { From 796909d366042e29ebf4c9576f558b96ce07ea56 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 10 Nov 2017 16:19:49 -0800 Subject: [PATCH 3/6] Permissions page tweaks --- .../resources/web/wizard/index.shtml | 10 ++++----- .../resources/web/wizard/js/wizard.js | 21 ++++++++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml index 192997fb66..a81738517f 100644 --- a/domain-server/resources/web/wizard/index.shtml +++ b/domain-server/resources/web/wizard/index.shtml @@ -60,7 +60,7 @@

    - Add your High Fidelity username and any other usernames to grant administrator privileges + Add your High Fidelity username and any other usernames to grant administrator privileges

    @@ -77,7 +77,7 @@

    - Who can connect to your domain? + Who can connect to your domain?

    @@ -95,7 +95,7 @@

    @@ -108,7 +108,7 @@

    - Who can rez items in your domain? + Who can rez items in your domain?

    @@ -126,7 +126,7 @@

    diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js index 75d0ca6c41..11b7c3e524 100644 --- a/domain-server/resources/web/wizard/js/wizard.js +++ b/domain-server/resources/web/wizard/js/wizard.js @@ -10,6 +10,25 @@ $(document).ready(function(){ $('[data-toggle="tooltip"]').tooltip(); + $('.fake-link').on('click', function() { + return false; + }); + $('.perms-link').on('click', function() { + var modal_body = '

    '; + modal_body += 'None - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.

    '; + modal_body += 'Friends - Users who are your Friends in High Fidelity.

    '; + modal_body += 'Users logged into High Fidelity - Users who are currently logged into High Fidelity.

    '; + modal_body += 'Everyone - Anyone who uses High Fidelity.'; + modal_body += '
    '; + + dialog = bootbox.dialog({ + title: "User definition", + message: modal_body, + closeButton: true + }); + return false; + }); + $('body').on('click', '.next-button', function() { goToNextStep(); }); @@ -116,7 +135,7 @@ function setupWizardSteps() { }); $('#permissions-description').html('You have been assigned administrator privileges to this domain.'); - $('#admin-description').html('Add more High Fidelity usernames to grant administrator privileges.'); + $('#admin-description').html('Add more High Fidelity usernames'); } else { $('.cloud-only').remove(); $('#save-permissions').text("Finish"); From 9cd8f372f20e43840340de7ee2632d078d2f01d3 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 10 Nov 2017 16:20:49 -0800 Subject: [PATCH 4/6] Fix race condition --- domain-server/resources/web/wizard/js/wizard.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js index 11b7c3e524..524514ead5 100644 --- a/domain-server/resources/web/wizard/js/wizard.js +++ b/domain-server/resources/web/wizard/js/wizard.js @@ -2,6 +2,8 @@ var Metaverse = { accessToken: null } +var currentStepNumber; + $(document).ready(function(){ Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE = "You must have an access token to query your High Fidelity places.

    " + "Please go back and connect your account."; @@ -122,7 +124,7 @@ $(document).ready(function(){ }); function setupWizardSteps() { - var stepsCompleted = Settings.data.values.wizard.steps_completed; + currentStepNumber = Settings.data.values.wizard.steps_completed; var steps = null; if (Settings.data.values.wizard.cloud_domain) { @@ -145,12 +147,12 @@ function setupWizardSteps() { $(this).children(".step-title").text("Step " + (i + 1) + " of " + steps.length); }); - if (stepsCompleted == 0) { + if (currentStepNumber == 0) { $('#skip-wizard-button').show(); } } - var currentStep = steps[stepsCompleted]; + var currentStep = steps[currentStepNumber]; $(currentStep).show(); } @@ -253,7 +255,7 @@ function goToNextStep() { currentStep.hide(); nextStep.show(); - var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) + 1; + currentStepNumber += 1; postSettings({ "wizard": { @@ -282,7 +284,7 @@ function goToPreviousStep() { currentStep.hide(); previousStep.show(); - var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) - 1; + currentStepNumber -= 1; postSettings({ "wizard": { @@ -488,7 +490,7 @@ function saveUsernamePassword() { return; } - var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) + 1; + currentStepNumber += 1; var formJSON = { "security": { From 067436a743c80b06b40862836ef8833edb3b0f0c Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 10 Nov 2017 17:25:27 -0800 Subject: [PATCH 5/6] CR --- domain-server/resources/web/wizard/index.shtml | 2 +- domain-server/resources/web/wizard/js/wizard.js | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml index a81738517f..39b72f58a5 100644 --- a/domain-server/resources/web/wizard/index.shtml +++ b/domain-server/resources/web/wizard/index.shtml @@ -60,7 +60,7 @@

    - Add your High Fidelity username and any other usernames to grant administrator privileges + Add your High Fidelity username and any other usernames to grant administrator privileges

    diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js index 524514ead5..57e85973f4 100644 --- a/domain-server/resources/web/wizard/js/wizard.js +++ b/domain-server/resources/web/wizard/js/wizard.js @@ -11,10 +11,7 @@ $(document).ready(function(){ $('#connect-account-btn').attr('href', URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true"); $('[data-toggle="tooltip"]').tooltip(); - - $('.fake-link').on('click', function() { - return false; - }); + $('.perms-link').on('click', function() { var modal_body = '
    '; modal_body += 'None - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.

    '; From 8f133fc7fa7ed1b742a0063cd40d653f09683582 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 10 Nov 2017 18:12:43 -0800 Subject: [PATCH 6/6] Congratulation page styling fixes --- .../resources/web/wizard/css/style.css | 12 +++++++-- .../resources/web/wizard/index.shtml | 25 +++++++++---------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/domain-server/resources/web/wizard/css/style.css b/domain-server/resources/web/wizard/css/style.css index cadba7453e..dfb576ebba 100644 --- a/domain-server/resources/web/wizard/css/style.css +++ b/domain-server/resources/web/wizard/css/style.css @@ -90,6 +90,14 @@ label { height: 169px; } -#visit-domain-row { - margin-bottom: 68px; +#congratulation-text { + margin-bottom: 59px; +} + +#visit-domain-checkbox { + margin-bottom: 23px; +} + +#visit-domain-checkbox label { + margin: 0 0; } diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml index 39b72f58a5..9d4d8b7381 100644 --- a/domain-server/resources/web/wizard/index.shtml +++ b/domain-server/resources/web/wizard/index.shtml @@ -191,29 +191,28 @@
    -