diff --git a/src/styles/components/helptour.scss b/src/styles/components/helptour.scss index a4f72f9d..b71fc900 100644 --- a/src/styles/components/helptour.scss +++ b/src/styles/components/helptour.scss @@ -66,4 +66,41 @@ top: 20%; } } + .mediaAccessPane { + top: 10px; + left: initial; + right: 10px; + } +} + +.arrow+.secondArrow { + border-width: 11px; + &:after { + border-width: 10px; + content: ""; + } +} +.arrow+.secondArrow, +.arrow+.secondArrow:after { + position: absolute; + display: block; + width: 0; + height: 0; + border-color: rgba(0, 0, 0, 0); + border-style: solid; +} +.secondArrow.right { + top: 50%; + left: -11px; + margin-top: -11px; + border-left-width: 0; + border-right-color: #999; + border-right-color: rgba(0, 0, 0, 0.25); + &:after { + content: " "; + left: 1px; + bottom: -10px; + border-left-width: 0; + border-right-color: #FFF; + } } diff --git a/static/js/directives/helptour.js b/static/js/directives/helptour.js index d1ad9d07..899cb00a 100644 --- a/static/js/directives/helptour.js +++ b/static/js/directives/helptour.js @@ -24,7 +24,7 @@ define(['jquery', 'angular', 'text!partials/helpoverlay.html', 'text!partials/he //helptour return [function() { - var controller = ['$scope', '$timeout', '$modal', '$rootScope', function($scope, $timeout, $modal, $rootScope) { + var controller = ['$scope', '$timeout', '$modal', '$rootScope', 'mediaStream', function($scope, $timeout, $modal, $rootScope, mediaStream) { var displayTime = 2000; var shown = localStorage.getItem('mediastream-helptour'); var timeoutAutoStepsIn = []; @@ -41,6 +41,12 @@ define(['jquery', 'angular', 'text!partials/helpoverlay.html', 'text!partials/he screenshare: false, settings: false }; + var trigger = false; + menus.triggerMediaAccess = function() { + if (trigger) { + mediaStream.webrtc.testMediaAccess(function() {}); + } + }; menus.toggleRoom = function() { var scope = angular.element('#roombar .roombar').scope(); if (scope) { @@ -56,6 +62,9 @@ define(['jquery', 'angular', 'text!partials/helpoverlay.html', 'text!partials/he var toggleTargetMenu = function() { var menu = $($scope.steps[$scope.currentIndex]).data('menu'); if (menu) { + if (menu.search('trigger') > -1) { + trigger = !trigger; + } menus[menu](); } }; diff --git a/static/partials/helpoverlay.html b/static/partials/helpoverlay.html index a0082897..fcaf785e 100644 --- a/static/partials/helpoverlay.html +++ b/static/partials/helpoverlay.html @@ -1,25 +1,36 @@
-

{{_('A room')}}

+
+

{{_('A room')}}

{{_('Place to meet people(buddy). Change rooms here and easily send friends a room link with the social media links provided. Not all room names are available and certain characters are automatically removed.')}}
-

{{_('Buddy List')}}

+
+

{{_('Buddy List')}}

{{_('List of all buddys in the same room and saved contacts.')}}
-

{{_('A buddy')}}

+
+

{{_('A buddy')}}

{{_('An individual in the same room. If someone is in the same room, a buddy card will be shown. Simply hover over the card to callout chat/call actions. If a star appears next to a buddy comment, the buddy is logged in. When the star is filled the buddy is a contact. Click the star to add a buddy as a contact or remove a contact.')}}
-

{{_('Chat sessions')}}

+
+

{{_('Chat sessions')}}

{{_('Group and individual chat sessions. Chat with everyone in a room or chat individually. In group chats you are able to share files and your current location. In individual chats you are also able to start a video call.')}}
-

{{_('Settings')}}

+
+

{{_('Settings')}}

{{_('Choose a name, upload a picture, signin, and customize you experience.')}}
+
+
+
+

{{_('Media permission')}}

+
{{_('Everytime a call is made or recieved a permission window from the browser will show up like this. To make a call you must accept, otherwise the browser cannot use your wecam and video to make a call. This is a security and privacy precaution.')}}
+

{{_('Tour Control')}} / {{_('Window %d of %d', currentIndex + 1, steps.length)}}