Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

admin/app/views/admin/recordings/_mix_fields.html.haml

@@ -5,9 +5,10 @@
         %i before you can upload, you must select 'Update Recording'
     - else
       = f.input :ogg_url, :as => :file
-      - unless f.object.nil? || f.object[:ogg_url].nil?
+      .current_file_holder{style: 'margin-bottom:10px'}
-        .current_file_holder{style: 'margin-bottom:10px'}
+        - unless f.object.nil? || f.object[:ogg_url].nil?
           %a{href: f.object.sign_url(3600, 'ogg'), style: 'padding:0 0 0 20px'} Download OGG
+        - unless f.object.nil? || f.object[:mp3_url].nil?
           %a{href: f.object.sign_url(3600, 'mp3'), style: 'padding:0 0 0 20px'} Download MP3
 
     %div{style: 'display:none'}

db/manifest

@@ -113,3 +113,4 @@ feed_use_recording.sql
 feed_autoincrement_primary_key.sql
 music_sessions_plays.sql
 plays_likes_counters.sql
+add_upright_bass.sql

db/up/add_upright_bass.sql

@@ -0,0 +1 @@
+INSERT INTO instruments (id, description, popularity) VALUES ('upright bass', 'Upright Bass', 2);

web/app/assets/javascripts/createSession.js.erb

@@ -49,7 +49,6 @@
             }
 
             var fan_access = sessionSettings.hasOwnProperty('fan_access') ? sessionSettings.fan_access : true;
-          console.log("FAN ACCESS: MUSICIAN_ACCESS", fan_access.toString(), musician_access.toString(), sessionSettings)
             $('#fan-access').val(fan_access.toString());
             toggleFanAccess();
 

web/app/assets/javascripts/globals.js

@@ -25,6 +25,7 @@
         "Electric Guitar": { "client_id": 50, "server_id": "electric guitar" },
         "Keyboard": { "client_id": 60, "server_id": "keyboard" },
         "Piano": { "client_id": 61, "server_id": "piano" },
+        "Upright Bass": { "client_id": 62, "server_id": "upright bass" },
         "Voice": { "client_id": 70, "server_id": "voice" },
         "Flute": { "client_id": 80, "server_id": "flute" },
         "Clarinet": { "client_id": 90, "server_id": "clarinet" },
@@ -54,6 +55,7 @@
         50: { "server_id": "electric guitar" },
         60: { "server_id": "keyboard" },
         61: { "server_id": "piano"} ,
+        62: { "server_id": "upright bass"} ,
         70: { "server_id": "voice" },
         80: { "server_id": "flute" },
         90: { "server_id": "clarinet" },

web/app/assets/javascripts/utils.js

@@ -56,15 +56,16 @@
         "french horn":"french_horn",
         "harmonica":"harmonica",
         "keyboard":"keyboard",
-        "piano":"keyboard",
         "mandolin":"mandolin",
         "oboe":"oboe",
         "other":"other",
+        "piano":"keyboard",
         "saxophone":"saxophone",
         "trombone":"trombone",
         "trumpet":"trumpet",
         "tuba":"tuba",
         "ukulele":"ukelele",
+        "upright bass":"cello",
         "viola":"viola",
         "violin":"violin",
         "voice":"voice"