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' into feature/k1

This commit is contained in:
Seth Call 2020-10-16 19:17:41 -05:00
parent 168515f1bf bc7c59068e
commit c8b49e9c36
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@
}
}
.learn-more-sessions-header {
margin-top:40px;
margin-top:25px;
}
.learn-more-sessions {
a {

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

@ -24,10 +24,10 @@
<div class="column column-left">
<h2>start a session</h2>
<div class="quick-options">
<div class="quick-option"><a class="button-orange quick-start-solo" href="#" >QUICK START SOLO</a><p>Use this button to quick start a private session just for yourself. Good for solo practice and gear testing.</p></div>
<div class="quick-option"><a class="button-orange quick-start-open" href="#" >QUICK START OPEN</a><p>Use this button to quick start an open session that anyone can join to play with you, and that fans can listen to.</p></div>
<div class="quick-option"><a class="button-orange quick-start-friends" href="#" >QUICK START FRIENDS</a><p>Use this button to quick start a friends-only session. No invitations necessary for any of your friends. Good for those with select friends they always play with.</p></div>
<div class="quick-option"><a class="button-orange start-or-schedule" href="#" >START OR SCHEDULE</a><p>Use this button start a wizard that will let you have more control over your session. Schedule future sessions. Start private sessions. Invite other musicians. And lots more...</p><a class="schedule-learn-more" href="https://forum.jamkazam.com/showthread.php?tid=4" rel="external">learn more</a></div>
<div class="quick-option"><a class="button-orange quick-start-solo" href="#" >QUICK START PRIVATE</a><p>Quick start a private session now. Good for solo practice. Or invite specific friends to join you.</p></div>
<div class="quick-option"><a class="button-orange quick-start-open" href="#" >QUICK START PUBLIC</a><p>Quick start an open session that anyone can join. Good for meeting others, spontaneous jams.</p></div>
<div class="quick-option"><a class="button-orange quick-start-friends" href="#" >QUICK START FRIENDS</a><p>Quick start a friends-only session. No invitations needed. Good for playing with same folks.</p></div>
<div class="quick-option"><a class="button-orange start-or-schedule" href="#" >SCHEDULE FUTURE</a><p>Use a wizard with more settings/controls for session. Good for scheduling future sessions.</p><a class="schedule-learn-more" href="https://jamkazam.freshdesk.com/support/solutions/articles/66000122469" rel="external">learn more</a></div>
</div>
<h2>featured sessions</h2>
<table class="jamtable featured-sessions">
@ -47,7 +47,7 @@
<p>
Use the Find Sessions feature to browse through current and future/scheduled sessions you can join to play with other musicians.
</p>
<a class="find-session-learn-more" href="https://forum.jamkazam.com/showthread.php?tid=3" rel="external">learn more</a>
<a class="find-session-learn-more" href="https://jamkazam.freshdesk.com/support/solutions/articles/66000124831" rel="external">learn more</a>
</div>
<div class="view-the-feed">
@ -55,16 +55,14 @@
<p>
Use the Feed to check out current and past sessions and session recordings, and to listen to current sessions.
</p>
<a class="view-the-feed-learn-more" href="https://forum.jamkazam.com/showthread.php?tid=5" rel="external">learn more</a>
</div>
<h2 class="learn-more-sessions-header">learn more about online sessions</h2>
<h2 class="learn-more-sessions-header">learn more about sessions</h2>
<div class="learn-more-sessions">
<p>Use the following links to learn more:</p>
<a href="https://forum.jamkazam.com/showthread.php?tid=114" rel="external">System Requirements & Gear Recommendations</a>
<a href="https://forum.jamkazam.com/showthread.php?tid=69" rel="external">Setting Up Your Gear</a>
<a href="https://forum.jamkazam.com/showthread.php?tid=69" rel="external">Key Features to Use for Online Sessions</a>
<a href="https://forum.jamkazam.com/showthread.php?tid=69" rel="external">Key Features to Use Beyond Online Sessions</a>
<a href="https://jamkazam.freshdesk.com/support/solutions/folders/66000108388" rel="external">Creating, finding, and joining sessions</a>
<a href="https://jamkazam.freshdesk.com/support/solutions/folders/66000110434" rel="external">Connecting with others</a>
<a href="https://jamkazam.freshdesk.com/support/solutions/folders/66000110433" rel="external">Playing with others in sessions</a>
<a href="https://jamkazam.freshdesk.com/support/solutions/66000073846" rel="external">Live broadcasting your sessions</a>
</div>
</div>

2
web/app/views/dialogs/_acceptFriendRequestDialog.html.haml
View File

@ -42,7 +42,7 @@
Or, you can also go straight to the
%a{href: "/client#/createSession", class: 'create-session-already-friends'} create session
page and click
%b QUICK START SOLO
%b QUICK START PRIVATE
to create a private session that only your friends can join!
%br{clear:'all'}
%br{clear:'all'}