From 6a62bef3a4e4993963968e8f050e0913ed939d09 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Tue, 5 Nov 2013 19:13:20 -0600
Subject: [PATCH] vrfs-774:  fixed layout of filtering controls; added
 is_{following,friend,liker} to results data

---
 web/app/assets/javascripts/findMusician.js    |  4 +++
 .../assets/stylesheets/client/search.css.scss |  2 +-
 .../views/clients/_musician_filter.html.erb   | 32 +++++++++++--------
 web/app/views/clients/_musicians.html.erb     |  2 +-
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/web/app/assets/javascripts/findMusician.js b/web/app/assets/javascripts/findMusician.js
index cbf50789c..a258eebc4 100644
--- a/web/app/assets/javascripts/findMusician.js
+++ b/web/app/assets/javascripts/findMusician.js
@@ -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);
diff --git a/web/app/assets/stylesheets/client/search.css.scss b/web/app/assets/stylesheets/client/search.css.scss
index 56cd7368d..0cb2f25ff 100644
--- a/web/app/assets/stylesheets/client/search.css.scss
+++ b/web/app/assets/stylesheets/client/search.css.scss
@@ -57,7 +57,7 @@
 
 .query-distance-params {
     float:left;
-    width:140px;
+    width:50px;
     margin-left: 10px;
     -webkit-border-radius: 6px;
     border-radius: 6px;
diff --git a/web/app/views/clients/_musician_filter.html.erb b/web/app/views/clients/_musician_filter.html.erb
index 002ced989..2ebf772bb 100644
--- a/web/app/views/clients/_musician_filter.html.erb
+++ b/web/app/views/clients/_musician_filter.html.erb
@@ -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>
diff --git a/web/app/views/clients/_musicians.html.erb b/web/app/views/clients/_musicians.html.erb
index dc8974dcc..a012164ce 100644
--- a/web/app/views/clients/_musicians.html.erb
+++ b/web/app/views/clients/_musicians.html.erb
@@ -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>