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:
Seth Call 2014-02-07 21:28:56 +00:00
parent 7661fc5e39 ac8913c027
commit ff9f132341
13 changed files with 147 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/assets/javascripts/findBand.js
View File

@ -113,7 +113,7 @@
players += context.JK.fillTemplate(pTemplate, playerVals);
}
var actionVals = {
profile_url: bb.website,
profile_url: "/client#/bandProfile/" + bb.id,
button_follow: bb['is_following'] ? '' : 'button-orange',
button_message: 'button-orange'
};
@ -126,7 +126,7 @@
bVals = {
avatar_url: context.JK.resolveAvatarUrl(bb.photo_url),
profile_url: "/client#/profile/" + bb.id,
profile_url: "/client#/bandProfile/" + bb.id,
band_name: bb.name,
band_location: bb.city + ', ' + bb.state,
genres: bgenres,

6
web/app/assets/javascripts/session.js
View File

@ -349,7 +349,7 @@
.fail(function(xhr, textStatus, errorMessage) {
if(xhr.status == 404) {
// we tried to join the session, but it's already gone. kick user back to join session screen
context.window.location = "#/findSession";
context.window.location = "/client#/findSession";
app.notify(
{ title: "Unable to Join Session",
text: "The session you attempted to join is over."
@ -781,7 +781,7 @@
}
function ftueCallback() {
context.location = "#/home";
context.location = "/client#/home";
app.layout.showDialog('ftue');
}
@ -1012,7 +1012,7 @@
type: "DELETE",
url: "/api/sessions/" + sessionId,
success: function(response) {
context.location="#/home";
context.location="/client#/home";
},
error: function(jqXHR, textStatus, errorThrown) {
logger.error("Error deleting session " + sessionId);

4
web/app/assets/javascripts/sidebar.js
View File

@ -739,7 +739,7 @@
function listenToSession(args) {
deleteNotification(args.notification_id);
context.location = '#/session/' + args.session_id;
context.location = '/client#/session/' + args.session_id;
}
function registerMusicianRecordingSaved() {
@ -785,7 +785,7 @@
function listenToRecording(args) {
deleteNotification(args.notification_id);
context.location = '#/recording/' + args.recording_id;
context.location = '/client#/recording/' + args.recording_id;
}
function registerRecordingStarted() {

35
web/app/assets/stylesheets/client/band.css.scss
View File

@ -147,6 +147,41 @@
border-bottom: dotted 1px #444;
position:relative;
display:block;
.result-name {
font-size: 12px;
font-weight: bold;
margin-bottom: 2px;
}
.stats {
margin-top: 4px;
img {
vertical-align: middle;
}
}
.lcol {
width: 148px;
}
.instruments {
width:128px;
img {
height:24px;
width:24px;
margin-right:2px;
&:last-child {
margin-right:0px;
}
}
}
.button-row {
margin-top:10px;
margin-bottom:5px;
.result-list-button-wrapper {
margin:0;
}
}
}
.band-profile-about-left {

5
web/app/views/api_bands/musician_index.rabl
View File

@ -9,3 +9,8 @@ node :instruments do |musician|
end
end
end
node :biography do |musician|
musician.biography.nil? ? "" : musician.biography
end

164
web/app/views/clients/_bandProfile.html.erb
View File

@ -9,90 +9,110 @@
<%= render "screen_navigation" %>
</div>
<form id="band-profile-form">
<div class="band-profile-header">
<h2 id="band-profile-name"></h2>
<div class="content-body">
<form id="band-profile-form" class="inner-content">
<div class="profile-header profile-head">
<h2 id="band-profile-name"></h2>
<div class="band-profile-status">
</div>
<div class="right">
<a id="btn-follow-band" class="button-orange">FOLLOW</a>
<a id="btn-edit-band-profile" class="button-orange">EDIT PROFILE</a>
</div>
<br clear="all" /><br />
<!-- avatar -->
<div class="band-profile-photo">
<div class="avatar-profile">
<img id="band-profile-avatar" width="200" height="200" />
<div class="band-profile-status">
</div>
</div>
<!-- profile navigation -->
<div class="band-profile-nav">
<a id="band-profile-about-link" class="band active">about</a>
<a id="band-profile-history-link" class="band">history</a>
<a id="band-profile-members-link" class="band">members</a>
<a id="band-profile-social-link" class="band last">social</a>
</div>
</div>
<br clear="all" />
<div class="content-scroller" style="height:350px;">
<div id="band-profile-about" class="band-profile-wrapper">
<!-- stats & location -->
<div class="band-profile-about-left">
<h3>Location:</h3><br />
<span id="band-profile-location"></span><br /><br /><br />
<h3>Stats:</h3><br />
<span id="band-profile-follower-stats"></span><br />
<span id="band-profile-session-stats"></span><br />
<span id="band-profile-recording-stats"></span><br />
<div class="right">
<a id="btn-follow-band" class="button-orange">FOLLOW</a>
<a id="btn-edit-band-profile" class="button-orange">EDIT PROFILE</a>
</div>
<div class="band-profile-about-right">
<p id="band-profile-biography"></p><br />
</div>
<br clear="all" />
</div>
<div id="band-profile-history" class="band-profile-wrapper">
<br clear="all" />
</div>
<div id="band-profile-members" class="band-profile-wrapper">
<br clear="all" />
</div>
<div id="band-profile-social" class="band-profile-wrapper">
<div class="band-profile-social-left">
<h2>Followers</h2>
<div id="band-profile-social-followers">
<br clear="all" /><br />
<!-- avatar -->
<div class="band-profile-photo">
<div class="avatar-profile">
<img id="band-profile-avatar" width="200" height="200" />
</div>
</div>
<br clear="all" />
<!-- profile navigation -->
<div class="band-profile-nav">
<a id="band-profile-about-link" class="band active">about</a>
<a id="band-profile-history-link" class="band">history</a>
<a id="band-profile-members-link" class="band">members</a>
<a id="band-profile-social-link" class="band last">social</a>
</div>
<div class="clearall"></div>
</div>
</div>
</form>
<div class="profile-body">
<div id="band-profile-about" class="profile-body-content">
<div class="band-profile-wrapper">
<!-- stats & location -->
<div class="band-profile-about-left">
<h3>Location:</h3><br />
<span id="band-profile-location"></span><br /><br /><br />
<h3>Stats:</h3><br />
<span id="band-profile-follower-stats"></span><br />
<span id="band-profile-session-stats"></span><br />
<span id="band-profile-recording-stats"></span><br />
</div>
<div class="band-profile-about-right">
<p id="band-profile-biography"></p><br />
</div>
<br clear="all" />
</div>
</div>
<div id="band-profile-history" class="band-profile-wrapper">
<div class="content-body-scroller">
<br clear="all" />
</div>
</div>
<div id="band-profile-members" class="band-profile-wrapper profile-body-content f11">
<br clear="all" />
</div>
<!-- @FIXME cf clients/_profile.html.erb to mimic layout for scrolling header -->
<div id="band-profile-social" class="band-profile-wrapper">
<div class="band-profile-social-left">
<h2>Followers</h2>
<div id="band-profile-social-followers">
</div>
</div>
<br clear="all" />
</div>
</div>
</form>
</div>
</div>
<script type="text/template" id="template-band-profile-members">
<div user-id="{userId}" class="band-profile-members">
<div class="avatar-small">
<img src="{avatar_url}" width="275" height="183" />
<div class="left" style="width:63px;">
<div class="avatar-small">
<img src="{avatar_url}" />
</div>
</div>
<div class="profile-band-name">
{name}<br />
<span class="band-profile-member-location">{location}</span>
<br clear="left" /><br />
<div style="width:100px;">{instruments}</div><br /><br />
{friend_count}&nbsp;<img src="../assets/content/icon_friend.png" width="22" height="12" align="absmiddle" />&nbsp;
{follower_count}&nbsp;<img src="../assets/content/icon_followers.png" width="22" height="12" align="absmiddle" />&nbsp;
{recording_count}&nbsp;<img src="../assets/content/icon_recordings.png" width="12" height="13" align="absmiddle" />&nbsp;
{session_count}&nbsp;<img src="../assets/content/icon_session_tiny.png" width="12" height="12" align="absmiddle" />
</div>
<div style="height:90px" class="left ml20 f11 whitespace w60"><br />
{biography}<br /><br />
<a class="button-orange smallbutton m0" href="{profile_url}">PROFILE</a>&nbsp;&nbsp;
<a id="btn-follow-member" class="button-orange smallbutton m0">FOLLOW</a>&nbsp;&nbsp;
<a id="btn-remove-member" class="button-orange smallbutton m0">REMOVE MEMBER</a>&nbsp;&nbsp;
<a id="btn-friend-member" style="display:none;" class="button-orange smallbutton m0">CONNECT</a>
<div class="" style="margin-left: 63px;margin-top:12px;">
<div class="first-row" data-hint="top-row">
<div class="lcol left">
<div class="result-name">{name}</div>
<div class="result-location">{location}</div>
<br />
<div class="nowrap mt10">{instruments}</div>
</div>
<div class="whitespace">
<div class="biography">{biography}</div>
</div>
<div class="clearleft"></div>
</div>
<div class="button-row">
<div class="lcol stats left">
{friend_count} <img src="../assets/content/icon_friend.png" width="22" height="12" align="absmiddle" />
{follower_count} <img src="../assets/content/icon_followers.png" width="22" height="12" align="absmiddle" />
{recording_count} <img src="../assets/content/icon_recordings.png" width="12" height="13" align="absmiddle" />
{session_count} <img src="../assets/content/icon_session_tiny.png" width="12" height="12" align="absmiddle" />
</div>
<div class="result-list-button-wrapper">
<a class="button-orange smallbutton" href="{profile_url}">PROFILE</a>
<a id="btn-follow-member" class="button-orange smallbutton">FOLLOW</a>
<a id="btn-remove-member" class="button-orange smallbutton">REMOVE MEMBER</a>
<a id="btn-friend-member" style="display:none;" class="button-orange smallbutton">CONNECT</a>
</div>
</div>
</div>
</div>
</script>

2
web/app/views/clients/_band_setup.html.erb
View File

@ -106,7 +106,7 @@
-->
<!-- <div class="left mr20">
<div class="left">
<a href="/#/createSession" title="This feature is not yet available.">
<a href="/client#/createSession" title="This feature is not yet available.">
<%= image_tag("content/icon_twitter.png", :size => "24x24", :align => "absmiddle") %>
</a>
</div>

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

@ -108,7 +108,7 @@
</div>
<!-- <div class="left mr20">
<div class="left">
<a href="/#/createSession" title="This feature is not yet available.">
<a href="/client#/createSession" title="This feature is not yet available.">
<%= image_tag("content/icon_twitter.png", :size => "24x24", :align => "absmiddle") %>
</a>
</div>

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

@ -27,7 +27,7 @@
<input id="session-keyword-srch" type="text" name="search" placeholder="Search by Keyword" />
</div>
<div class="right mr10">
<a id="btn-refresh" href="#/findSession" style="text-decoration:none;" class="button-grey">REFRESH</a>
<a id="btn-refresh" href="/client#/findSession" style="text-decoration:none;" class="button-grey">REFRESH</a>
</div>
</div>
</div>

2
web/app/views/clients/_header.html.erb
View File

@ -39,7 +39,7 @@
<h1>JamKazam</h1>
<div class="search">
<a href="/#/testBridge">Test Bridge</a><br/>
<a href="/client#/testBridge">Test Bridge</a><br/>
<input type="text" class="searchtextinput" placeholder="Search for Bands, Musicians and Fans"/>
</div>

4
web/app/views/clients/_profile.html.erb
View File

@ -127,13 +127,13 @@
<script type="text/template" id="template-no-bands">
<div class="when-empty">
Not In Any Bands:<br/>
<a id="band-setup-link" href="#/band/setup">Set Up Your Band</a>
<a id="band-setup-link" href="/client#/band/setup">Set Up Your Band</a>
</div>
</script>
<script type="text/template" id="template-more-bands">
<div class="when-empty">
<a id="band-setup-link" href="#/band/setup">Set Up Another Band</a>
<a id="band-setup-link" href="/client#/band/setup">Set Up Another Band</a>
</div>
</script>

2
web/app/views/clients/_screen_navigation.html.erb
View File

@ -1,6 +1,6 @@
<!-- section navigation -->
<div class="content-nav">
<a href="#/home" class="home-icon"><%= image_tag "content/icon_home.png", {:width => 20, :height => 15} %></a>
<a href="/client#/home" class="home-icon"><%= image_tag "content/icon_home.png", {:width => 20, :height => 15} %></a>
<a class="arrow-left" href="#"></a>
<a class="arrow-right op50" href="#"></a>
</div>

2
web/app/views/clients/_session.html.erb
View File

@ -38,7 +38,7 @@
</div>
<!-- Leave Button -->
<a class="button-grey right leave" href="#/home" id="session-leave">X&nbsp;&nbsp;LEAVE</a>
<a class="button-grey right leave" href="/client#/home" id="session-leave">X&nbsp;&nbsp;LEAVE</a>
</div>
<!-- end session controls -->