* VRFS-2748, VRFS-2749 - update styling for / page and home page

admin/Gemfile

@@ -49,7 +49,7 @@ gem 'unf', '0.1.3' #optional fog dependency
 gem 'country-select'
 gem 'aasm', '3.0.16'
 gem 'postgres-copy', '0.6.0'
-gem 'aws-sdk' #, '1.29.1'
+gem 'aws-sdk', '~> 1'
 gem 'bugsnag'
 gem 'gon'
 gem 'cocoon'

web/Gemfile

@@ -51,7 +51,7 @@ gem 'twitter'
 gem 'fb_graph', '2.5.9'
 gem 'sendgrid', '1.2.0'
 gem 'filepicker-rails', '0.1.0'
-gem 'aws-sdk' #, '1.29.1'
+gem 'aws-sdk', '~> 1'
 gem 'aasm', '3.0.16'
 gem 'carrierwave', '0.9.0'
 gem 'carrierwave_direct'

web/app/assets/javascripts/layout.js

@@ -215,6 +215,14 @@
           top: childLayout.top,
           left: childLayout.left
         }, opts.animationDuration);
+
+        if($(this).is('.feed')) {
+          $('#jamblaster-notice').animate({
+            width: childLayout.width,
+            bottom: '102%',
+            left: childLayout.left
+          }, opts.animationDuration)
+        }
       });
     }
 

web/app/assets/stylesheets/client/jamkazam.css.scss

@@ -593,5 +593,15 @@ body.jam .icheckbox_minimal {
     display:inline-block;
   }
 
+}
 
+#jamblaster-notice {
+    position:absolute;
+    width:100%;
+    bottom:105%;
+    border-color:#ED3618;
+    border-style:solid;
+    border-width:1px;
+    padding:10px;
+    @include border_box_sizing;
 }

web/app/assets/stylesheets/web/main.css.scss

@@ -64,10 +64,16 @@ body.web {
     }
   }
 
+  &.register {
+    .landing-content {
+      min-height:460px;
+    }
+  }
+
   .landing-content {
     background-color:black;
     width:100%;
-    min-height: 460px;
+    min-height: 366px;
     position:relative;
     padding-bottom:30px;
 

web/app/controllers/users_controller.rb

@@ -190,12 +190,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/DBo--aj_P1w?autoplay=1"),
-        Slide.new("Playing in a Session",   "web/carousel_bands.jpg",       "http://www.youtube.com/embed/zJ68hA8-fLA?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/DBo--aj_P1w?autoplay=1"),
-        Slide.new("Playing in a Session",   "web/carousel_bands.jpg",       "http://www.youtube.com/embed/zJ68hA8-fLA?autoplay=1")
+        Slide.new("JamKazam Overview",              "web/carousel_overview.png",    "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
+        Slide.new("The Revolutionary New JamBlaster!",  "web/carousel_jamblaster.png",  "http://www.youtube.com/embed/gAJAIHMyois?autoplay=1"),
+        Slide.new("Kudos From Our Community",       "web/carousel_community.png",   "http://www.youtube.com/embed/_7qj5RXyHCo?autoplay=1"),
+        Slide.new("JamKazam Overview",              "web/carousel_overview.png",    "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
+        Slide.new("The Revolutionary New JamBlaster!",  "web/carousel_fans.jpg",        "http://www.youtube.com/embed/gAJAIHMyois?autoplay=1"),
+        Slide.new("Kudos From Our Community",       "web/carousel_community.png",   "http://www.youtube.com/embed/_7qj5RXyHCo?autoplay=1")
     ]
 
     @promo_buzz = PromoBuzz.active
@@ -207,8 +207,8 @@ class UsersController < ApplicationController
     end
 
     # temporary--will go away soon
-    @jamfest_2014 = Event.find_by_id('80bb6acf-3ddc-4305-9442-75e6ec047c27') # production ID
-    @jamfest_2014 = Event.find_by_id('a2dfbd26-9b17-4446-8c61-b67a542ea6ee') unless @jamfest_2014 # development ID
+    #@jamfest_2014 = Event.find_by_id('80bb6acf-3ddc-4305-9442-75e6ec047c27') # production ID
+    #@jamfest_2014 = Event.find_by_id('a2dfbd26-9b17-4446-8c61-b67a542ea6ee') unless @jamfest_2014 # development ID
     # temporary--end
 
     @welcome_page = true

web/app/views/clients/_home.html.slim

@@ -1,4 +1,8 @@
-.screen layout="screen" layout-id="home" 
+.screen layout="screen" layout-id="home"
+  -if Rails.configuration.show_jamblaster_notice
+    #jamblaster-notice
+      a href='https://www.youtube.com/watch?v=gAJAIHMyois' rel="external"
+        span Check out the amazing new JamBlaster, and learn how it can improve your sessions!
   / Layout is different if jam_tracks tile available:
   -jamtracks=Rails.configuration.jam_tracks_available
   -if (jamtracks) 
@@ -19,7 +23,7 @@
         h2 find session
         .homebox-info
           /! 1 session invitation, 19 public sessions active
-      .homecard.feed layout-grid-columns="4" layout-grid-position="8,0" layout-grid-rows="1" layout-link="feed" 
+      .homecard.feed layout-grid-columns="4" layout-grid-position="8,0" layout-grid-rows="1" layout-link="feed"
         h2 feed
         .homebox-info
           /! 4 friends online, 2 currently in sessions

web/app/views/users/welcome.html.haml

@@ -9,11 +9,15 @@
     = link_to "Already have an account?", signin_path, class: "signin", id: "signin"
 
 - content_for :after_black_bar do
-  = render :partial => 'users/follow_links'
-  - if @jamfest_2014
+  //= render :partial => 'users/follow_links'
+  - if Rails.application.config.show_jamblaster_kickstarter_link
     .jamfest{style: 'top:-70px;position:relative'}
-      %a{ href: event_path(@jamfest_2014.slug), style: 'font-size:20px;margin-top:11px' }
-        Listen to the terrific band performances from Virtual Jam Fest 2014!
+      %a{ href: 'https://www.kickstarter.com/projects/jamkazam/jamblaster-play-music-in-real-time-with-others-from-home', style: 'font-size:20px;margin-top:11px' }
+        = "Check out our new "
+        %span JamBlaster
+        = " on "
+        %span Kickstarter
+        = ", the fastest way to play!"
   %div{style: "padding-top:20px;"}
     .right
       = render :partial => "buzz"

web/config/application.rb

@@ -309,5 +309,8 @@ if defined?(Bundler)
     config.influxdb_hosts    = ["localhost"]
     config.influxdb_port     = 8086
     config.influxdb_ignored_environments = ENV["INFLUXDB_ENABLED"] == '1' ? ['test', 'cucumber'] : ['test', 'cucumber', 'development']
+
+    config.show_jamblaster_notice = true
+    config.show_jamblaster_kickstarter_link = true
   end
 end

websocket-gateway/Gemfile

@@ -36,7 +36,7 @@ gem 'carrierwave'
 gem 'fog'
 gem 'devise', '3.3.0' # 3.4.0 causes uninitialized constant ActionController::Metal (NameError)
 gem 'postgres-copy'
-gem 'aws-sdk' #, '1.29.1'
+gem 'aws-sdk', '~> 1'
 gem 'bugsnag'
 gem 'postgres_ext'
 gem 'resque'