Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
This commit is contained in:
commit
1327229048
|
|
@ -8,7 +8,7 @@
|
|||
<br/>
|
||||
<br/>
|
||||
<p>
|
||||
This email was received because someone left feedback at <a href="http://www.jamkazam.com/corp/contact">http://www.jamkazam.com/corp/contact</a>
|
||||
This email was received because someone left feedback at <a style="color: #ffcc00;" href="http://www.jamkazam.com/corp/contact">http://www.jamkazam.com/corp/contact</a>
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<% provide(:title, "You've been invited to JamKazam by #{@sender.name}!") %>
|
||||
<% provide(:photo_url, @sender.resolved_photo_url) %>
|
||||
|
||||
To signup, please go to the <a href="<%= @signup_url %>">create account</a> page.
|
||||
To signup, please go to the <a style="color: #ffcc00;" href="<%= @signup_url %>">create account</a> page.
|
||||
|
||||
<% content_for :note do %>
|
||||
<% if @note %>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<% provide(:title, 'Welcome to the JamKazam Beta!') %>
|
||||
|
||||
To signup, please go to the <a href="<%= @signup_url %>">create account</a> page.
|
||||
To signup, please go to the <a style="color: #ffcc00;" href="<%= @signup_url %>">create account</a> page.
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
</p>
|
||||
|
||||
<p>
|
||||
<a href="https://jamkazam.desk.com/">https://jamkazam.desk.com</a>
|
||||
<a style="color: #ffcc00;" href="https://jamkazam.desk.com/">https://jamkazam.desk.com</a>
|
||||
</p>
|
||||
|
||||
<p>-- Team JamKazam
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
</p>
|
||||
|
||||
<p>
|
||||
<a href="http://www.jamkazam.com/downloads">Go to Download Page</a>
|
||||
<a style="color: #ffcc00;" href="http://www.jamkazam.com/downloads">Go to Download Page</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<a href="https://jamkazam.desk.com">Go to Support Center</a>
|
||||
<a style="color: #ffcc00;" href="https://jamkazam.desk.com">Go to Support Center</a>
|
||||
</p>
|
||||
|
||||
<p>-- Team JamKazam
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
<p>We noticed that you have not yet successfully set up your audio gear and passed the JamKazam latency and input/output audio gear tests. This means that you cannot yet play in online sessions with other musicians. If you are having trouble with this step, please click the link below for a knowledge base article that can help you get past this hurdle. If the test says your audio gear is not fast enough, or if your audio quality sounds poor, or if you are just confused, it’s very likely the tips in this article will help you get things set up and optimized so you can start playing online.
|
||||
</p>
|
||||
|
||||
<p><a href="http://bit.ly/1i4Uul4">http://bit.ly/1i4Uul4</a>
|
||||
<p><a style="color: #ffcc00;" href="http://bit.ly/1i4Uul4">http://bit.ly/1i4Uul4</a>
|
||||
</p>
|
||||
|
||||
<p>And if this knowledge base article does not get you fixed up, please visit our JamKazam support center at the link below, and post a request for assistance so that we can help you get up and running:
|
||||
</p>
|
||||
|
||||
<p><a href="https://jamkazam.desk.com">https://jamkazam.desk.com</a>
|
||||
<p><a style="color: #ffcc00;" href="https://jamkazam.desk.com">https://jamkazam.desk.com</a>
|
||||
</p>
|
||||
|
||||
<p>-- Team JamKazam
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
It’s still very early in our company’s development, so we don’t have zillions of users online on our service yet. If you click Find Session, you will often not find a good session to join, both due to the number of musicians online at any given time, and also because you won’t see private sessions where groups of musicians don’t want to be interrupted in their sessions.
|
||||
</p>
|
||||
|
||||
<p>If you are having trouble getting into sessions, we’d suggest you click the Musicians tile on the home screen of the app or the website: <a href="http://www.jamkazam.com/client#/musicians">Go To Musicians Page</a>
|
||||
<p>If you are having trouble getting into sessions, we’d suggest you click the Musicians tile on the home screen of the app or the website: <a style="color: #ffcc00;" href="http://www.jamkazam.com/client#/musicians">Go To Musicians Page</a>
|
||||
</p>
|
||||
|
||||
<p>This will display the JamKazam musicians sorted by latency to you - in other words, you can see which musicians have good network connections to you. Any musicians with green and yellow latency scores have good enough connections to support a play session with you. We recommend that read the profiles of these musicians to find others with shared musical interests and good network connections to you, and then use the Message button to say hi and see if they are interested in playing with you. If they are, use the Connect button to “friend” them on JamKazam, and use the Message button to set up a time to meet online for a session.
|
||||
|
|
@ -24,7 +24,7 @@ One of the best ways to connect and play with others is to invite your friends f
|
|||
If you are having audio quality problems or other issues when you get into a session, please click the link below to visit our support center, and check the knowledge base articles under the Troubleshooting header to find solutions. And if that doesn’t work, please post a request for assistance in the support center so that we can help you get up and running:
|
||||
</p>
|
||||
|
||||
<p><a href="https://jamkazam.desk.com">https://jamkazam.desk.com</a>
|
||||
<p><a style="color: #ffcc00;" href="https://jamkazam.desk.com">https://jamkazam.desk.com</a>
|
||||
</p>
|
||||
|
||||
<p>-- Team JamKazam
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</p>
|
||||
|
||||
<p>Find Other Musicians on JamKazam<br />
|
||||
To find and connect with other musicians who are already on JamKazam, we’d suggest you click the Musicians tile on the home screen of the app or the website: <a href="http://www.jamkazam.com/client#/musicians">Go To Musicians Page</a>
|
||||
To find and connect with other musicians who are already on JamKazam, we’d suggest you click the Musicians tile on the home screen of the app or the website: <a style="color: #ffcc00;" href="http://www.jamkazam.com/client#/musicians">Go To Musicians Page</a>
|
||||
</p>
|
||||
|
||||
<p>This will display the JamKazam musicians sorted by latency to you - in other words, you can see which musicians have good network connections to you. Any musicians with green and yellow latency scores have good enough connections to support a play session with you. We recommend that you read the profiles of these musicians to find others with shared musical interests and good network connections to you, and then use the Message button to say hi and see if they are interested in playing with you. If they are, use the Connect button to “friend” them on JamKazam, and use the Message button to set up a time to meet online for a session.
|
||||
|
|
@ -20,7 +20,7 @@ One of the best ways to connect and play with others is to invite your friends f
|
|||
<p>If you have any trouble, please visit our support center at the link below any time to get help:
|
||||
</p>
|
||||
|
||||
<p><a href="https://jamkazam.desk.com/">https://jamkazam.desk.com</a>
|
||||
<p><a style="color: #ffcc00;" href="https://jamkazam.desk.com/">https://jamkazam.desk.com</a>
|
||||
</p>
|
||||
|
||||
<p>-- Team JamKazam
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<p>If you have any trouble, please visit our support center at the link below any time to get help:
|
||||
</p>
|
||||
|
||||
<p><a href="https://jamkazam.desk.com">https://jamkazam.desk.com</a>
|
||||
<p><a style="color: #ffcc00;" href="https://jamkazam.desk.com">https://jamkazam.desk.com</a>
|
||||
</p>
|
||||
|
||||
<p>-- Team JamKazam
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<p>If you are having audio quality problems or other issues when you get into a session, please click the link below to visit our support center, and check the knowledge base articles under the Troubleshooting header to find solutions. And if that doesn’t work, please post a request for assistance in the support center so that we can help you get up and running:
|
||||
</p>
|
||||
|
||||
<p><a href="https://jamkazam.desk.com">https://jamkazam.desk.com</a>
|
||||
<p><a style="color: #ffcc00;" href="https://jamkazam.desk.com">https://jamkazam.desk.com</a>
|
||||
</p>
|
||||
|
||||
<p>We really want you to be successful and have fun with this new way of playing music with others, so please reach out and let us help you!
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<% provide(:title, 'New Band Session') %>
|
||||
|
||||
<p><%= @body %> <a href="<%= @session_url %>">Listen in.</a></p>
|
||||
<p><%= @body %> <a style="color: #ffcc00;" href="<%= @session_url %>">Listen in.</a></p>
|
||||
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
<p>Welcome to JamKazam, <%= @user.first_name %>!</p>
|
||||
|
||||
<p>To confirm this email address, please go to the <a href="<%= @signup_confirm_url %>">signup confirmation page</a>.</p>
|
||||
<p>To confirm this email address, please go to the <a style="color: #ffcc00;" href="<%= @signup_confirm_url %>">signup confirmation page</a>.</p>
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
<p><%= @body %></p>
|
||||
|
||||
<p>To accept this friend request, <a href="<%= @url %>">click here</a>.</p>
|
||||
<p>To accept this friend request, <a style="color: #ffcc00;" href="<%= @url %>">click here</a>.</p>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<% provide(:title, 'Musician in Session') %>
|
||||
|
||||
<p><%= @body %> <a href="<%= @session_url %>">Listen in.</a></p>
|
||||
<p><%= @body %> <a style="color: #ffcc00;" href="<%= @session_url %>">Listen in.</a></p>
|
||||
|
|
@ -24,7 +24,7 @@ Hi <%= @user.first_name %>,
|
|||
<% end %>
|
||||
</table>
|
||||
</p>
|
||||
<p>There are currently <%= @new_musicians.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: <a href="http://www.jamkazam.com/client#/musicians">http://www.jamkazam.com/client#/musicians</a>.
|
||||
<p>There are currently <%= @new_musicians.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: <a style="color: #ffcc00;" href="http://www.jamkazam.com/client#/musicians">http://www.jamkazam.com/client#/musicians</a>.
|
||||
</p>
|
||||
|
||||
<p>Best Regards,</p>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<% provide(:title, 'JamKazam Password Reset') %>
|
||||
|
||||
Visit this link so that you can change your JamKazam password: <a href="<%= @password_reset_url %>">reset password</a>.
|
||||
Visit this link so that you can change your JamKazam password: <a style="color: #ffcc00;" href="<%= @password_reset_url %>">reset password</a>.
|
||||
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
<p><%= @body %></p>
|
||||
|
||||
<p><a href="<%= @session_url %>">View Session Details</a></p>
|
||||
<p><a style="color: #ffcc00;" href="<%= @session_url %>">View Session Details</a></p>
|
||||
|
|
@ -7,5 +7,5 @@
|
|||
<p><%= @session_name %></p>
|
||||
<p><%= @session_date %></p>
|
||||
|
||||
<p><a href="<%= @session_url %>">View Session Details</a></p>
|
||||
<p><a style="color: #ffcc00;" href="<%= @session_url %>">View Session Details</a></p>
|
||||
<% end %>
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
<td><%= sess.genre.description %></td>
|
||||
<td>
|
||||
<%= sess.name %><br/>
|
||||
<a href="<%= "http://www.jamkazam.com/sessions/#{sess.id}/details" %>">Details</a>
|
||||
<a style="color: #ffcc00;" href="<%= "http://www.jamkazam.com/sessions/#{sess.id}/details" %>">Details</a>
|
||||
</td>
|
||||
<td><%= sess.description %></td>
|
||||
<td style="text-align:center">
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
</tbody>
|
||||
</table>
|
||||
|
||||
<p>To see ALL the scheduled sessions that you might be interested in joining, view our <a href="http://www.jamkazam.com/client#/findSession">Find Session page</a>.</p>
|
||||
<p>To see ALL the scheduled sessions that you might be interested in joining, view our <a style="color: #ffcc00;" href="http://www.jamkazam.com/client#/findSession">Find Session page</a>.</p>
|
||||
|
||||
<p>Best Regards,</p>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@
|
|||
<%= @session_date %>
|
||||
</p>
|
||||
|
||||
<p><a href="<%= @session_url %>">View Session Details</a></p>
|
||||
<p><a style="color: #ffcc00;" href="<%= @session_url %>">View Session Details</a></p>
|
||||
|
|
@ -7,4 +7,4 @@
|
|||
<%= @session_date %>
|
||||
</p>
|
||||
|
||||
<p><a href="<%= @session_url %>">View Session Details</a></p>
|
||||
<p><a style="color: #ffcc00;" href="<%= @session_url %>">View Session Details</a></p>
|
||||
|
|
@ -7,4 +7,4 @@
|
|||
<%= @session_date %>
|
||||
</p>
|
||||
|
||||
<p><a href="<%= @session_url %>">View Session Details</a></p>
|
||||
<p><a style="color: #ffcc00;" href="<%= @session_url %>">View Session Details</a></p>
|
||||
|
|
@ -7,4 +7,4 @@
|
|||
<%= @session_date %>
|
||||
</p>
|
||||
|
||||
<p><a href="<%= @session_url %>">View Session Details</a></p>
|
||||
<p><a style="color: #ffcc00;" href="<%= @session_url %>">View Session Details</a></p>
|
||||
|
|
@ -7,4 +7,4 @@
|
|||
<%= @session_date %>
|
||||
</p>
|
||||
|
||||
<p><a href="<%= @session_url %>">View Session Details</a></p>
|
||||
<p><a style="color: #ffcc00;" href="<%= @session_url %>">View Session Details</a></p>
|
||||
|
|
@ -7,4 +7,4 @@
|
|||
<%= @session_date %>
|
||||
</p>
|
||||
|
||||
<p><a href="<%= @session_url %>">View Session Details</a></p>
|
||||
<p><a style="color: #ffcc00;" href="<%= @session_url %>">View Session Details</a></p>
|
||||
|
|
@ -7,4 +7,4 @@
|
|||
<%= @session_date %>
|
||||
</p>
|
||||
|
||||
<p><a href="<%= @session_url %>">View Session Details</a></p>
|
||||
<p><a style="color: #ffcc00;" href="<%= @session_url %>">View Session Details</a></p>
|
||||
|
|
@ -4,5 +4,5 @@
|
|||
<% content_for :note do %>
|
||||
<%= @note %>
|
||||
|
||||
<p>To reply to this message, <a href="<%= @url %>">click here</a>.</p>
|
||||
<p>To reply to this message, <a style="color: #ffcc00;" href="<%= @url %>">click here</a>.</p>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<% provide(:title, 'Please Confirm New JamKazam Email') %>
|
||||
|
||||
Please click the following link to confirm your change in email: <a href="<%= @user.update_email_confirmation_url %>">confirm email</a>.
|
||||
Please click the following link to confirm your change in email: <a style="color: #ffcc00;" href="<%= @user.update_email_confirmation_url %>">confirm email</a>.
|
||||
|
|
@ -11,31 +11,31 @@
|
|||
<p>
|
||||
Getting Started Video<br/>
|
||||
We recommend watching this video before you jump into the service just to get oriented. It will really help you hit the ground running:
|
||||
<a href="https://www.youtube.com/watch?v=VexH4834o9I">https://www.youtube.com/watch?v=VexH4834o9I</a>
|
||||
<a style="color: #ffcc00;" href="https://www.youtube.com/watch?v=VexH4834o9I">https://www.youtube.com/watch?v=VexH4834o9I</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Other Great Tutorial Videos<br />
|
||||
There are several other very great videos that will help you understand how to find and connect with other musicians on the service, create your own sessions or find and join other musicians’ sessions, play in sessions, record and share your performances, and even live broadcast your sessions to family, friends, and fans. Check these helpful videos out here:
|
||||
<a href="https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos">https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos</a>
|
||||
<a style="color: #ffcc00;" href="https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos">https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Knowledge Base Articles<br />
|
||||
You can find Getting Started knowledge base articles on things like frequently asked questions (FAQ), minimum system requirements for your Windows or Mac computer, how to troubleshoot audio problems in sessions, and more here:
|
||||
<a href="https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles">https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles</a>
|
||||
<a style="color: #ffcc00;" href="https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles">https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
JamKazam Support Portal<br />
|
||||
If you run into trouble and need help, please reach out to us. We will be glad to do everything we can to get you up and running. You can find our support portal here:
|
||||
<a href="https://jamkazam.desk.com/">https://jamkazam.desk.com/</a>
|
||||
<a style="color: #ffcc00;" href="https://jamkazam.desk.com/">https://jamkazam.desk.com/</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
JamKazam Community Forum<br />
|
||||
And if you just want to chat, share tips and war stories, and hang out with fellow JamKazamers, you can visit our community forum here:
|
||||
<a href="http://forums.jamkazam.com/">http://forums.jamkazam.com/</a>
|
||||
<a style="color: #ffcc00;" href="http://forums.jamkazam.com/">http://forums.jamkazam.com/</a>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
|
||||
<!-- CALL OUT BOX -->
|
||||
</font></p>
|
||||
<p style="margin-top:0px"><font size="2" color="#7FACBA" face="Arial, Helvetica, sans-serif">This email was sent to you because you have an account at <a href="http://www.jamkazam.com">JamKazam</a>.
|
||||
<p style="margin-top:0px"><font size="2" color="#7FACBA" face="Arial, Helvetica, sans-serif">This email was sent to you because you have an account at <a style="color: #ffcc00;" href="http://www.jamkazam.com">JamKazam</a>.
|
||||
</td></tr></table>
|
||||
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<td align="left">
|
||||
|
||||
<!-- CALL OUT BOX -->
|
||||
<p style="margin-top:0px"><font size="2" color="#7FACBA" face="Arial, Helvetica, sans-serif">This email was sent to you because you have an account at <a href="http://www.jamkazam.com">JamKazam</a>. Click <a href="http://www.jamkazam.com/client#/account/profile">here to unsubscribe</a> and update your profile settings.
|
||||
<p style="margin-top:0px"><font size="2" color="#7FACBA" face="Arial, Helvetica, sans-serif">This email was sent to you because you have an account at <a style="color: #ffcc00;" href="http://www.jamkazam.com">JamKazam</a>. Click <a style="color: #ffcc00;" href="http://www.jamkazam.com/client#/account/profile">here to unsubscribe</a> and update your profile settings.
|
||||
</font></p>
|
||||
</td></tr></table>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,14 +20,6 @@ module JamRuby
|
|||
sort ||= 'date'
|
||||
raise "not valid sort #{sort}" unless SORT_TYPES.include?(sort)
|
||||
|
||||
# start = params[:start].presence
|
||||
# if sort == 'date'
|
||||
# start ||= FIXNUM_MAX
|
||||
# else
|
||||
# start ||= 0
|
||||
# end
|
||||
# start = start.to_i
|
||||
|
||||
time_range = params[:time_range]
|
||||
time_range ||= 'all'
|
||||
raise "not valid time_range #{time_range}" unless TIME_RANGES.has_key?(time_range)
|
||||
|
|
@ -47,13 +39,10 @@ module JamRuby
|
|||
|
||||
# handle sort
|
||||
if sort == 'date'
|
||||
# query = query.where("feeds.id < #{start}")
|
||||
query = query.order('feeds.active DESC, feeds.id DESC')
|
||||
elsif sort == 'plays'
|
||||
# query = query.offset(start)
|
||||
query = query.order("feeds.active DESC, COALESCE(recordings.play_count, music_sessions.play_count) DESC")
|
||||
elsif sort == 'likes'
|
||||
# query = query.offset(start)
|
||||
query = query.order("feeds.active DESC, COALESCE(recordings.like_count, music_sessions.like_count) DESC")
|
||||
else
|
||||
raise "sort not implemented: #{sort}"
|
||||
|
|
@ -117,17 +106,17 @@ module JamRuby
|
|||
query = query.paginate(:page => current_page, :per_page => limit)
|
||||
|
||||
if params[:hash]
|
||||
if query.length == 0
|
||||
if query.length == 0 # no more results
|
||||
{ query: query, next_page: nil}
|
||||
elsif query.length < limit
|
||||
elsif query.length < limit # no more results
|
||||
{ query: query, next_page: nil}
|
||||
else
|
||||
{ query: query, next_page: next_page }
|
||||
end
|
||||
else
|
||||
if query.length == 0
|
||||
if query.length == 0 # no more results
|
||||
[query, nil]
|
||||
elsif query.length < limit
|
||||
elsif query.length < limit # no more results
|
||||
[query, nil]
|
||||
else
|
||||
[query, next_page]
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
var $refresh = null;
|
||||
var $sortFeedBy = null;
|
||||
var $includeDate = null;
|
||||
var nextPage = null;
|
||||
var nextPage = 1;
|
||||
var $includeType = null;
|
||||
var didLoadAllFeeds = false, isLoading = false;
|
||||
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
currentFeedPage = 0;
|
||||
$content.empty(); // TODO: do we need to delete audio elements?
|
||||
$noMoreFeeds.hide();
|
||||
nextPage = null;
|
||||
nextPage = 1;
|
||||
}
|
||||
|
||||
function handleFeedResponse(response) {
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
if(nextPage == null) {
|
||||
didLoadAllFeeds = true;
|
||||
|
||||
// if we less results than asked for, end searching
|
||||
// if we got less results than asked for, end searching
|
||||
logger.debug("end of feeds")
|
||||
|
||||
if(currentFeedPage == 0 && response.entries.length == 0) {
|
||||
|
|
@ -98,7 +98,9 @@
|
|||
|
||||
function populate() {
|
||||
if (isLoading || didLoadAllFeeds) return;
|
||||
setLoading(true);
|
||||
|
||||
setLoading(true);
|
||||
|
||||
rest.getFeeds(buildQuery())
|
||||
.done(function(response) {
|
||||
handleFeedResponse(response);
|
||||
|
|
@ -107,7 +109,7 @@
|
|||
.fail(function(jqXHR) {
|
||||
setLoading(false);
|
||||
app.notifyServerError(jqXHR, 'Feed Unavailable')
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
function toggleSessionDetails() {
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@
|
|||
= rsvp.name
|
||||
.left.ml10
|
||||
- process_approved_rsvps(rsvp).each do |i|
|
||||
%img.instrument-icon{'instrument-id' => i[:id], height:24, width:24}
|
||||
%img.instrument-icon{'instrument-id' => i[:id], 'title' => i[:id], height:24, width:24}
|
||||
.right.w30.ib.f11.center.latency-tags
|
||||
|
||||
%br{:clear => "all"}/
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
- @open_slots.each do |slot|
|
||||
.clearall.left.w100.h20.ib.mb10
|
||||
.ib.h20
|
||||
%img.instrument-icon{'instrument-id' => slot.instrument_id, height:24, width:24}
|
||||
%img.instrument-icon{'instrument-id' => slot.instrument_id, 'title' => slot.instrument_id, height:24, width:24}
|
||||
.f11.ml10.ib.h20
|
||||
= slot.instrument_id.capitalize
|
||||
= "(#{slot.proficiency_desc})"
|
||||
|
|
|
|||
|
|
@ -100,19 +100,19 @@ describe ApiFeedsController do
|
|||
get :index, { limit: 1 }
|
||||
json = JSON.parse(response.body, :symbolize_names => true)
|
||||
json[:entries].length.should == 1
|
||||
_next = json[:next]
|
||||
_next = json[:next_page]
|
||||
_next.should_not be_nil
|
||||
|
||||
get :index, { limit: 1, since: _next }
|
||||
get :index, { limit: 1, next_page: _next }
|
||||
json = JSON.parse(response.body, :symbolize_names => true)
|
||||
json[:entries].length.should == 1
|
||||
_next = json[:next]
|
||||
_next = json[:next_page]
|
||||
_next.should_not be_nil
|
||||
|
||||
get :index, { limit: 1, since: _next }
|
||||
get :index, { limit: 1, next_page: _next }
|
||||
json = JSON.parse(response.body, :symbolize_names => true)
|
||||
json[:entries].length.should == 0
|
||||
_next = json[:next]
|
||||
_next = json[:next_page]
|
||||
_next.should be_nil
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue