diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 8a9eca4c4..c5dfb2c68 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -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 diff --git a/web/app/assets/stylesheets/client/sessionList.css.scss b/web/app/assets/stylesheets/client/sessionList.css.scss index cf2779392..902a86d47 100644 --- a/web/app/assets/stylesheets/client/sessionList.css.scss +++ b/web/app/assets/stylesheets/client/sessionList.css.scss @@ -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 { diff --git a/web/app/views/clients/_findSession.html.erb b/web/app/views/clients/_findSession.html.erb index 6749254f1..64dc87d8e 100644 --- a/web/app/views/clients/_findSession.html.erb +++ b/web/app/views/clients/_findSession.html.erb @@ -59,6 +59,7 @@ Next +
<%= render :partial => "sessionList", :locals => {:title => "future, scheduled sessions", :category => "sessions-scheduled"} %>
diff --git a/web/app/views/clients/_scheduledSession.html.erb b/web/app/views/clients/_scheduledSession.html.erb index 629f5db9f..a55d8d0cb 100644 --- a/web/app/views/clients/_scheduledSession.html.erb +++ b/web/app/views/clients/_scheduledSession.html.erb @@ -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: - www.jamkazam.com/session-legal-policies/standard. + <%= root_url %>session-legal-policies/standard.

diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml index 85167838d..7d82077aa 100644 --- a/web/app/views/music_sessions/session_info.html.haml +++ b/web/app/views/music_sessions/session_info.html.haml @@ -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: