diff --git a/admin/app/views/admin/recordings/_form.html.haml b/admin/app/views/admin/recordings/_form.html.haml index 8d172f364..880f26823 100644 --- a/admin/app/views/admin/recordings/_form.html.haml +++ b/admin/app/views/admin/recordings/_form.html.haml @@ -14,7 +14,7 @@ %h3 Validations %p It should not be possible to create an invalid recording/track/mix/claim; there are a great deal of validations that will prevent you from doing something invalid. If you find otherwise, please fill out a JIRA . -= semantic_form_for([:admin, @recording], :html => {:multipart => true}, :url => @recording.new_record? ? admin_recordings_path : "/admin/recordings/#{@recording.id}") do |f| += semantic_form_for([:admin, @recording], :html => {:multipart => true}, :url => @recording.new_record? ? admin_recordings_path : "#{ENV['RAILS_RELATIVE_URL_ROOT']}/admin/recordings/#{@recording.id}") do |f| = f.semantic_errors *f.object.errors.keys = f.inputs name: 'Recording Fields' do diff --git a/admin/config/application.rb b/admin/config/application.rb index 48690b907..0ae29cd8e 100644 --- a/admin/config/application.rb +++ b/admin/config/application.rb @@ -36,7 +36,7 @@ module JamAdmin # Activate observers that should always be running. config.active_record.observers = "JamRuby::InvitedUserObserver" - #config.assets.prefix = ENV['RAILS_RELATIVE_URL_ROOT'] || '/' + config.assets.prefix = "#{ENV['RAILS_RELATIVE_URL_ROOT']}/assets" # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. diff --git a/db/manifest b/db/manifest index 7cde015fe..d750aab4f 100755 --- a/db/manifest +++ b/db/manifest @@ -105,4 +105,5 @@ add_secret_to_user_authorization.sql track_connection_id_not_null.sql recordings_all_discarded.sql recordings_via_admin_web.sql -relax_band_model_varchar.sql \ No newline at end of file +relax_band_model_varchar.sql +add_piano.sql \ No newline at end of file diff --git a/db/up/add_piano.sql b/db/up/add_piano.sql new file mode 100644 index 000000000..5bd01e480 --- /dev/null +++ b/db/up/add_piano.sql @@ -0,0 +1 @@ +INSERT INTO instruments (id, description, popularity) VALUES ('piano', 'Piano', 2); \ No newline at end of file diff --git a/web/app/assets/javascripts/globals.js b/web/app/assets/javascripts/globals.js index 1c47e8927..eac7e2507 100644 --- a/web/app/assets/javascripts/globals.js +++ b/web/app/assets/javascripts/globals.js @@ -24,6 +24,7 @@ "Drums": { "client_id": 40, "server_id": "drums" }, "Electric Guitar": { "client_id": 50, "server_id": "electric guitar" }, "Keyboard": { "client_id": 60, "server_id": "keyboard" }, + "Piano": { "client_id": 61, "server_id": "piano" }, "Voice": { "client_id": 70, "server_id": "voice" }, "Flute": { "client_id": 80, "server_id": "flute" }, "Clarinet": { "client_id": 90, "server_id": "clarinet" }, @@ -52,6 +53,7 @@ 40: { "server_id": "drums" }, 50: { "server_id": "electric guitar" }, 60: { "server_id": "keyboard" }, + 61: { "server_id": "piano"} , 70: { "server_id": "voice" }, 80: { "server_id": "flute" }, 90: { "server_id": "clarinet" }, diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js index f29b944ac..36937668a 100644 --- a/web/app/assets/javascripts/utils.js +++ b/web/app/assets/javascripts/utils.js @@ -56,6 +56,7 @@ "french horn":"french_horn", "harmonica":"harmonica", "keyboard":"keyboard", + "piano":"keyboard", "mandolin":"mandolin", "oboe":"oboe", "other":"other", @@ -573,7 +574,7 @@ // if this has already been initialized, re-init it so it picks up any new $item.easyDropDown('destroy') } - $item.easyDropDown({nativeTouch: !gon.isNativeClient && gon.global.env != "test"}); + $item.easyDropDown({nativeTouch: !gon.isNativeClient && gon.global.env != "test", cutOff:7}); }) } diff --git a/web/app/assets/javascripts/web/signinDialog.js b/web/app/assets/javascripts/web/signinDialog.js index a54f6bc46..baf7c9c59 100644 --- a/web/app/assets/javascripts/web/signinDialog.js +++ b/web/app/assets/javascripts/web/signinDialog.js @@ -38,7 +38,6 @@ } function events() { - console.log($(dialogId + ' .signin-cancel')); $(dialogId + ' .signin-cancel').click(function(e) { app.layout.closeDialog('signin-dialog'); e.stopPropagation(); diff --git a/web/app/views/users/_signinDialog.html.erb b/web/app/views/users/_signinDialog.html.erb index b14733178..8d7cec657 100644 --- a/web/app/views/users/_signinDialog.html.erb +++ b/web/app/views/users/_signinDialog.html.erb @@ -30,7 +30,14 @@ - Keep me signed in +
Invalid login