duplicate instrument per connection bug fix / more style fixes
This commit is contained in:
parent
9907d272ba
commit
1fa4f97867
|
|
@ -137,6 +137,7 @@
|
|||
];
|
||||
|
||||
var jsonData = JSON.stringify(data);
|
||||
alert(jsonData);
|
||||
|
||||
var url = "/api/sessions";
|
||||
$.ajax({
|
||||
|
|
|
|||
|
|
@ -70,4 +70,5 @@ div.friendbox input[type=text] {
|
|||
-webkit-border-radius: 7px;
|
||||
border-radius: 7px;
|
||||
padding:2px 2px 2px 4px;
|
||||
vertical-align:middle;
|
||||
}
|
||||
|
|
@ -151,7 +151,7 @@ input[type="button"] {
|
|||
}
|
||||
|
||||
/* TODO - generalize */
|
||||
.instrument, .invitation {
|
||||
.instrument {
|
||||
margin: 1px;
|
||||
background: $ColorElementPrimary;
|
||||
color:$ColorText;
|
||||
|
|
@ -160,7 +160,7 @@ input[type="button"] {
|
|||
float:left;
|
||||
}
|
||||
|
||||
.instrument span, .invitation span {
|
||||
.instrument span {
|
||||
font-size:85%;
|
||||
font-weight:bold;
|
||||
cursor:pointer;
|
||||
|
|
|
|||
|
|
@ -17,12 +17,13 @@ class ApiMusicSessionsController < ApiController
|
|||
|
||||
def create
|
||||
client_id = params[:client_id]
|
||||
band = Band.find(params[:band]) unless params[:band].nil?
|
||||
|
||||
if client_id.nil?
|
||||
raise JamArgumentError, "client_id must be specified"
|
||||
end
|
||||
|
||||
band = Band.find(params[:band]) unless params[:band].nil?
|
||||
|
||||
@music_session = MusicSessionManager.new.create(
|
||||
current_user,
|
||||
client_id,
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@
|
|||
<!-- Added Invitation Template -->
|
||||
<script type="text/template" id="template-added-invitation">
|
||||
<div user-id="{userId}" class="invitation">{userName}
|
||||
<a><%= image_tag "shared/icon_delete_sm.png", :size => "13x13", :align => "texttop" %></a>
|
||||
<a><%= image_tag "shared/icon_delete_sm.png", :size => "13x13" %></a>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue