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

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

This commit is contained in:
Jonathan Kolyer 2014-07-21 05:14:11 +00:00
parent b4ab41637c 4aa359fc13
commit ecf4b6f397
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruby/lib/jam_ruby/models/music_session.rb
View File

@ -419,15 +419,15 @@ module JamRuby
def legal_policy_url
# TODO: move to DB or config file or helper
case legal_policy
case legal_policy.downcase
when "standard"
return "http://www.jamkazam.com/session-legal-policies/standard"
return "session-legal-policies/standard"
when "creative"
return "http://www.jamkazam.com/session-legal-policies/creativecommons"
return "session-legal-policies/creativecommons"
when "offline"
return "http://www.jamkazam.com/session-legal-policies/offline"
return "session-legal-policies/offline"
when "jamtracks"
return "http://www.jamkazam.com/session-legal-policies/jamtracks"
return "session-legal-policies/jamtracks"
else
return ""
end

4
web/app/assets/stylesheets/client/sessionList.css.scss
View File

@ -1,8 +1,8 @@
@import "client/common";
div.findsession-scroll-container {
height:200px;
overflow-y:auto;
max-height:250px;
overflow:auto;
}
table.findsession-table, table.local-recordings {

1
web/app/views/clients/_findSession.html.erb
View File

@ -59,6 +59,7 @@
</div>
<span class="btn-next-wrapper"><a href="/api/sessions/active?page=1" class="btn-next">Next</a></span>
</div>
<br />
<div id="sessions-scheduled" class="session-container">
<%= render :partial => "sessionList", :locals => {:title => "future, scheduled sessions", :category => "sessions-scheduled"} %>
<br />

8
web/app/views/clients/_scheduledSession.html.erb
View File

@ -300,24 +300,24 @@
This is a good option to choose when following normal legal conventions works - i.e. session participants agree
that whoever holds the copyright on the music being performed maintains all ownership rights and interests in
the music. Use the following link for full legal details of this choice:
<a href="http://www.jamkazam.com/session-legal-policies/standard" target="_blank">www.jamkazam.com/session-legal-policies/standard</a>.
<a href="<%= root_url %>session-legal-policies/standard" target="_blank"><%= root_url %>session-legal-policies/standard</a>.
</div>
<div class="info-box hidden" policy-type="Creative Commons">
This is a good option to choose when the session participants are creating new music that is not
already copyrighted, and when the musicians can agree that everyone will share ownership of any
music created in the session. Use the following link for full legal details of this choice:
<a href="http://www.jamkazam.com/session-legal-policies/creativecommons" target="_blank">www.jamkazam.com/session-legal-policies/creativecommons</a>
<a href="<%= root_url %>session-legal-policies/creativecommons" target="_blank"><%= root_url %>session-legal-policies/creativecommons</a>
</div>
<div class="info-box hidden" policy-type="Offline">
This is a good option to choose when the session participants are already made an offline agreement
in the real world about who owns what, and when agreeing to the standard legal provisions doest not
adequately or accurately cover your legal bases. Use the following link for full legal details of this choice:
<a href="http://www.jamkazam.com/session-legal-policies/offline" target="_blank">www.jamkazam.com/session-legal-policies/offline</a>
<a href="<%= root_url %>session-legal-policies/offline" target="_blank"><%= root_url %>session-legal-policies/offline</a>
</div>
<div class="info-box hidden" policy-type="Jamtracks">
This option must be selected when the musicians in a session will be playing one or more JamTracks.
Use the following link for full legal details of this choice:
<a href="http://www.jamkazam.com/session-legal-policies/jamtracks" target="_blank">www.jamkazam.com/session-legal-policies/jamtracks</a>
<a href="<%= root_url %>session-legal-policies/jamtracks" target="_blank"><%= root_url %>session-legal-policies/jamtracks</a>
</div>
</div>
<br>

2
web/app/views/music_sessions/session_info.html.haml
View File

@ -59,7 +59,7 @@
.right.w75.ib.mb10.legal_policy
= @music_session.legal_policy.capitalize
agreement (
%a.gold{:href => "#{@music_session.legal_policy_url}", :target => "_blank"} View full legal details
%a.gold{:href => "#{root_url}#{@music_session.legal_policy_url}", :target => "_blank"} View full legal details
)
.clearall.left.w20.ib.mb10
%strong Fan Page: