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

pb/src/client_container.proto

@@ -121,6 +121,7 @@ message ClientMessage {
     // band notifications
     optional BandInvitation             band_invitation = 225;
     optional BandInvitationAccepted     band_invitation_accepted = 230;
+    optional BandSessionJoin            band_session_join = 235;
 
     optional MusicianSessionFresh       musician_session_fresh = 240;
     optional MusicianSessionStale       musician_session_stale = 245;
@@ -302,14 +303,6 @@ message MusicianSessionJoin {
     optional string created_at = 5;
 }
 
-message BandSessionJoin {
-    optional string session_id = 1;
-    optional string photo_url = 2;
-    optional string msg = 3;
-    optional string notification_id = 4;
-    optional string created_at = 5;
-}
-
 message MusicianRecordingSaved {
     optional string recording_id = 1;
     optional string photo_url = 2;
@@ -365,6 +358,14 @@ message BandInvitationAccepted {
     optional string created_at = 5;
 }
 
+message BandSessionJoin {
+    optional string session_id = 1;
+    optional string photo_url = 2;
+    optional string msg = 3;
+    optional string notification_id = 4;
+    optional string created_at = 5;
+}
+
 // route_to: client:
 // sent by server to let the rest of the participants know a client has become active again after going stale 
 message MusicianSessionFresh {

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

@@ -44,6 +44,9 @@
                 $('#musician-access-option-' + approval_required).iCheck('check').attr('checked', 'checked');
             }
 
+            var bandId = sessionSettings.hasOwnProperty('band_id') ? sessionSettings.band_id : '';
+            $('#band-list', $form).val(bandId);
+
             var fan_access = sessionSettings.hasOwnProperty('fan_access') ? sessionSettings.fan_access : true;
             $('#fan-access option[value=' + fan_access + ']').attr('selected', 'selected');
             toggleFanAccess();

web/app/assets/javascripts/genreSelector.js

@@ -46,7 +46,7 @@
                 var genreOptionHtml = context.JK.fillTemplate(template, value);
                 $('select', parentSelector).append(genreOptionHtml);
             });
-
+            context.JK.dropdown($('select', parentSelector));
         }
 
         function getSelectedGenres(parentSelector) {
@@ -66,7 +66,8 @@
             $.each(genreList, function(index, value) {
                 values.push(value.toLowerCase());
             });
-            var selectedVal = $('select', parentSelector).val(values);
+
+            $('select', parentSelector).val(values[0]);
         }
 
         function initialize() {

web/app/assets/javascripts/instrumentSelector.js

@@ -7,13 +7,13 @@
     "use strict";
 
     context.JK = context.JK || {};
-    context.JK.GenreSelectorHelper = (function() {
+    context.JK.InstrumentSelectorHelper = (function() {
 
         var logger = context.JK.logger;
         var _genres = [];  // will be list of structs: [ {label:xxx, value:yyy}, {...}, ... ]
 
         function loadGenres() {
-            var url = "/api/genres";
+            var url = "/api/instruments";
             $.ajax({
                 type: "GET",
                 url: url,
@@ -39,7 +39,7 @@
 
         function render(parentSelector) {
             $('select', parentSelector).empty();
-            $('select', parentSelector).append('<option value="" class="label">Select Genre</option>');
+            $('select', parentSelector).append('<option value="" class="label">Select Instrument</option>');
             var template = $('#template-genre-option').html();
             $.each(_genres, function(index, value) {
                 // value will be a dictionary entry from _genres:

web/app/views/clients/_session.html.erb

@@ -31,7 +31,7 @@
 
             <!-- Mix: Me versus Others -->
             <div class="block">
-                <div class="label">MIX:</div>
+                <div class="label">MONITOR:</div>
                 <div class="label"><small>others</small></div>
                 <div id="l2m" class="fader flat" mixer-id="__L2M__"></div>
                 <div class="label"><small>me</small></div>