From 7d5cfa4cd288120d7d14cc9077e598e0d3324f59 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Thu, 28 Aug 2014 00:31:22 -0400
Subject: [PATCH] VRFS-2093 fixed formatting and band URL issues with band
 search and hover bubble

---
 web/app/assets/javascripts/hoverBand.js       | 2 +-
 web/app/assets/javascripts/profile.js         | 2 +-
 web/app/assets/javascripts/searchResults.js   | 2 +-
 web/app/views/clients/_profile.html.erb       | 2 +-
 web/app/views/clients/_searchResults.html.erb | 2 +-
 web/app/views/clients/_sidebar.html.erb       | 5 +++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/web/app/assets/javascripts/hoverBand.js b/web/app/assets/javascripts/hoverBand.js
index 3d5115341..6a94a8937 100644
--- a/web/app/assets/javascripts/hoverBand.js
+++ b/web/app/assets/javascripts/hoverBand.js
@@ -33,7 +33,7 @@
               var instrumentHtml = '';
 
               musicianHtml += '<tr><td width="50"><a user-id="' + val.id + '" profileaction="musician" class="avatar-tiny"><img src="' + context.JK.resolveAvatarUrl(val.photo_url) + '" /></a></td>';
-              musicianHtml += '<td width="75"><<a user-id="' + val.id + '" profileaction="musician">' + val.name + '</a></td>';
+              musicianHtml += '<td width="75"><a user-id="' + val.id + '" profileaction="musician">' + val.name + '</a></td>';
 
               instrumentHtml = '<td><div class="nowrap">';
               if (val.instruments) { // @FIXME: edge case for Test user that has no instruments?
diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js
index dd8106425..a79b9e7bc 100644
--- a/web/app/assets/javascripts/profile.js
+++ b/web/app/assets/javascripts/profile.js
@@ -640,7 +640,7 @@
               var bandHtml = context.JK.fillTemplate(template, {
                 bandId: val.id,
                 biography: val.biography,
-                band_url: "/client#/bandProfile/" + val.id,
+                profile_url: "/client#/bandProfile/" + val.id,
                 avatar_url: context.JK.resolveBandAvatarUrl(val.photo_url),
                 name: val.name,
                 location: val.location,
diff --git a/web/app/assets/javascripts/searchResults.js b/web/app/assets/javascripts/searchResults.js
index ddea50655..5b1b2f36a 100644
--- a/web/app/assets/javascripts/searchResults.js
+++ b/web/app/assets/javascripts/searchResults.js
@@ -151,7 +151,7 @@
           var searchResultHtml = context.JK.fillTemplate($(template_name).html(), {
             bandId: val.id, 
             avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
-            band_url: val.website,
+            profile_url: "/client#/bandProfile/" + val.id,
             bandName: val.name,
             location: val.location
           });
diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb
index b4ad60577..4f4c16545 100644
--- a/web/app/views/clients/_profile.html.erb
+++ b/web/app/views/clients/_profile.html.erb
@@ -205,7 +205,7 @@
             {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="{band_url}">PROFILE</a>
+            <a class="button-orange smallbutton" href="{profile_url}">PROFILE</a>
             <a id="btn-follow-band-2" class="button-orange smallbutton">FOLLOW</a>
           </div>
         </div>
diff --git a/web/app/views/clients/_searchResults.html.erb b/web/app/views/clients/_searchResults.html.erb
index ad26c0c2c..2f57992b8 100644
--- a/web/app/views/clients/_searchResults.html.erb
+++ b/web/app/views/clients/_searchResults.html.erb
@@ -59,7 +59,7 @@
             <img src="{avatar_url}" />
         </a>
         <div class="search-result-name">
-            <a band-id="{bandId}" hoveraction="band" href="{band_url}">{bandName}</a><br />
+            <a band-id="{bandId}" hoveraction="band" href="{profile_url}">{bandName}</a><br />
             <span class="search-result-location">{location}</span>
         </div>
         <br clear="left" />
diff --git a/web/app/views/clients/_sidebar.html.erb b/web/app/views/clients/_sidebar.html.erb
index b488db763..5ee9b6f2d 100644
--- a/web/app/views/clients/_sidebar.html.erb
+++ b/web/app/views/clients/_sidebar.html.erb
@@ -160,9 +160,10 @@
       <img src="{avatar_url}" />
     </a>
     <div class="result-name">
-      <a band-id="{bandId}" hoveraction="band" href="{band_url}">{bandName}</a><br />
+      <a band-id="{bandId}" hoveraction="band" href="{profile_url}">{bandName}</a><br />
       <span class="result-location">{location}</span>
-    </div><br />
+    </div>
+    <br clear="all" />
   </div>
 </script>