Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet

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;

domain-server/resources/web/header.html

@@ -39,7 +39,7 @@
             <li><a href="/settings/">Settings</a></li>
           </ul>
           <ul class="nav navbar-right navbar-nav">
-            <li><a id="visit-domain-link" target="_blank" style="display: none;">Visit domain in VR</a></li>
+            <li><a id="visit-domain-link" class="blue-link" target="_blank" style="display: none;">Visit domain in VR</a></li>
             <li><a href="#" id="restart-server"><span class="glyphicon glyphicon-refresh"></span> Restart</a></li>
           </ul>
         </div>

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;
@@ -84,6 +90,14 @@ label {
   height: 169px;
 }
 
-#visit-domain-row {
+#congratulation-text {
-  margin-bottom: 68px;
+  margin-bottom: 59px;
+}
+
+#visit-domain-checkbox {
+  margin-bottom: 23px;
+}
+
+#visit-domain-checkbox label {
+  margin: 0 0;
 }

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

@@ -60,8 +60,7 @@
   </div>
   <div id="admin-row" class="row">
     <p class="col-md-6">
-      <span id="admin-description" class="step-info"><b>Add your High Fidelity username</b> and any other usernames to grant administrator privileges.</span>
+      <span class="step-info"><span id="admin-description"><b>Add your High Fidelity username</b> and any other usernames</span> to grant <span class='wizard-link' data-toggle="tooltip" title="Users who will have all the permissions for this domain.">administrator privileges</span></span>
-      <span class='glyphicon glyphicon-info-sign' data-toggle="tooltip" title="Users who will have all the permissions for this domain."></span>
     </p>
     <div class="col-md-6">
       <input id="admin-usernames" type="text" class="form-control">
@@ -78,7 +77,7 @@
   <div class="row">
     <div class="col-md-12">
       <p id="connect-question" class="step-info">
-        Who can connect to your domain?
+        Who can <a href='#' class='wizard-link  perms-link'>connect</a> to your domain?
         <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='You can set this to allow a user to connect to this domain.'></span>
       </p>
     </div>
@@ -87,25 +86,21 @@
     <p class="col-md-2">
       <label>
         <input id="connect-none" name="connect-radio" type="radio" value="none" checked> None
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Only the admins of this domain'></span>
       </label>
     </p>
     <p class="col-md-3">
       <label>
         <input id="connect-friends" name="connect-radio" type="radio" value="friends"> Friends
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are your Friends in High Fidelity'></span>
       </label>
     </p>
     <p class="col-md-5">
       <label>
-        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged in to High Fidelity
+        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged into High Fidelity
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are currently logged into High Fidelity'></span>
       </label>
     </p>
     <p class="col-md-2">
       <label>
         <input id="connect-everyone" name="connect-radio" type="radio" value="everyone"> Everyone
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title="Users who aren't logged into High Fidelity"></span>
       </label>
     </p>
   </div>
@@ -113,7 +108,7 @@
   <div class="row">
     <div class="col-md-12">
       <p class="step-info">
-        Who can rez items in your domain?
+        Who can <a href='#' class='wizard-link perms-link'>rez items</a> in your domain?
         <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='You can set this to allow a user to create entities in this domain.'></span>
       </p>
     </div>
@@ -122,33 +117,32 @@
     <p class="col-md-2">
       <label>
         <input id="rez-none" name="rez-radio" type="radio" value="none" checked> None
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Only the admins of this domain'></span>
       </label>
     </p>
     <p class="col-md-3">
       <label>
-        <input id="rez-friends" name="rez-radio" type="radio" value="friends"> Friends
+        <input id="rez-friends" name="rez-radio" type="radio" value="friends" disabled> Friends
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are your Friends in High Fidelity'></span>
       </label>
     </p>
     <p class="col-md-5">
       <label>
-        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in"> Users logged in to High Fidelity
+        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in" disabled> Users logged into High Fidelity
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are currently logged into High Fidelity'></span>
       </label>
     </p>
     <p class="col-md-2">
       <label>
-        <input id="rez-everyone" name="rez-radio" type="radio" value="everyone"> Everyone
+        <input id="rez-everyone" name="rez-radio" type="radio" value="everyone" disabled> Everyone
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title="Users who aren't logged into High Fidelity"></span>
       </label>
     </p>
   </div>
 
   <div class="row">
-    <div class="col-md-3 col-md-offset-9">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
       <button id="save-permissions" type="button" class="btn btn-md btn-block btn-primary">Next</button>
-    </div>
+    </dd>
   </div>
 </div>
 
@@ -188,35 +182,37 @@
   </dl>
 
   <dl class="row">
-    <dd class="col-md-3 col-md-offset-9">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
       <button id="save-username-password" type="button" class="btn btn-md btn-block btn-primary">Finish</button>
     </dd>
   </dl>
 </div>
 
-<div class="wizard-step cloud-only col-md-7 col-centered" style="display: none;">
+<div class="wizard-step cloud-only col-xs-12 col-sm-12 col-md-9 col-lg-7 col-centered" style="display: none;">
   <div class="row">
