From 10f25be8c4413a321976bcf85cb33fcddb312d5f Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 20 Mar 2015 08:53:34 -0500 Subject: [PATCH 1/3] * replace old style of volume changes VRFS-2964 --- ruby/lib/jam_ruby/models/mix.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ruby/lib/jam_ruby/models/mix.rb b/ruby/lib/jam_ruby/models/mix.rb index f441a441f..66f0dd38f 100644 --- a/ruby/lib/jam_ruby/models/mix.rb +++ b/ruby/lib/jam_ruby/models/mix.rb @@ -141,12 +141,14 @@ module JamRuby recording.recorded_tracks.each do |recorded_track| manifest["files"] << { "filename" => recorded_track.sign_url(one_day), "codec" => "vorbis", "offset" => 0 } - mix_params << { "level" => 1.0, "balance" => 0 } + mix_params << { "level" => 100, "balance" => 0 } + # change to 1.0 level later end recording.recorded_backing_tracks.each do |recorded_backing_track| manifest["files"] << { "filename" => recorded_backing_track.sign_url(one_day), "codec" => "vorbis", "offset" => 0 } - mix_params << { "level" => 1.0, "balance" => 0 } + mix_params << { "level" => 100, "balance" => 0 } + # change to 1.0 level later end recording.recorded_jam_track_tracks.each do |recorded_jam_track_track| From 6df6165bb7aa3f8f9d6c2725127de0bd52c4ab15 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 20 Mar 2015 09:55:35 -0500 Subject: [PATCH 2/3] remove jamblaster notice from site --- web/app/assets/javascripts/layout.js | 8 -------- web/app/assets/stylesheets/client/jamkazam.css.scss | 12 ------------ web/app/views/clients/_home.html.slim | 4 ---- 3 files changed, 24 deletions(-) diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js index 6c40f596d..723e75650 100644 --- a/web/app/assets/javascripts/layout.js +++ b/web/app/assets/javascripts/layout.js @@ -215,14 +215,6 @@ 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) - } }); } diff --git a/web/app/assets/stylesheets/client/jamkazam.css.scss b/web/app/assets/stylesheets/client/jamkazam.css.scss index ab1444769..d777d3f11 100644 --- a/web/app/assets/stylesheets/client/jamkazam.css.scss +++ b/web/app/assets/stylesheets/client/jamkazam.css.scss @@ -593,16 +593,4 @@ 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; - text-align:center; - @include border_box_sizing; } \ No newline at end of file diff --git a/web/app/views/clients/_home.html.slim b/web/app/views/clients/_home.html.slim index 8130e82cc..fb6347c84 100644 --- a/web/app/views/clients/_home.html.slim +++ b/web/app/views/clients/_home.html.slim @@ -1,8 +1,4 @@ .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) From d44236abc4e847dbc57529b3df7819263d0d406f Mon Sep 17 00:00:00 2001 From: Seth Call Date: Fri, 20 Mar 2015 09:58:58 -0500 Subject: [PATCH 3/3] remove jamblaster notice from site --- web/config/application.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/web/config/application.rb b/web/config/application.rb index d594b65ca..e0bf20211 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -314,7 +314,6 @@ if defined?(Bundler) config.influxdb_ignored_environments = ENV["INFLUXDB_ENABLED"] == '1' ? ['test', 'cucumber'] : ['test', 'cucumber', 'development'] config.allow_spikes = false - config.show_jamblaster_notice = true config.show_jamblaster_kickstarter_link = true config.metronome_available = true config.backing_tracks_available = true