From 6d482a034d02231208edb9693287c18ffd0bb3ec Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Thu, 16 Jan 2014 02:50:13 -0500
Subject: [PATCH] VRFS-986 more landing page work

---
 ... => icon_instrument_acoustic_guitar24.png} | Bin
 ... => icon_instrument_acoustic_guitar45.png} | Bin
 ....png => icon_instrument_bass_guitar24.png} | Bin
 ....png => icon_instrument_bass_guitar45.png} | Bin
 ... => icon_instrument_electric_guitar24.png} | Bin
 ... => icon_instrument_electric_guitar45.png} | Bin
 ....png => icon_instrument_french_horn24.png} | Bin
 ....png => icon_instrument_french_horn45.png} | Bin
 web/app/assets/javascripts/utils.js           |   8 ++--
 web/app/views/recordings/show.html.erb        |  42 ++++++++++--------
 web/app/views/shared/_cta_sidebar.html.erb    |   0
 .../views/shared/_landing_sidebar.html.erb    |   0
 web/config/environments/development.rb        |   2 +-
 13 files changed, 29 insertions(+), 23 deletions(-)
 rename web/app/assets/images/content/{icon_instrument_acoustic24.png => icon_instrument_acoustic_guitar24.png} (100%)
 rename web/app/assets/images/content/{icon_instrument_acoustic45.png => icon_instrument_acoustic_guitar45.png} (100%)
 rename web/app/assets/images/content/{icon_instrument_bass24.png => icon_instrument_bass_guitar24.png} (100%)
 rename web/app/assets/images/content/{icon_instrument_bass45.png => icon_instrument_bass_guitar45.png} (100%)
 rename web/app/assets/images/content/{icon_instrument_guitar24.png => icon_instrument_electric_guitar24.png} (100%)
 rename web/app/assets/images/content/{icon_instrument_guitar45.png => icon_instrument_electric_guitar45.png} (100%)
 rename web/app/assets/images/content/{icon_instrument_frenchhorn24.png => icon_instrument_french_horn24.png} (100%)
 rename web/app/assets/images/content/{icon_instrument_frenchhorn45.png => icon_instrument_french_horn45.png} (100%)
 create mode 100644 web/app/views/shared/_cta_sidebar.html.erb
 create mode 100644 web/app/views/shared/_landing_sidebar.html.erb

