diff --git a/web/app/assets/javascripts/accounts_video_profile.js b/web/app/assets/javascripts/accounts_video_profile.js new file mode 100644 index 000000000..fbb1a6d53 --- /dev/null +++ b/web/app/assets/javascripts/accounts_video_profile.js @@ -0,0 +1,32 @@ +(function (context, $) { + + "use strict"; + + context.JK = context.JK || {}; + context.JK.AccountVideoProfile = function (app) { + var $webcamViewer = new context.JK.WebcamViewer() + function initialize() { + var screenBindings = { + 'beforeShow': beforeShow, + 'beforeHide':beforeHide + }; + app.bindScreen('account/video', screenBindings); + + $webcamViewer.init($(".webcam-container")) + } + + function beforeShow() { + $webcamViewer.beforeShow() + } + + function beforeHide() { + $webcamViewer.setVideoOff() + } + + this.beforeShow = beforeShow + this.beforeHide = beforeHide + this.initialize = initialize + return this; + }; + +})(window, jQuery); \ No newline at end of file diff --git a/web/app/assets/stylesheets/client/account.css.scss b/web/app/assets/stylesheets/client/account.css.scss index 965ed4036..a894e43de 100644 --- a/web/app/assets/stylesheets/client/account.css.scss +++ b/web/app/assets/stylesheets/client/account.css.scss @@ -49,6 +49,22 @@ width: 20%; } + .wizard_control { + margin-bottom: 10px; + } + + .content-wrapper .account-video { + + .subcaption { + margin-bottom: 4px; + } + } + + .webcam-container { + margin-top: 10px; + } + + .account-left h2 { color: #FFFFFF; font-size: 23px; @@ -107,7 +123,7 @@ } } - .audio .audio-profiles-short{ + .audio .audio-profiles-short, .video .video-profiles-short { white-space: normal; } @@ -151,7 +167,6 @@ } .account-audio { - table.generaltable td { vertical-align:middle; } @@ -160,7 +175,6 @@ margin-bottom:9px; } - .rescanning-notice { display:none; @@ -216,7 +230,6 @@ } } - .spinner-large { width:300px; height:300px; diff --git a/web/app/views/clients/_account_video_profile.html.erb b/web/app/views/clients/_account_video_profile.html.erb new file mode 100644 index 000000000..074bfefb7 --- /dev/null +++ b/web/app/views/clients/_account_video_profile.html.erb @@ -0,0 +1,37 @@ + +