-    <div class="col-xs-4 col-centered">
+    <div class="col-xs-12" align="center">
       <img id="checkmark-image" src="../images/checkmark.svg">
     </div>
   </div>
 
-  <div class="row">
+  <div id="congratulation-text" class="row">
-    <div class="col-md-12">
+    <div class="col-xs-12">
       <p class="step-info">Congratulations! You have successfully setup and configured your cloud hosted domain.</p>
     </div>
   </div>
 
-  <div id="visit-domain-row" class="row">
-    <div class="col-md-12">
-      <label><input id="go-to-domain" class="form-check-input" type="checkbox"> Visit domain in VR now</label>
-    </div>
-  </div>
-
   <dl class="row">
-    <dd class="col-md-5 col-md-offset-7">
+    <div class="col-xs-12">
-      <button id="explore-settings" type="button" class="btn btn-md btn-block btn-primary">Explore all domain server settings</button>
+      <div class="pull-right">
-    </dd>
+        <div id="visit-domain-checkbox">
+          <label><input id="go-to-domain" class="form-check-input" type="checkbox"> Visit domain in VR now</label>
+        </div>
+        <button id="explore-settings" type="button" class="btn btn-md btn-primary">Explore all domain server settings</button>
+      </div>
+    </div>
   </dl>
 </div>
 

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.<br><br>" +
     "Please go back and connect your account.";
@@ -9,6 +11,22 @@ $(document).ready(function(){
   $('#connect-account-btn').attr('href', URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true");
 
   $('[data-toggle="tooltip"]').tooltip();
+  
+  $('.perms-link').on('click', function() {
+    var modal_body = '<div>';
+    modal_body += '<b>None</b> - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.</br></br>';
+    modal_body += '<b>Friends</b> - Users who are your Friends in High Fidelity.</br></br>';
+    modal_body += '<b>Users logged into High Fidelity</b> - Users who are currently logged into High Fidelity.</br></br>';
+    modal_body += '<b>Everyone</b> - Anyone who uses High Fidelity.';
+    modal_body += '</div>';
+
+    dialog = bootbox.dialog({
+      title: "User definition",
+      message: modal_body,
+      closeButton: true
+    });
+    return false;
+  });
 
   $('body').on('click', '.next-button', function() {
     goToNextStep();
@@ -56,6 +74,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();
@@ -73,12 +121,12 @@ $(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) {
     $('.desktop-only').remove();
-    $('.wizard-step').find('.back-button').hide();
+    $('.wizard-step:first').find('.back-button').hide();
 
     steps = $('.wizard-step');
     $(steps).each(function(i) {
@@ -86,7 +134,7 @@ function setupWizardSteps() {
     });
 
     $('#permissions-description').html('You <span id="username-display"></span>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");
@@ -96,12 +144,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();
 }
 
@@ -204,7 +252,7 @@ function goToNextStep() {
     currentStep.hide();
     nextStep.show();
 
-    var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) + 1;
+    currentStepNumber += 1;
 
     postSettings({
       "wizard": {
@@ -233,7 +281,7 @@ function goToPreviousStep() {
     currentStep.hide();
     previousStep.show();
 
-    var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) - 1;
+    currentStepNumber -= 1;
 
     postSettings({
       "wizard": {
@@ -439,7 +487,7 @@ function saveUsernamePassword() {
     return;
   }
 
-  var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) + 1;
+  currentStepNumber += 1;
 
   var formJSON = {
     "security": {

interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml

@@ -113,21 +113,6 @@ Rectangle {
         }
     }
 
-    onVisibleChanged: {
-        if (!visible) {
-            titleBarText.text = "Certificate";
-            popText.text = "PROOF OF PURCHASE";
-            root.certificateId = "";
-            root.itemName = "--";
-            root.itemOwner = "--";
-            root.itemEdition = "--";
-            root.dateOfPurchase = "--";
-            root.marketplaceUrl = "";
-            root.isMyCert = false;
-            errorText.text = "";
-        }
-    }
-
     // This object is always used in a popup.
     // This MouseArea is used to prevent a user from being
     //     able to click on a button/mouseArea underneath the popup.
@@ -420,6 +405,18 @@ Rectangle {
             case 'inspectionCertificate_setCertificateId':
                 root.certificateId = message.certificateId;
             break;
+            case 'inspectionCertificate_resetCert':
+                titleBarText.text = "Certificate";
+                popText.text = "PROOF OF PURCHASE";
+                root.certificateId = "";
+                root.itemName = "--";
+                root.itemOwner = "--";
+                root.itemEdition = "--";
+                root.dateOfPurchase = "--";
+                root.marketplaceUrl = "";
+                root.isMyCert = false;
+                errorText.text = "";
+            break;
             default:
                 console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));
         }

scripts/system/marketplaces/marketplaces.js

@@ -128,6 +128,12 @@
         } else {
             ContextOverlay.isInMarketplaceInspectionMode = false;
         }
+
+        if (!onCommerceScreen) {
+            tablet.sendToQml({
+                method: 'inspectionCertificate_resetCert'
+            });
+        }
     }
 
     function openWallet() {