diff --git a/web/app/assets/images/content/icon_instrument_acoustic24.png b/web/app/assets/images/content/icon_instrument_acoustic_guitar24.png
similarity index 100%
rename from web/app/assets/images/content/icon_instrument_acoustic24.png
rename to web/app/assets/images/content/icon_instrument_acoustic_guitar24.png
diff --git a/web/app/assets/images/content/icon_instrument_acoustic45.png b/web/app/assets/images/content/icon_instrument_acoustic_guitar45.png
similarity index 100%
rename from web/app/assets/images/content/icon_instrument_acoustic45.png
rename to web/app/assets/images/content/icon_instrument_acoustic_guitar45.png
diff --git a/web/app/assets/images/content/icon_instrument_bass24.png b/web/app/assets/images/content/icon_instrument_bass_guitar24.png
similarity index 100%
rename from web/app/assets/images/content/icon_instrument_bass24.png
rename to web/app/assets/images/content/icon_instrument_bass_guitar24.png
diff --git a/web/app/assets/images/content/icon_instrument_bass45.png b/web/app/assets/images/content/icon_instrument_bass_guitar45.png
similarity index 100%
rename from web/app/assets/images/content/icon_instrument_bass45.png
rename to web/app/assets/images/content/icon_instrument_bass_guitar45.png
diff --git a/web/app/assets/images/content/icon_instrument_guitar24.png b/web/app/assets/images/content/icon_instrument_electric_guitar24.png
similarity index 100%
rename from web/app/assets/images/content/icon_instrument_guitar24.png
rename to web/app/assets/images/content/icon_instrument_electric_guitar24.png
diff --git a/web/app/assets/images/content/icon_instrument_guitar45.png b/web/app/assets/images/content/icon_instrument_electric_guitar45.png
similarity index 100%
rename from web/app/assets/images/content/icon_instrument_guitar45.png
rename to web/app/assets/images/content/icon_instrument_electric_guitar45.png
diff --git a/web/app/assets/images/content/icon_instrument_frenchhorn24.png b/web/app/assets/images/content/icon_instrument_french_horn24.png
similarity index 100%
rename from web/app/assets/images/content/icon_instrument_frenchhorn24.png
rename to web/app/assets/images/content/icon_instrument_french_horn24.png
diff --git a/web/app/assets/images/content/icon_instrument_frenchhorn45.png b/web/app/assets/images/content/icon_instrument_french_horn45.png
similarity index 100%
rename from web/app/assets/images/content/icon_instrument_frenchhorn45.png
rename to web/app/assets/images/content/icon_instrument_french_horn45.png
diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js
index 2d9ec36a1..a55e396f5 100644
--- a/web/app/assets/javascripts/utils.js
+++ b/web/app/assets/javascripts/utils.js
@@ -42,18 +42,18 @@
     // available, and allowing the browser to resize offers better quality.
     var icon_map_base = {
         "accordion":"accordion",
-        "acoustic guitar":"acoustic",
+        "acoustic guitar":"acoustic_guitar",
         "banjo":"banjo",
-        "bass guitar":"bass",
+        "bass guitar":"bass_guitar",
         "cello":"cello",
         "clarinet":"clarinet",
         "computer":"computer",
         "default":"default",
         "drums":"drums",
-        "electric guitar":"guitar",
+        "electric guitar":"electric_guitar",
         "euphonium":"euphonium",
         "flute":"flute",
-        "french horn":"frenchhorn",
+        "french horn":"french_horn",
         "harmonica":"harmonica",
         "keyboard":"keyboard",
         "mandolin":"mandolin",
diff --git a/web/app/views/recordings/show.html.erb b/web/app/views/recordings/show.html.erb
index 875d9919b..9cf20c28f 100644
--- a/web/app/views/recordings/show.html.erb
+++ b/web/app/views/recordings/show.html.erb
@@ -59,27 +59,33 @@
   <table class="w100">
     <% @claimed_recording.recording.recorded_tracks.each_with_index do |track, index| %>
       <% if index % 2 == 0 %>
+        <tr><td height="15px;">&nbsp;</td></tr>
         <tr>
       <% end %>
-      <td>
-        <div class="avatar-small m0">
-          <% unless track.user.photo_url.blank? %>
-            <%= image_tag "#{track.user.photo_url}", {:alt => ""} %>
-          <% else %>
-            <%= image_tag "shared/avatar_generic.png", {:alt => ""} %>
-          <% end %>
-        </div>
+      <td width="50%">
+        <table class="w100">
+          <tr>
+            <td>        
+              <div class="avatar-small m0">
+                <% unless track.user.photo_url.blank? %>
+                  <%= image_tag "#{track.user.photo_url}", {:alt => ""} %>
+                <% else %>
+                  <%= image_tag "shared/avatar_generic.png", {:alt => ""} %>
+                <% end %>
+              </div>
+            </td>
+            <td><div class="lightgrey f15 ml10"><%= track.user.name %></div></td>
+            <td class="p10">
+              <div class="ml10">
+                <%= image_tag "content/icon_instrument_#{track.instrument_id.tr(" ", "_")}45.png", {:width => 32, :alt => ""} %>
+              </div>
+            </td>
+            <td width="10%"></td>
+          </tr>
+        </table>
       </td>
-      <td><div class="lightgrey f15 ml10"><%= track.user.name %></div></td>
-      <td class="p10">
-        <div class="ml10">
-          <%= image_tag "shared/icon_instrument_#{track.instrument_id}45.png", {:width => 32, :alt => ""} %>
-        </div>
-      </td>
-      <% if index % 2 == 0 %>
+      <% if index % 2 > 0 %>
         </tr>
-      <% else %>
-        <td width="5%"></td>
       <% end %>
     <% end %>
   </table>
@@ -117,7 +123,7 @@
 <% content_for :after_black_bar do %>
   <br />
   <div class="landing-comments">
-    <h2>Comments:</h2>      
+    <h2>Comments:</h2><br/>
     <div class="avatar-small"><img src="images/content/avatar_generic.png" /></div>
     <div class="left w80 p10">
       <textarea class="w100 p5 f15" rows="2" onfocus="$(this).html('')" onblur="if($(this).html() == ''){$(this).html('Enter a comment...')}">Enter a comment...</textarea>
diff --git a/web/app/views/shared/_cta_sidebar.html.erb b/web/app/views/shared/_cta_sidebar.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/app/views/shared/_landing_sidebar.html.erb b/web/app/views/shared/_landing_sidebar.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb
index 6aec3027a..0fa697e0d 100644
--- a/web/config/environments/development.rb
+++ b/web/config/environments/development.rb
@@ -48,7 +48,7 @@ SampleApp::Application.configure do
   config.assets.debug = false
 
   # Set the logging destination(s)
-  config.log_to = %w[stdout file]
+  # config.log_to = %w[stdout file]
 
   # Show the logging configuration on STDOUT
   config.show_log_configuration = true