diff --git a/web/app/assets/javascripts/wizard/gear/gear_wizard.js b/web/app/assets/javascripts/wizard/gear/gear_wizard.js index 2679cfe04..f80a5fe0a 100644 --- a/web/app/assets/javascripts/wizard/gear/gear_wizard.js +++ b/web/app/assets/javascripts/wizard/gear/gear_wizard.js @@ -206,9 +206,7 @@ $dialog = $('#gear-wizard-dialog'); $wizardSteps = $dialog.find('.wizard-step'); $templateSteps = $('#template-ftuesteps'); - console.log("foo") var videoGear = $wizardSteps.filter($('.video-gear')) - console.log("fooBAR") wizard = new context.JK.Wizard(app); stepUnderstandGear.initialize($wizardSteps.filter($('[layout-wizard-step=0]')), self); @@ -219,7 +217,6 @@ stepNetworkTest.initialize($wizardSteps.filter($('.network-test')), self); stepSuccess.initialize($wizardSteps.filter($('.success')), self); - console.log("videoGear", videoGear) if(videoGear.length) { stepVideoGear.initialize(videoGear, self); STEPS[5]=stepVideoGear diff --git a/web/app/views/clients/_session.html.slim b/web/app/views/clients/_session.html.slim index 06006845e..7cd5f6e73 100644 --- a/web/app/views/clients/_session.html.slim +++ b/web/app/views/clients/_session.html.slim @@ -16,7 +16,7 @@ = image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12} | SHARE - - if (Rails.application.config.video_available && Rails.application.config.video_available!="none") || (current_user && current_user.admin) + - if (Rails.application.config.video_available && Rails.application.config.video_available!="none") a#session-webcam.button-grey-toggle.video.left = image_tag "content/icon_cam.png", {:align => "texttop", :height => 12, :width => 12} | VIDEO diff --git a/web/app/views/clients/wizard/gear/_gear_wizard.html.haml b/web/app/views/clients/wizard/gear/_gear_wizard.html.haml index df46ae1e5..e626831c5 100644 --- a/web/app/views/clients/wizard/gear/_gear_wizard.html.haml +++ b/web/app/views/clients/wizard/gear/_gear_wizard.html.haml @@ -158,7 +158,8 @@ %span.direct-monitoring-btn Play -step=4 - -if (Rails.application.config.video_available && Rails.application.config.video_available!="none") || (current_user && current_user.admin) + -if (Rails.application.config.video_available && Rails.application.config.video_available!="none") + %em=Rails.application.config.video_available .wizard-step.video-gear{ 'layout-wizard-step' => "#{step+=1}", 'dialog-title' => "Select Video Gear", 'dialog-purpose' => "SelectVideoGear" } .ftuesteps .clearall @@ -214,7 +215,7 @@ %a.ftue-stepnumber{'data-step-number' => 4} 5 .ftue-step-title Turn Off Direct Monitoring -step = 4 - -if (Rails.application.config.video_available && Rails.application.config.video_available!="none") || (current_user && current_user.admin) + -if (Rails.application.config.video_available && Rails.application.config.video_available!="none") %a.ftue-stepnumber{'data-step-number' => step+=1}=step+1 .ftue-step-title Select Video Gear %a.ftue-stepnumber{'data-step-number' => step+=1}=step+1 diff --git a/web/app/views/users/_user_dropdown.html.erb b/web/app/views/users/_user_dropdown.html.erb index e925fbb43..5bcd80778 100644 --- a/web/app/views/users/_user_dropdown.html.erb +++ b/web/app/views/users/_user_dropdown.html.erb @@ -15,7 +15,6 @@
-