diff --git a/web/app/assets/javascripts/AAA_Log.js b/web/app/assets/javascripts/AAA_Log.js index ecd63180a..cd16f22b6 100644 --- a/web/app/assets/javascripts/AAA_Log.js +++ b/web/app/assets/javascripts/AAA_Log.js @@ -1,4 +1,4 @@ -(function(context, $) { +(function (context, $) { "use strict"; @@ -22,6 +22,11 @@ }); } + if (!console.debug) { + console.log("No console.debug found - defining..."); + context.console.debug = function() { console.log(arguments); } + } + context.JK.logger = context.console; // JW - some code to tone down logging. Uncomment the following, and diff --git a/web/app/assets/javascripts/hoverFan.js b/web/app/assets/javascripts/hoverFan.js index 44d6ba075..1aa510721 100644 --- a/web/app/assets/javascripts/hoverFan.js +++ b/web/app/assets/javascripts/hoverFan.js @@ -51,6 +51,7 @@ } var fanHtml = context.JK.fillTemplate(template, { + userId: response.id, avatar_url: context.JK.resolveAvatarUrl(response.photo_url), name: response.name, location: response.location, diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js index 6d05f6437..d2afc4ef5 100644 --- a/web/app/assets/javascripts/layout.js +++ b/web/app/assets/javascripts/layout.js @@ -731,7 +731,7 @@ } if (notifyDetails !== undefined) { - setNotificationInfo(notifyDetails.message, notifyDetails.descriptor); + setNotificationInfo(notifyDetails.message, notifyDetails.descriptor, $notify); } notifyDetails = {}; diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb index 0c34d2e8a..c80d709e2 100644 --- a/web/app/controllers/users_controller.rb +++ b/web/app/controllers/users_controller.rb @@ -198,12 +198,12 @@ class UsersController < ApplicationController def welcome @slides = [ - Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), - Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"), - Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"), - Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), - Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"), - Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s") + Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"), + Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1") ] @promo_buzz = PromoBuzz.active diff --git a/web/app/views/clients/_ftue.html.erb b/web/app/views/clients/_ftue.html.erb index d47a5b3d8..9ef6872bd 100644 --- a/web/app/views/clients/_ftue.html.erb +++ b/web/app/views/clients/_ftue.html.erb @@ -112,8 +112,8 @@ - - + + diff --git a/web/app/views/corps/media_center.html.erb b/web/app/views/corps/media_center.html.erb index 90c9435d8..b32e1a6ef 100644 --- a/web/app/views/corps/media_center.html.erb +++ b/web/app/views/corps/media_center.html.erb @@ -46,7 +46,7 @@

diff --git a/web/app/views/users/_signupDialog.html.erb b/web/app/views/users/_signupDialog.html.erb index 1c6e38aec..66d6fea7f 100644 --- a/web/app/views/users/_signupDialog.html.erb +++ b/web/app/views/users/_signupDialog.html.erb @@ -22,8 +22,6 @@
Already have an account?
-
-

Signups not accepted until Wednesday, March 12th