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

vrfs-774: fixed layout of filtering controls; added is_{following,friend,liker} to results data

This commit is contained in:
Jonathan Kolyer 2013-11-05 19:13:20 -06:00
parent a885582bf4
commit 6a62bef3a4
4 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,6 +127,10 @@
friend_count: mm['friend_count'],
recording_count: mm['recording_count'],
session_count: mm['session_count'],
is_friend: mm['is_friend'],
is_following: mm['is_following'],
is_liker: mm['is_liker'],
user_id: mm['id'],
musician_follow_template: follows
};
renderings += context.JK.fillTemplate(mTemplate, mVals);

2
web/app/assets/stylesheets/client/search.css.scss
View File

@ -57,7 +57,7 @@
.query-distance-params {
float:left;
width:140px;
width:50px;
margin-left: 10px;
-webkit-border-radius: 6px;
border-radius: 6px;

32
web/app/views/clients/_musician_filter.html.erb
View File

@ -1,22 +1,28 @@
<div style="min-width:770px;">
<div class="left ml35" style="padding-top:3px;">Filter Musician List:</div>
<div style="float:left">
<div class="" style="float:left;padding-top:3px;">Filter By:</div>
<!-- order by filter -->
<%= select_tag(:musician_order_by, options_for_select(Search::M_ORDERINGS), {:class => 'musician-order-by'} ) %>
<%= select_tag(:musician_order_by, options_for_select(Search::M_ORDERINGS), {:class => 'musician-order-by'} ) %>
</div>
<div style="float:left">
<!-- instrument filter -->
<div id="find-musician-instrument" class="right ml10">
<div class="" style="padding-top:3px; float:left">Instrument:</div>
<div id="find-musician-instrument" class="" style="float:left">
<%= select_tag(:instrument,
options_for_select([['Select Instrument', '']].concat(JamRuby::Instrument.all.collect { |ii| [ii.description, ii.id] })),
{:class => 'instrument-list'} ) %>
</div>
</div>
<!-- distance filter -->
<div style="float:left">
<div style="float:left">Within</div>
<div class="query-distance-params" style="height:25px; ">
<input id="musician_query_distance" type="text" name="query_distance" value="100" placeholder="100" />
</div>
<div style="float:left">miles from <%= current_user.current_city(request.remote_ip) %></div>
</div>
<div class="right mr10">
<a id="btn-refresh-musicians" style="text-decoration:none;" class="button-grey">REFRESH</a>
</div>
<!-- distance filter -->
Within
<div class="query-distance-params" style="height:25px;">
<input id="musician_query_distance" type="text" name="query_distance" value="100" placeholder="100" />
miles from
<%= current_user.current_city(request.remote_ip) %>
</div>
<div class="right mr10">
<a id="btn-refresh-musicians" style="text-decoration:none;" class="button-grey">REFRESH</a>
</div>
</div>

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

@ -48,7 +48,7 @@
<div class="left ml35 f11 whitespace w40"><br />
{biography}<br />
<br />
<a href="{profile_url}" class="button-orange smallbutton m0">PROFILE</a><a href="{like_url}" class="button-orange smallbutton">LIKE</a><a href="{friend_url}" class="button-orange smallbutton m0">FRIEND</a><a href="{follow_url}" class="button-orange smallbutton">FOLLOW</a></div>
<a href="{profile_url}" class="button-orange smallbutton m0">PROFILE</a><a href="{like_url}" class="button-orange smallbutton">LIKE</a><a href="{friend_url}" class="button-orange smallbutton m0 search-m-add-friend">FRIEND</a><a href="{follow_url}" class="button-orange smallbutton">FOLLOW</a></div>
<div class="left ml10 w20">
<br />
<small><strong>FOLLOWING:</strong></small>