diff --git a/web/app/assets/stylesheets/client/jamServer.css.scss b/web/app/assets/stylesheets/client/jamServer.css.scss index 44955e99f..6eab98e23 100644 --- a/web/app/assets/stylesheets/client/jamServer.css.scss +++ b/web/app/assets/stylesheets/client/jamServer.css.scss @@ -66,4 +66,3 @@ } } - diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss index 3cd310634..c0ec227e9 100644 --- a/web/app/assets/stylesheets/web/main.css.scss +++ b/web/app/assets/stylesheets/web/main.css.scss @@ -589,4 +589,8 @@ strong { fieldset.login-error .login-error-msg { display:block; } +} + +body.jam.web.welcome .no-websocket-connection { + display:none; } \ No newline at end of file diff --git a/web/app/views/layouts/web.html.erb b/web/app/views/layouts/web.html.erb index b4518492c..ee4b02b81 100644 --- a/web/app/views/layouts/web.html.erb +++ b/web/app/views/layouts/web.html.erb @@ -31,7 +31,7 @@ <%= render "layouts/social_meta" %> <% end %> - + <%= javascript_include_tag "web/web" %> @@ -108,6 +108,7 @@ <% end %> JK.app = JK.JamKazam(); + var jamServer = new JK.JamServer(JK.app, $.noop); jamServer.initialize(); diff --git a/web/app/views/users/welcome.html.haml b/web/app/views/users/welcome.html.haml index 5555bc50d..091c2f4cd 100644 --- a/web/app/views/users/welcome.html.haml +++ b/web/app/views/users/welcome.html.haml @@ -1,3 +1,5 @@ +- provide(:page_name, 'welcome') + .welcome .landing-tag %h1 Play music together over the Internet as if in the same room