seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-644 using icheck methods to set check/uncheck status

This commit is contained in:
Seth Call 2013-10-23 13:45:46 -05:00
parent e0c542efae
commit dcbaf4d329
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/app/assets/javascripts/createSession.js
View File

@ -114,7 +114,7 @@
if (musician_access) {
var approval_required = sessionSettings.hasOwnProperty('approval_required') ? sessionSettings.approval_required : false;
$('#musician-access-option-' + approval_required).attr('checked', 'checked');
$('#musician-access-option-' + approval_required).iCheck('check').attr('checked', 'checked');
}
var fan_access = sessionSettings.hasOwnProperty('fan_access') ? sessionSettings.fan_access : true;
@ -123,7 +123,7 @@
if (fan_access) {
var fan_chat = sessionSettings.hasOwnProperty('fan_chat') ? sessionSettings.fan_chat : false;
$('#fan-chat-option-' + fan_chat).attr('checked', 'checked');
$('#fan-chat-option-' + fan_chat).iCheck('check').attr('checked', 'checked');
}
// Should easily be able to grab other items out of sessionSettings and put them into the appropriate ui elements.
}
@ -376,11 +376,13 @@
// this exists solely due to a bug in Windows QTWebkit: https://bugreports.qt-project.org/browse/QTBUG-30072
function initializeButtons() {
$('div[layout-id="createSession"] .iradiobuttons input').iCheck({
$('div[layout-id="createSession"] .icheckbuttons input').iCheck({
checkboxClass: 'icheckbox_minimal',
radioClass: 'iradio_minimal'
radioClass: 'iradio_minimal',
inheritClass: true
});
}
function searchFriends(query) {
if (query.length < 2) {
$('#friend-search-results').empty();

2
web/app/assets/stylesheets/client/createSession.css.scss
View File

@ -116,7 +116,7 @@ div.friendbox input[type=text] {
div[layout-id="createSession"] .iradiobuttons {
div[layout-id="createSession"] .icheckbuttons {
margin-top:5px;

16
web/app/views/clients/_createSession.html.erb
View File

@ -56,9 +56,9 @@
</select>
</div>
<div class="left iradiobuttons">
<input type="radio" name="musician-access-option" id="musician-access-option-false" checked="checked" value="false" /><label for="musician-access-option-false" class="radio-text">Open</label>
<input type="radio" name="musician-access-option" id="musician-access-option-true" value="true" /><label for="musician-access-option-true" class="radio-text">By Approval</label>
<div class="left icheckbuttons">
<input type="radio" name="musician-access-option" id="musician-access-option-false" checked="checked" value="false" class="musician-access-false" /><label for="musician-access-option-false" class="radio-text">Open</label>
<input type="radio" name="musician-access-option" id="musician-access-option-true" value="true" class="musician-access-true" /><label for="musician-access-option-true" class="radio-text">By Approval</label>
</div>
</div>
@ -73,9 +73,9 @@
</select>
</div>
<div class="left iradiobuttons">
<input type="radio" name="fan-chat-option" id="fan-chat-option-true" value="true" disabled="disabled" /><label for="fan-chat-option-true" class="radio-text">Chat</label>
<input type="radio" name="fan-chat-option" id="fan-chat-option-false" checked="checked" value="false" disabled="disabled" /><label for="fan-chat-option-false" class="radio-text">No Fan Chat</label>
<div class="left icheckbuttons">
<input type="radio" name="fan-chat-option" id="fan-chat-option-true" value="true" class="fan-chat-option-true" disabled="disabled" /><label for="fan-chat-option-true" class="radio-text">Chat</label>
<input type="radio" name="fan-chat-option" id="fan-chat-option-false" checked="checked" class="fan-chat-option-false" value="false" disabled="disabled" /><label for="fan-chat-option-false" class="radio-text">No Fan Chat</label>
</div>
</div>
</div>
@ -146,8 +146,8 @@
<br clear="all"/>
<!-- terms -->
<div id="divIntellectualProperty">
<div class="terms-checkbox iradiobuttons">
<input type="checkbox" id="intellectual-property" />
<div class="terms-checkbox icheckbuttons">
<input type="checkbox" id="intellectual-property" class="intellectual-property" />
</div>
<div id="divTerms" class="terms ml25">
I agree that intellectual property ownership of any musical works created during this session shall be governed by the terms of the <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/" target="_blank">Creative Commons CC BY-NC-SA license</a> in accordance with the <a rel="external" href="http://www.jamkazam.com/corp/terms" target="_blank">JamKazam Terms of Service</a>.

2
web/spec/features/find_sessions_spec.rb
View File

@ -43,7 +43,7 @@ describe "Find Session", :js => true, :type => :feature, :capybara_feature => tr
within('#create-session-form') do
fill_in('description', :with => @unique_session_desc)
select('Rock', :from => 'genres')
find('intellectual-property').trigger(:click)
find('div.intellectual-property ins').trigger(:click)
click_link('btn-create-session') # fails if page width is low
end

2
web/spec/features/music_sessions_spec.rb
View File

@ -9,7 +9,7 @@ describe "Music Session", :js => true, :type => :feature, :capybara_feature => t
within('#create-session-form') do
fill_in('description', :with => 'foobar')
select('Ambient', :from => 'genres')
find('intellectual-property').trigger(:click)
find('div.intellectual-property ins').trigger(:click)
click_link('btn-create-session')
end
uu