From e3910273ef8aa48e9f28acfa1f257247a3f389f6 Mon Sep 17 00:00:00 2001 From: Orestis Tsakiridis Date: Thu, 20 Dec 2018 09:39:47 +0200 Subject: [PATCH] FS-872 Reviewed text content of tour steps --- .../modules/templates/tour-splash-call-success.html | 5 +++-- .../templates/tour-splash-message-success.html | 5 +++-- src/main/webapp/resources/css/olympus.css | 3 +++ src/main/webapp/resources/js/directives.js | 12 +++++------- src/main/webapp/resources/js/takeatour.js | 8 ++++---- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/modules/templates/tour-splash-call-success.html b/src/main/webapp/modules/templates/tour-splash-call-success.html index 6df07c6..eb532bf 100644 --- a/src/main/webapp/modules/templates/tour-splash-call-success.html +++ b/src/main/webapp/modules/templates/tour-splash-call-success.html @@ -5,9 +5,10 @@
-

You are ready!

+

Congratulations !

-
Go back to Console and build more exciting Applications!
+
You built your first application. You can now go back to Console and play with the + Visual Designer to build more exciting Applications! Don’t forget to visit our documentation too!
diff --git a/src/main/webapp/modules/templates/tour-splash-message-success.html b/src/main/webapp/modules/templates/tour-splash-message-success.html index 6df07c6..eb532bf 100644 --- a/src/main/webapp/modules/templates/tour-splash-message-success.html +++ b/src/main/webapp/modules/templates/tour-splash-message-success.html @@ -5,9 +5,10 @@
-

You are ready!

+

Congratulations !

-
Go back to Console and build more exciting Applications!
+
You built your first application. You can now go back to Console and play with the + Visual Designer to build more exciting Applications! Don’t forget to visit our documentation too!
diff --git a/src/main/webapp/resources/css/olympus.css b/src/main/webapp/resources/css/olympus.css index 21c0b62..185d79e 100644 --- a/src/main/webapp/resources/css/olympus.css +++ b/src/main/webapp/resources/css/olympus.css @@ -399,6 +399,9 @@ form[role=login] button:enabled:hover { .tour-modal .modal-body { text-align: center; } +.tour-modal .modal-body a { + color: #23527c; +} .tour-modal .modal-header .close { color: var(--takeatour-text-color); } diff --git a/src/main/webapp/resources/js/directives.js b/src/main/webapp/resources/js/directives.js index 0077c03..2d7d672 100644 --- a/src/main/webapp/resources/js/directives.js +++ b/src/main/webapp/resources/js/directives.js @@ -169,8 +169,8 @@ olyDirectives.directive('tourStep', function($compile, tourManager, $interval, $ link: function postLink(scope, element,attrs) { var stepInfo = tourManager.getStep(attrs.tourStep, attrs.tourName); scope.tourStep = stepInfo; - console.log('creating tour step', attrs.tourStep ); - console.log('visibility: ', attrs.tourStep, elementIsVisible(element), element.length); + //console.log('creating tour step', attrs.tourStep ); + //console.log('visibility: ', attrs.tourStep, elementIsVisible(element), element.length); // start monitoring visibility of step target.Called when tourStep.active turns true stepInfo.visible = undefined; @@ -181,7 +181,7 @@ olyDirectives.directive('tourStep', function($compile, tourManager, $interval, $ var myPopover; var watchesToClear = []; function activate() { - console.log('will start monitoring visibility for ', attrs.tourStep) + //console.log('will start monitoring visibility for ', attrs.tourStep) clearIntervalHandle = $interval(function () { if (elementIsVisible(element)) { if (!stepInfo.visible) { @@ -191,14 +191,12 @@ olyDirectives.directive('tourStep', function($compile, tourManager, $interval, $ } myPopover.show(); stepInfo.visible = true; - console.log('set visibility to ', stepInfo.visible); } } else { if (myPopover && stepInfo.visible) { myPopover.hide(); myPopover.destroy(); stepInfo.visible = false; - console.log('set visibility to ', stepInfo.visible); } } },500); @@ -256,7 +254,7 @@ olyDirectives.directive('touring', function($compile, tourManager) { scope.tourManager = tourManager; scope.$watch("tourManager.countActiveSteps()", function (newVal, oldVal) { - console.warn('active step count: ', newVal) + //console.warn('active step count: ', newVal) if (newVal === 0) { tourManager.onTourAborted() } @@ -294,7 +292,7 @@ olyDirectives.directive('backdrop', function($interval, backdropService) { if (!rectPadding.bottom) rectPadding.bottom = 0; scope.$watch(attrs.backdrop, function (newVal, oldVal) { - console.log((scope.tourStep.name ? (scope.tourStep.name+" "): "") + 'backdrop: ', newVal) + //console.log((scope.tourStep.name ? (scope.tourStep.name+" "): "") + 'backdrop: ', newVal) if (newVal && !scope.backdropActive) { // we need to activate backdrop activateBackdrop(); diff --git a/src/main/webapp/resources/js/takeatour.js b/src/main/webapp/resources/js/takeatour.js index 922d67d..70b0181 100644 --- a/src/main/webapp/resources/js/takeatour.js +++ b/src/main/webapp/resources/js/takeatour.js @@ -6,7 +6,7 @@ angular.module('mcWebRTC').run(function (tourManager, $rootScope, $location) { tourManager.addTour("main"); tourManager.registerStep("step-enter-creds", { name:'step-enter-creds', - body:"

This is the WebRTC Demo sign page.

For Username type the user part of your account email. For example, for alice@company.com just type alice.

The account password will work as it is.

", + body:"

This is the WebRTC Demo sign page.

For Username, please enter the user part of your account email. For example, for alice@company.com just type alice.

For password, you can reuse your account password.

", order: 1, placement: 'right', customClasses: "popover-medium" @@ -21,14 +21,14 @@ angular.module('mcWebRTC').run(function (tourManager, $rootScope, $location) { tourManager.registerStep('step-enter-contact-address', { name: 'step-enter-contact-address', - body: "

Paste your number here and optionally give it a name. Then click 'Add contact'.

Hint: If you don't remember it, your number is {{tourManager.context.phoneNumber}}.

", + body: "

Paste the number you previously mapped your application to and give it a name. Then click Add contact.

Hint: If you don't remember it, your number is {{tourManager.context.phoneNumber}}.

", order: 4, placement: 'right' }, "main"); tourManager.registerStep('step-make-the-call', { name: 'step-make-the-call', - body: '

Time to call your number and test your application.

Click on the phone button bellow to initiate the call.

', + body: '

You can now call your number and test your application by clicking on the phone button below to initiate the call.

', order: 5, placement: 'top-right', //done: [{byExpression: "inCall && inCall.intStatus === 'ESTABLISHED'", doNext: 'tourManager.stopTour(); showTourSplash();', delay: 2000}] @@ -36,7 +36,7 @@ angular.module('mcWebRTC').run(function (tourManager, $rootScope, $location) { tourManager.registerStep('step-send-the-message', { name: 'step-send-the-message', - body: '

Time to send a message to your application.

Type a messsage and click on the button below to send it.

', + body: '

You can now send an SMS to your number and test your application. Type the message and click on the message button below.

', order: 5, placement: 'top-left', }, "main");